move all library files to libgeodecomp/ subdirectory, re #49

gentryx · Feb 20, 2017 · 6d0e63a · 6d0e63a
1 parent 2743e4b
commit 6d0e63a
Show file tree

Hide file tree

Showing 479 changed files with 46 additions and 41 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,10 +1,10 @@
 # LIBDIRS is used to find source files and headers
-set(LIBDIRS communication io io/remotesteerer geometry geometry/partitions loadbalancer misc parallelization parallelization/nesting storage)
+set(LIBDIRS libgeodecomp/communication libgeodecomp/io libgeodecomp/io/remotesteerer libgeodecomp/geometry libgeodecomp/geometry/partitions libgeodecomp/loadbalancer libgeodecomp/misc libgeodecomp/parallelization libgeodecomp/parallelization/nesting libgeodecomp/storage)
 # AUXDIRS lists auxiliary directories to be included in the main
 # build. They may for instance include additionally libraries to be
 # linked into the main lib.
 set(AUXDIRS)
-set(SUBDIRS communication examples io geometry loadbalancer misc parallelization storage testbed)
+set(SUBDIRS examples libgeodecomp/communication libgeodecomp/io libgeodecomp/geometry libgeodecomp/loadbalancer libgeodecomp/misc libgeodecomp/parallelization libgeodecomp/storage testbed)
 
 set(CXX_TEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib/cxxtest")
 set(LGD_AGGREGATED_C_FLAGS   "${LGD_ADDITIONAL_C_COMPILE_FLAGS}"  )
@@ -482,12 +482,12 @@ if (WITH_TYPEMAPS)
   set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM true)
 
   add_custom_command(
-    OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/communication/typemaps.h" "${CMAKE_CURRENT_SOURCE_DIR}/communication/typemaps.cpp"
+    OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/libgeodecomp/communication/typemaps.h" "${CMAKE_CURRENT_SOURCE_DIR}/libgeodecomp/communication/typemaps.cpp"
     COMMAND cd "${CMAKE_CURRENT_SOURCE_DIR}" && doxygen doxygen.conf
-    COMMAND ruby "${CMAKE_CURRENT_SOURCE_DIR}/../tools/typemapgenerator/generate.rb" --namespace LibGeoDecomp --header-fix "^.+/src:libgeodecomp" --macro-guard-mpi LIBGEODECOMP_WITH_MPI --macro-guard-hpx LIBGEODECOMP_WITH_HPX --macro-guard-boost LIBGEODECOMP_WITH_BOOST_SERIALIZATION "${CMAKE_CURRENT_SOURCE_DIR}/../doc/xml" --include-prefix "libgeodecomp/" "${CMAKE_CURRENT_SOURCE_DIR}/communication"
+    COMMAND ruby "${CMAKE_CURRENT_SOURCE_DIR}/../tools/typemapgenerator/generate.rb" --namespace LibGeoDecomp --header-fix "^.+/src:libgeodecomp" --macro-guard-mpi LIBGEODECOMP_WITH_MPI --macro-guard-hpx LIBGEODECOMP_WITH_HPX --macro-guard-boost LIBGEODECOMP_WITH_BOOST_SERIALIZATION "${CMAKE_CURRENT_SOURCE_DIR}/../doc/xml" --include-prefix "libgeodecomp/" "${CMAKE_CURRENT_SOURCE_DIR}/libgeodecomp/communication"
     DEPENDS "${CMAKE_BINARY_DIR}/cache")
 
-  list(REMOVE_ITEM ALL_HEADERS "communication/typemaps.h")
+  list(REMOVE_ITEM ALL_HEADERS "libgeodecomp/communication/typemaps.h")
   set(CANDIDATES)
   foreach(i ${ALL_HEADERS})
     set(CANDIDATES "${i}:${CANDIDATES}")

diff --git a/src/communication/test/parallel_hpx_4/CMakeLists.txt b/src/communication/test/parallel_hpx_4/CMakeLists.txt
diff --git a/src/communication/test/parallel_mpi_1/CMakeLists.txt b/src/communication/test/parallel_mpi_1/CMakeLists.txt
diff --git a/src/communication/test/parallel_mpi_2/CMakeLists.txt b/src/communication/test/parallel_mpi_2/CMakeLists.txt
diff --git a/src/communication/test/parallel_mpi_4/CMakeLists.txt b/src/communication/test/parallel_mpi_4/CMakeLists.txt
diff --git a/src/examples/gameoflife_adcirc/hull.cpp b/src/examples/gameoflife_adcirc/hull.cpp
@@ -1,5 +1,5 @@
-#include <libgeodecomp/examples/gameoflife_adcirc/hull.h>
 #include <algorithm>
+#include "hull.h"
 
 double cross(const FloatCoord<2> &o, const FloatCoord<2> &a, const FloatCoord<2> &b)
 {

diff --git a/src/examples/gameoflife_adcirc/main.cpp b/src/examples/gameoflife_adcirc/main.cpp
@@ -2,7 +2,7 @@
 #include <hpx/hpx_init.hpp>
 #include <libgeodecomp.h>
 
-#include <libgeodecomp/examples/gameoflife_adcirc/hull.h>
+#include "hull.h"
 
 using namespace LibGeoDecomp;
 

diff --git a/src/geometry/test/parallel_hpx_1/CMakeLists.txt b/src/geometry/test/parallel_hpx_1/CMakeLists.txt
diff --git a/src/geometry/test/parallel_mpi_4/CMakeLists.txt b/src/geometry/test/parallel_mpi_4/CMakeLists.txt
diff --git a/src/geometry/test/parallel_mpi_9/CMakeLists.txt b/src/geometry/test/parallel_mpi_9/CMakeLists.txt
diff --git a/src/geometry/test/unit/CMakeLists.txt b/src/geometry/test/unit/CMakeLists.txt
diff --git a/src/io/test/parallel_mpi_1/CMakeLists.txt b/src/io/test/parallel_mpi_1/CMakeLists.txt
diff --git a/src/io/test/parallel_mpi_2/CMakeLists.txt b/src/io/test/parallel_mpi_2/CMakeLists.txt
diff --git a/src/io/test/unit/CMakeLists.txt b/src/io/test/unit/CMakeLists.txt
diff --git a/src/communication/CMakeLists.txt → ...libgeodecomp/communication/CMakeLists.txt b/src/communication/CMakeLists.txt → ...libgeodecomp/communication/CMakeLists.txt
diff --git a/src/communication/boostserialization.h → ...decomp/communication/boostserialization.h b/src/communication/boostserialization.h → ...decomp/communication/boostserialization.h
diff --git a/...nication/hpxcomponentregsitrationhelper.h → ...nication/hpxcomponentregsitrationhelper.h b/...nication/hpxcomponentregsitrationhelper.h → ...nication/hpxcomponentregsitrationhelper.h
diff --git a/src/communication/hpxpatchlink.h → ...libgeodecomp/communication/hpxpatchlink.h b/src/communication/hpxpatchlink.h → ...libgeodecomp/communication/hpxpatchlink.h
diff --git a/src/communication/hpxreceiver.cpp → ...ibgeodecomp/communication/hpxreceiver.cpp b/src/communication/hpxreceiver.cpp → ...ibgeodecomp/communication/hpxreceiver.cpp
diff --git a/src/communication/hpxreceiver.h → src/libgeodecomp/communication/hpxreceiver.h b/src/communication/hpxreceiver.h → src/libgeodecomp/communication/hpxreceiver.h
diff --git a/src/communication/hpxserialization.cpp → ...decomp/communication/hpxserialization.cpp b/src/communication/hpxserialization.cpp → ...decomp/communication/hpxserialization.cpp
diff --git a/src/communication/hpxserialization.h → ...eodecomp/communication/hpxserialization.h b/src/communication/hpxserialization.h → ...eodecomp/communication/hpxserialization.h
diff --git a/src/communication/hpxserializationwrapper.h → ...p/communication/hpxserializationwrapper.h b/src/communication/hpxserializationwrapper.h → ...p/communication/hpxserializationwrapper.h
diff --git a/src/communication/mpilayer.h → src/libgeodecomp/communication/mpilayer.h b/src/communication/mpilayer.h → src/libgeodecomp/communication/mpilayer.h
diff --git a/src/communication/patchlink.h → src/libgeodecomp/communication/patchlink.h b/src/communication/patchlink.h → src/libgeodecomp/communication/patchlink.h
diff --git a/src/communication/serializationhelpers.h → ...comp/communication/serializationhelpers.h b/src/communication/serializationhelpers.h → ...comp/communication/serializationhelpers.h
diff --git a/...itions/test/parallel_mpi_1/CMakeLists.txt → ...cation/test/parallel_hpx_4/CMakeLists.txt b/...itions/test/parallel_mpi_1/CMakeLists.txt → ...cation/test/parallel_hpx_4/CMakeLists.txt
diff --git a/...on/test/parallel_hpx_4/hpxpatchlinktest.h → ...on/test/parallel_hpx_4/hpxpatchlinktest.h b/...on/test/parallel_hpx_4/hpxpatchlinktest.h → ...on/test/parallel_hpx_4/hpxpatchlinktest.h
diff --git a/...ion/test/parallel_hpx_4/hpxreceivertest.h → ...ion/test/parallel_hpx_4/hpxreceivertest.h b/...ion/test/parallel_hpx_4/hpxreceivertest.h → ...ion/test/parallel_hpx_4/hpxreceivertest.h
diff --git a/...itions/test/parallel_mpi_2/CMakeLists.txt → ...cation/test/parallel_mpi_1/CMakeLists.txt b/...itions/test/parallel_mpi_2/CMakeLists.txt → ...cation/test/parallel_mpi_1/CMakeLists.txt
diff --git a/...cation/test/parallel_mpi_1/mpilayertest.h → ...cation/test/parallel_mpi_1/mpilayertest.h b/...cation/test/parallel_mpi_1/mpilayertest.h → ...cation/test/parallel_mpi_1/mpilayertest.h
diff --git a/...itions/test/parallel_mpi_4/CMakeLists.txt → ...cation/test/parallel_mpi_2/CMakeLists.txt b/...itions/test/parallel_mpi_4/CMakeLists.txt → ...cation/test/parallel_mpi_2/CMakeLists.txt
diff --git a/...cation/test/parallel_mpi_2/mpilayertest.h → ...cation/test/parallel_mpi_2/mpilayertest.h b/...cation/test/parallel_mpi_2/mpilayertest.h → ...cation/test/parallel_mpi_2/mpilayertest.h
diff --git a/...metry/partitions/test/unit/CMakeLists.txt → ...cation/test/parallel_mpi_4/CMakeLists.txt b/...metry/partitions/test/unit/CMakeLists.txt → ...cation/test/parallel_mpi_4/CMakeLists.txt
diff --git a/...ation/test/parallel_mpi_4/patchlinktest.h → ...ation/test/parallel_mpi_4/patchlinktest.h b/...ation/test/parallel_mpi_4/patchlinktest.h → ...ation/test/parallel_mpi_4/patchlinktest.h
diff --git a/src/communication/typemaps.cpp → src/libgeodecomp/communication/typemaps.cpp b/src/communication/typemaps.cpp → src/libgeodecomp/communication/typemaps.cpp
diff --git a/src/communication/typemaps.h → src/libgeodecomp/communication/typemaps.h b/src/communication/typemaps.h → src/libgeodecomp/communication/typemaps.h
diff --git a/src/geometry/CMakeLists.txt → src/libgeodecomp/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt → src/libgeodecomp/geometry/CMakeLists.txt
diff --git a/src/geometry/adjacency.h → src/libgeodecomp/geometry/adjacency.h b/src/geometry/adjacency.h → src/libgeodecomp/geometry/adjacency.h
diff --git a/src/geometry/adjacencymanufacturer.h → ...eodecomp/geometry/adjacencymanufacturer.h b/src/geometry/adjacencymanufacturer.h → ...eodecomp/geometry/adjacencymanufacturer.h
diff --git a/src/geometry/convexpolytope.h → src/libgeodecomp/geometry/convexpolytope.h b/src/geometry/convexpolytope.h → src/libgeodecomp/geometry/convexpolytope.h
diff --git a/src/geometry/coord.h → src/libgeodecomp/geometry/coord.h b/src/geometry/coord.h → src/libgeodecomp/geometry/coord.h
diff --git a/src/geometry/coordbox.h → src/libgeodecomp/geometry/coordbox.h b/src/geometry/coordbox.h → src/libgeodecomp/geometry/coordbox.h
diff --git a/src/geometry/cudaregion.h → src/libgeodecomp/geometry/cudaregion.h b/src/geometry/cudaregion.h → src/libgeodecomp/geometry/cudaregion.h
diff --git a/src/geometry/dummyadjacencymanufacturer.h → ...omp/geometry/dummyadjacencymanufacturer.h b/src/geometry/dummyadjacencymanufacturer.h → ...omp/geometry/dummyadjacencymanufacturer.h
diff --git a/src/geometry/fixedcoord.h → src/libgeodecomp/geometry/fixedcoord.h b/src/geometry/fixedcoord.h → src/libgeodecomp/geometry/fixedcoord.h
diff --git a/src/geometry/floatcoord.h → src/libgeodecomp/geometry/floatcoord.h b/src/geometry/floatcoord.h → src/libgeodecomp/geometry/floatcoord.h
diff --git a/src/geometry/partitionmanager.h → src/libgeodecomp/geometry/partitionmanager.h b/src/geometry/partitionmanager.h → src/libgeodecomp/geometry/partitionmanager.h
diff --git a/src/geometry/partitions/CMakeLists.txt → ...decomp/geometry/partitions/CMakeLists.txt b/src/geometry/partitions/CMakeLists.txt → ...decomp/geometry/partitions/CMakeLists.txt
diff --git a/...try/partitions/checkerboardingpartition.h → ...try/partitions/checkerboardingpartition.h b/...try/partitions/checkerboardingpartition.h → ...try/partitions/checkerboardingpartition.h
diff --git a/...istributedptscotchunstructuredpartition.h → ...istributedptscotchunstructuredpartition.h b/...istributedptscotchunstructuredpartition.h → ...istributedptscotchunstructuredpartition.h
diff --git a/src/geometry/partitions/hilbertpartition.cpp → .../geometry/partitions/hilbertpartition.cpp b/src/geometry/partitions/hilbertpartition.cpp → .../geometry/partitions/hilbertpartition.cpp
diff --git a/src/geometry/partitions/hilbertpartition.h → ...mp/geometry/partitions/hilbertpartition.h b/src/geometry/partitions/hilbertpartition.h → ...mp/geometry/partitions/hilbertpartition.h
diff --git a/...eometry/partitions/hindexingpartition.cpp → ...eometry/partitions/hindexingpartition.cpp b/...eometry/partitions/hindexingpartition.cpp → ...eometry/partitions/hindexingpartition.cpp
diff --git a/src/geometry/partitions/hindexingpartition.h → .../geometry/partitions/hindexingpartition.h b/src/geometry/partitions/hindexingpartition.h → .../geometry/partitions/hindexingpartition.h
diff --git a/src/geometry/partitions/partition.h → ...geodecomp/geometry/partitions/partition.h b/src/geometry/partitions/partition.h → ...geodecomp/geometry/partitions/partition.h
diff --git a/src/geometry/partitions/ptscotchpartition.h → ...p/geometry/partitions/ptscotchpartition.h b/src/geometry/partitions/ptscotchpartition.h → ...p/geometry/partitions/ptscotchpartition.h
diff --git a/...artitions/ptscotchunstructuredpartition.h → ...artitions/ptscotchunstructuredpartition.h b/...artitions/ptscotchunstructuredpartition.h → ...artitions/ptscotchunstructuredpartition.h
diff --git a/.../partitions/recursivebisectionpartition.h → .../partitions/recursivebisectionpartition.h b/.../partitions/recursivebisectionpartition.h → .../partitions/recursivebisectionpartition.h
diff --git a/src/geometry/partitions/scotchpartition.h → ...omp/geometry/partitions/scotchpartition.h b/src/geometry/partitions/scotchpartition.h → ...omp/geometry/partitions/scotchpartition.h
diff --git a/src/geometry/partitions/spacefillingcurve.h → ...p/geometry/partitions/spacefillingcurve.h b/src/geometry/partitions/spacefillingcurve.h → ...p/geometry/partitions/spacefillingcurve.h
diff --git a/src/geometry/partitions/stripingpartition.h → ...p/geometry/partitions/stripingpartition.h b/src/geometry/partitions/stripingpartition.h → ...p/geometry/partitions/stripingpartition.h
diff --git a/src/libgeodecomp/geometry/partitions/test/parallel_mpi_1/CMakeLists.txt b/src/libgeodecomp/geometry/partitions/test/parallel_mpi_1/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/...st/parallel_mpi_1/ptscotchpartitiontest.h → ...st/parallel_mpi_1/ptscotchpartitiontest.h b/...st/parallel_mpi_1/ptscotchpartitiontest.h → ...st/parallel_mpi_1/ptscotchpartitiontest.h
diff --git a/src/libgeodecomp/geometry/partitions/test/parallel_mpi_2/CMakeLists.txt b/src/libgeodecomp/geometry/partitions/test/parallel_mpi_2/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/...st/parallel_mpi_2/ptscotchpartitiontest.h → ...st/parallel_mpi_2/ptscotchpartitiontest.h b/...st/parallel_mpi_2/ptscotchpartitiontest.h → ...st/parallel_mpi_2/ptscotchpartitiontest.h
diff --git a/src/libgeodecomp/geometry/partitions/test/parallel_mpi_4/CMakeLists.txt b/src/libgeodecomp/geometry/partitions/test/parallel_mpi_4/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/...st/parallel_mpi_4/ptscotchpartitiontest.h → ...st/parallel_mpi_4/ptscotchpartitiontest.h b/...st/parallel_mpi_4/ptscotchpartitiontest.h → ...st/parallel_mpi_4/ptscotchpartitiontest.h
diff --git a/src/libgeodecomp/geometry/partitions/test/unit/CMakeLists.txt b/src/libgeodecomp/geometry/partitions/test/unit/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/.../test/unit/checkerboardingpartitiontest.h → .../test/unit/checkerboardingpartitiontest.h b/.../test/unit/checkerboardingpartitiontest.h → .../test/unit/checkerboardingpartitiontest.h
diff --git a/...rtitions/test/unit/hilbertpartitiontest.h → ...rtitions/test/unit/hilbertpartitiontest.h b/...rtitions/test/unit/hilbertpartitiontest.h → ...rtitions/test/unit/hilbertpartitiontest.h
diff --git a/...itions/test/unit/hindexingpartitiontest.h → ...itions/test/unit/hindexingpartitiontest.h b/...itions/test/unit/hindexingpartitiontest.h → ...itions/test/unit/hindexingpartitiontest.h
diff --git a/...st/unit/recursivebisectionpartitiontest.h → ...st/unit/recursivebisectionpartitiontest.h b/...st/unit/recursivebisectionpartitiontest.h → ...st/unit/recursivebisectionpartitiontest.h
diff --git a/...artitions/test/unit/scotchpartitiontest.h → ...artitions/test/unit/scotchpartitiontest.h b/...artitions/test/unit/scotchpartitiontest.h → ...artitions/test/unit/scotchpartitiontest.h
diff --git a/...titions/test/unit/stripingpartitiontest.h → ...titions/test/unit/stripingpartitiontest.h b/...titions/test/unit/stripingpartitiontest.h → ...titions/test/unit/stripingpartitiontest.h
diff --git a/.../unit/unstructuredstripingpartitiontest.h → .../unit/unstructuredstripingpartitiontest.h b/.../unit/unstructuredstripingpartitiontest.h → .../unit/unstructuredstripingpartitiontest.h
diff --git a/...artitions/test/unit/zcurvepartitiontest.h → ...artitions/test/unit/zcurvepartitiontest.h b/...artitions/test/unit/zcurvepartitiontest.h → ...artitions/test/unit/zcurvepartitiontest.h
diff --git a/...artitions/unstructuredstripingpartition.h → ...artitions/unstructuredstripingpartition.h b/...artitions/unstructuredstripingpartition.h → ...artitions/unstructuredstripingpartition.h
diff --git a/src/geometry/partitions/zcurvepartition.h → ...omp/geometry/partitions/zcurvepartition.h b/src/geometry/partitions/zcurvepartition.h → ...omp/geometry/partitions/zcurvepartition.h
diff --git a/src/geometry/plane.h → src/libgeodecomp/geometry/plane.h b/src/geometry/plane.h → src/libgeodecomp/geometry/plane.h
diff --git a/src/geometry/region.h → src/libgeodecomp/geometry/region.h b/src/geometry/region.h → src/libgeodecomp/geometry/region.h
diff --git a/src/geometry/regionbasedadjacency.h → ...geodecomp/geometry/regionbasedadjacency.h b/src/geometry/regionbasedadjacency.h → ...geodecomp/geometry/regionbasedadjacency.h
diff --git a/src/geometry/regionstreakiterator.h → ...geodecomp/geometry/regionstreakiterator.h b/src/geometry/regionstreakiterator.h → ...geodecomp/geometry/regionstreakiterator.h
diff --git a/src/geometry/stencils.h → src/libgeodecomp/geometry/stencils.h b/src/geometry/stencils.h → src/libgeodecomp/geometry/stencils.h
diff --git a/src/geometry/streak.h → src/libgeodecomp/geometry/streak.h b/src/geometry/streak.h → src/libgeodecomp/geometry/streak.h
diff --git a/...teerer/test/parallel_mpi_1/CMakeLists.txt → ...ometry/test/parallel_hpx_1/CMakeLists.txt b/...teerer/test/parallel_mpi_1/CMakeLists.txt → ...ometry/test/parallel_hpx_1/CMakeLists.txt
diff --git a/...ometry/test/parallel_hpx_1/coordboxtest.h → ...ometry/test/parallel_hpx_1/coordboxtest.h b/...ometry/test/parallel_hpx_1/coordboxtest.h → ...ometry/test/parallel_hpx_1/coordboxtest.h
diff --git a/src/geometry/test/parallel_hpx_1/coordtest.h → .../geometry/test/parallel_hpx_1/coordtest.h b/src/geometry/test/parallel_hpx_1/coordtest.h → .../geometry/test/parallel_hpx_1/coordtest.h
diff --git a/...etry/test/parallel_hpx_1/floatcoordtest.h → ...etry/test/parallel_hpx_1/floatcoordtest.h b/...etry/test/parallel_hpx_1/floatcoordtest.h → ...etry/test/parallel_hpx_1/floatcoordtest.h
diff --git a/...geometry/test/parallel_hpx_1/regiontest.h → ...geometry/test/parallel_hpx_1/regiontest.h b/...geometry/test/parallel_hpx_1/regiontest.h → ...geometry/test/parallel_hpx_1/regiontest.h
diff --git a/...geometry/test/parallel_hpx_1/streaktest.h → ...geometry/test/parallel_hpx_1/streaktest.h b/...geometry/test/parallel_hpx_1/streaktest.h → ...geometry/test/parallel_hpx_1/streaktest.h
diff --git a/...teerer/test/parallel_mpi_2/CMakeLists.txt → ...ometry/test/parallel_mpi_4/CMakeLists.txt b/...teerer/test/parallel_mpi_2/CMakeLists.txt → ...ometry/test/parallel_mpi_4/CMakeLists.txt
diff --git a/...est/parallel_mpi_4/partitionmanagertest.h → ...est/parallel_mpi_4/partitionmanagertest.h b/...est/parallel_mpi_4/partitionmanagertest.h → ...est/parallel_mpi_4/partitionmanagertest.h
diff --git a/...teerer/test/parallel_mpi_4/CMakeLists.txt → ...ometry/test/parallel_mpi_9/CMakeLists.txt b/...teerer/test/parallel_mpi_4/CMakeLists.txt → ...ometry/test/parallel_mpi_9/CMakeLists.txt
diff --git a/...est/parallel_mpi_9/partitionmanagertest.h → ...est/parallel_mpi_9/partitionmanagertest.h b/...est/parallel_mpi_9/partitionmanagertest.h → ...est/parallel_mpi_9/partitionmanagertest.h
diff --git a/...io/remotesteerer/test/unit/CMakeLists.txt → ...odecomp/geometry/test/unit/CMakeLists.txt b/...io/remotesteerer/test/unit/CMakeLists.txt → ...odecomp/geometry/test/unit/CMakeLists.txt
diff --git a/src/geometry/test/unit/convexpolytopetest.h → ...p/geometry/test/unit/convexpolytopetest.h b/src/geometry/test/unit/convexpolytopetest.h → ...p/geometry/test/unit/convexpolytopetest.h
diff --git a/src/geometry/test/unit/coord2test.h → ...geodecomp/geometry/test/unit/coord2test.h b/src/geometry/test/unit/coord2test.h → ...geodecomp/geometry/test/unit/coord2test.h
diff --git a/src/geometry/test/unit/coordboxtest.h → ...odecomp/geometry/test/unit/coordboxtest.h b/src/geometry/test/unit/coordboxtest.h → ...odecomp/geometry/test/unit/coordboxtest.h
diff --git a/src/geometry/test/unit/coordtest.h → ...bgeodecomp/geometry/test/unit/coordtest.h b/src/geometry/test/unit/coordtest.h → ...bgeodecomp/geometry/test/unit/coordtest.h
diff --git a/src/geometry/test/unit/cudaregiontest.h → ...ecomp/geometry/test/unit/cudaregiontest.h b/src/geometry/test/unit/cudaregiontest.h → ...ecomp/geometry/test/unit/cudaregiontest.h
diff --git a/src/geometry/test/unit/fixedcoordtest.h → ...ecomp/geometry/test/unit/fixedcoordtest.h b/src/geometry/test/unit/fixedcoordtest.h → ...ecomp/geometry/test/unit/fixedcoordtest.h
diff --git a/src/geometry/test/unit/floatcoordtest.h → ...ecomp/geometry/test/unit/floatcoordtest.h b/src/geometry/test/unit/floatcoordtest.h → ...ecomp/geometry/test/unit/floatcoordtest.h
diff --git a/...geometry/test/unit/partitionmanagertest.h → ...geometry/test/unit/partitionmanagertest.h b/...geometry/test/unit/partitionmanagertest.h → ...geometry/test/unit/partitionmanagertest.h
diff --git a/src/geometry/test/unit/planetest.h → ...bgeodecomp/geometry/test/unit/planetest.h b/src/geometry/test/unit/planetest.h → ...bgeodecomp/geometry/test/unit/planetest.h
diff --git a/...etry/test/unit/regionbasedadjacencytest.h → ...etry/test/unit/regionbasedadjacencytest.h b/...etry/test/unit/regionbasedadjacencytest.h → ...etry/test/unit/regionbasedadjacencytest.h
diff --git a/...etry/test/unit/regionstreakiteratortest.h → ...etry/test/unit/regionstreakiteratortest.h b/...etry/test/unit/regionstreakiteratortest.h → ...etry/test/unit/regionstreakiteratortest.h
diff --git a/src/geometry/test/unit/regiontest.h → ...geodecomp/geometry/test/unit/regiontest.h b/src/geometry/test/unit/regiontest.h → ...geodecomp/geometry/test/unit/regiontest.h
diff --git a/src/geometry/test/unit/stencilstest.h → ...odecomp/geometry/test/unit/stencilstest.h b/src/geometry/test/unit/stencilstest.h → ...odecomp/geometry/test/unit/stencilstest.h
diff --git a/src/geometry/test/unit/streaktest.h → ...geodecomp/geometry/test/unit/streaktest.h b/src/geometry/test/unit/streaktest.h → ...geodecomp/geometry/test/unit/streaktest.h
diff --git a/src/geometry/test/unit/topologiestest.h → ...ecomp/geometry/test/unit/topologiestest.h b/src/geometry/test/unit/topologiestest.h → ...ecomp/geometry/test/unit/topologiestest.h
diff --git a/...ry/test/unit/unstructuredgridmeshertest.h → ...ry/test/unit/unstructuredgridmeshertest.h b/...ry/test/unit/unstructuredgridmeshertest.h → ...ry/test/unit/unstructuredgridmeshertest.h
diff --git a/src/geometry/test/unit/voronoimeshertest.h → ...mp/geometry/test/unit/voronoimeshertest.h b/src/geometry/test/unit/voronoimeshertest.h → ...mp/geometry/test/unit/voronoimeshertest.h
diff --git a/src/geometry/topologies.h → src/libgeodecomp/geometry/topologies.h b/src/geometry/topologies.h → src/libgeodecomp/geometry/topologies.h
diff --git a/src/geometry/unstructuredgridmesher.h → ...odecomp/geometry/unstructuredgridmesher.h b/src/geometry/unstructuredgridmesher.h → ...odecomp/geometry/unstructuredgridmesher.h
diff --git a/src/geometry/voronoimesher.h → src/libgeodecomp/geometry/voronoimesher.h b/src/geometry/voronoimesher.h → src/libgeodecomp/geometry/voronoimesher.h
diff --git a/src/io/CMakeLists.txt → src/libgeodecomp/io/CMakeLists.txt b/src/io/CMakeLists.txt → src/libgeodecomp/io/CMakeLists.txt
diff --git a/src/io/asciiwriter.h → src/libgeodecomp/io/asciiwriter.h b/src/io/asciiwriter.h → src/libgeodecomp/io/asciiwriter.h
diff --git a/src/io/bovoutput.h → src/libgeodecomp/io/bovoutput.h b/src/io/bovoutput.h → src/libgeodecomp/io/bovoutput.h
diff --git a/src/io/bovwriter.h → src/libgeodecomp/io/bovwriter.h b/src/io/bovwriter.h → src/libgeodecomp/io/bovwriter.h
diff --git a/src/io/clonableinitializer.h → src/libgeodecomp/io/clonableinitializer.h b/src/io/clonableinitializer.h → src/libgeodecomp/io/clonableinitializer.h
diff --git a/src/io/clonableinitializerwrapper.h → ...geodecomp/io/clonableinitializerwrapper.h b/src/io/clonableinitializerwrapper.h → ...geodecomp/io/clonableinitializerwrapper.h
diff --git a/src/io/collectingwriter.h → src/libgeodecomp/io/collectingwriter.h b/src/io/collectingwriter.h → src/libgeodecomp/io/collectingwriter.h
diff --git a/src/io/imagepainter.h → src/libgeodecomp/io/imagepainter.h b/src/io/imagepainter.h → src/libgeodecomp/io/imagepainter.h
diff --git a/src/io/initializer.h → src/libgeodecomp/io/initializer.h b/src/io/initializer.h → src/libgeodecomp/io/initializer.h
diff --git a/src/io/ioexception.h → src/libgeodecomp/io/ioexception.h b/src/io/ioexception.h → src/libgeodecomp/io/ioexception.h
diff --git a/src/io/logger.h → src/libgeodecomp/io/logger.h b/src/io/logger.h → src/libgeodecomp/io/logger.h
diff --git a/src/io/memorywriter.h → src/libgeodecomp/io/memorywriter.h b/src/io/memorywriter.h → src/libgeodecomp/io/memorywriter.h
diff --git a/src/io/mockinitializer.cpp → src/libgeodecomp/io/mockinitializer.cpp b/src/io/mockinitializer.cpp → src/libgeodecomp/io/mockinitializer.cpp
diff --git a/src/io/mockinitializer.h → src/libgeodecomp/io/mockinitializer.h b/src/io/mockinitializer.h → src/libgeodecomp/io/mockinitializer.h
diff --git a/src/io/mocksteerer.h → src/libgeodecomp/io/mocksteerer.h b/src/io/mocksteerer.h → src/libgeodecomp/io/mocksteerer.h
diff --git a/src/io/mockwriter.h → src/libgeodecomp/io/mockwriter.h b/src/io/mockwriter.h → src/libgeodecomp/io/mockwriter.h
diff --git a/src/io/mpiio.h → src/libgeodecomp/io/mpiio.h b/src/io/mpiio.h → src/libgeodecomp/io/mpiio.h
diff --git a/src/io/mpiioinitializer.h → src/libgeodecomp/io/mpiioinitializer.h b/src/io/mpiioinitializer.h → src/libgeodecomp/io/mpiioinitializer.h
diff --git a/src/io/mpiiowriter.h → src/libgeodecomp/io/mpiiowriter.h b/src/io/mpiiowriter.h → src/libgeodecomp/io/mpiiowriter.h
diff --git a/src/io/parallelmemorywriter.h → src/libgeodecomp/io/parallelmemorywriter.h b/src/io/parallelmemorywriter.h → src/libgeodecomp/io/parallelmemorywriter.h
diff --git a/src/io/parallelmpiiowriter.h → src/libgeodecomp/io/parallelmpiiowriter.h b/src/io/parallelmpiiowriter.h → src/libgeodecomp/io/parallelmpiiowriter.h
diff --git a/src/io/paralleltestwriter.h → src/libgeodecomp/io/paralleltestwriter.h b/src/io/paralleltestwriter.h → src/libgeodecomp/io/paralleltestwriter.h
diff --git a/src/io/parallelwriter.h → src/libgeodecomp/io/parallelwriter.h b/src/io/parallelwriter.h → src/libgeodecomp/io/parallelwriter.h
diff --git a/src/io/plotter.h → src/libgeodecomp/io/plotter.h b/src/io/plotter.h → src/libgeodecomp/io/plotter.h
diff --git a/src/io/ppmwriter.h → src/libgeodecomp/io/ppmwriter.h b/src/io/ppmwriter.h → src/libgeodecomp/io/ppmwriter.h
diff --git a/src/io/qtwidgetwriter.h → src/libgeodecomp/io/qtwidgetwriter.h b/src/io/qtwidgetwriter.h → src/libgeodecomp/io/qtwidgetwriter.h
diff --git a/src/io/remotesteerer.h → src/libgeodecomp/io/remotesteerer.h b/src/io/remotesteerer.h → src/libgeodecomp/io/remotesteerer.h
diff --git a/src/io/remotesteerer/CMakeLists.txt → ...geodecomp/io/remotesteerer/CMakeLists.txt b/src/io/remotesteerer/CMakeLists.txt → ...geodecomp/io/remotesteerer/CMakeLists.txt
diff --git a/src/io/remotesteerer/action.h → src/libgeodecomp/io/remotesteerer/action.h b/src/io/remotesteerer/action.h → src/libgeodecomp/io/remotesteerer/action.h
diff --git a/src/io/remotesteerer/commandserver.h → ...eodecomp/io/remotesteerer/commandserver.h b/src/io/remotesteerer/commandserver.h → ...eodecomp/io/remotesteerer/commandserver.h
diff --git a/src/io/remotesteerer/getaction.h → ...libgeodecomp/io/remotesteerer/getaction.h b/src/io/remotesteerer/getaction.h → ...libgeodecomp/io/remotesteerer/getaction.h
diff --git a/src/io/remotesteerer/gethandler.h → ...ibgeodecomp/io/remotesteerer/gethandler.h b/src/io/remotesteerer/gethandler.h → ...ibgeodecomp/io/remotesteerer/gethandler.h
diff --git a/src/io/remotesteerer/handler.h → src/libgeodecomp/io/remotesteerer/handler.h b/src/io/remotesteerer/handler.h → src/libgeodecomp/io/remotesteerer/handler.h
diff --git a/src/io/remotesteerer/interactor.h → ...ibgeodecomp/io/remotesteerer/interactor.h b/src/io/remotesteerer/interactor.h → ...ibgeodecomp/io/remotesteerer/interactor.h
diff --git a/src/io/remotesteerer/passthroughaction.h → ...comp/io/remotesteerer/passthroughaction.h b/src/io/remotesteerer/passthroughaction.h → ...comp/io/remotesteerer/passthroughaction.h
diff --git a/src/io/remotesteerer/pipe.h → src/libgeodecomp/io/remotesteerer/pipe.h b/src/io/remotesteerer/pipe.h → src/libgeodecomp/io/remotesteerer/pipe.h
diff --git a/src/io/remotesteerer/setaction.h → ...libgeodecomp/io/remotesteerer/setaction.h b/src/io/remotesteerer/setaction.h → ...libgeodecomp/io/remotesteerer/setaction.h
diff --git a/...esting/test/parallel_hpx_4/CMakeLists.txt → ...teerer/test/parallel_mpi_1/CMakeLists.txt b/...esting/test/parallel_hpx_4/CMakeLists.txt → ...teerer/test/parallel_mpi_1/CMakeLists.txt
diff --git a/...esteerer/test/parallel_mpi_1/actiontest.h → ...esteerer/test/parallel_mpi_1/actiontest.h b/...esteerer/test/parallel_mpi_1/actiontest.h → ...esteerer/test/parallel_mpi_1/actiontest.h
diff --git a/...r/test/parallel_mpi_1/commandservertest.h → ...r/test/parallel_mpi_1/commandservertest.h b/...r/test/parallel_mpi_1/commandservertest.h → ...r/test/parallel_mpi_1/commandservertest.h
diff --git a/...steerer/test/parallel_mpi_1/handlertest.h → ...steerer/test/parallel_mpi_1/handlertest.h b/...steerer/test/parallel_mpi_1/handlertest.h → ...steerer/test/parallel_mpi_1/handlertest.h
diff --git a/...esting/test/parallel_mpi_1/CMakeLists.txt → ...teerer/test/parallel_mpi_2/CMakeLists.txt b/...esting/test/parallel_mpi_1/CMakeLists.txt → ...teerer/test/parallel_mpi_2/CMakeLists.txt
diff --git a/...erer/test/parallel_mpi_2/interactortest.h → ...erer/test/parallel_mpi_2/interactortest.h b/...erer/test/parallel_mpi_2/interactortest.h → ...erer/test/parallel_mpi_2/interactortest.h
diff --git a/...sting/test/parallel_mpi_14/CMakeLists.txt → ...teerer/test/parallel_mpi_4/CMakeLists.txt b/...sting/test/parallel_mpi_14/CMakeLists.txt → ...teerer/test/parallel_mpi_4/CMakeLists.txt
diff --git a/...otesteerer/test/parallel_mpi_4/pipetest.h → ...otesteerer/test/parallel_mpi_4/pipetest.h b/...otesteerer/test/parallel_mpi_4/pipetest.h → ...otesteerer/test/parallel_mpi_4/pipetest.h
diff --git a/...esting/test/parallel_mpi_4/CMakeLists.txt → ...io/remotesteerer/test/unit/CMakeLists.txt b/...esting/test/parallel_mpi_4/CMakeLists.txt → ...io/remotesteerer/test/unit/CMakeLists.txt
diff --git a/.../remotesteerer/test/unit/interactortest.h → .../remotesteerer/test/unit/interactortest.h b/.../remotesteerer/test/unit/interactortest.h → .../remotesteerer/test/unit/interactortest.h
diff --git a/src/io/remotesteerer/waitaction.h → ...ibgeodecomp/io/remotesteerer/waitaction.h b/src/io/remotesteerer/waitaction.h → ...ibgeodecomp/io/remotesteerer/waitaction.h
diff --git a/src/io/sellsortingwriter.h → src/libgeodecomp/io/sellsortingwriter.h b/src/io/sellsortingwriter.h → src/libgeodecomp/io/sellsortingwriter.h
diff --git a/src/io/serialbovwriter.h → src/libgeodecomp/io/serialbovwriter.h b/src/io/serialbovwriter.h → src/libgeodecomp/io/serialbovwriter.h
diff --git a/src/io/silowriter.h → src/libgeodecomp/io/silowriter.h b/src/io/silowriter.h → src/libgeodecomp/io/silowriter.h
diff --git a/src/io/simplecellplotter.h → src/libgeodecomp/io/simplecellplotter.h b/src/io/simplecellplotter.h → src/libgeodecomp/io/simplecellplotter.h
diff --git a/src/io/simpleinitializer.h → src/libgeodecomp/io/simpleinitializer.h b/src/io/simpleinitializer.h → src/libgeodecomp/io/simpleinitializer.h
diff --git a/src/io/steerer.h → src/libgeodecomp/io/steerer.h b/src/io/steerer.h → src/libgeodecomp/io/steerer.h
diff --git a/...lization/nesting/test/unit/CMakeLists.txt → ...omp/io/test/parallel_mpi_1/CMakeLists.txt b/...lization/nesting/test/unit/CMakeLists.txt → ...omp/io/test/parallel_mpi_1/CMakeLists.txt
diff --git a/src/io/test/parallel_mpi_1/asciiwritertest.h → .../io/test/parallel_mpi_1/asciiwritertest.h b/src/io/test/parallel_mpi_1/asciiwritertest.h → .../io/test/parallel_mpi_1/asciiwritertest.h
diff --git a/src/io/test/parallel_mpi_1/ioexceptiontest.h → .../io/test/parallel_mpi_1/ioexceptiontest.h b/src/io/test/parallel_mpi_1/ioexceptiontest.h → .../io/test/parallel_mpi_1/ioexceptiontest.h
diff --git a/src/io/test/parallel_mpi_1/mpiiotest.h → ...decomp/io/test/parallel_mpi_1/mpiiotest.h b/src/io/test/parallel_mpi_1/mpiiotest.h → ...decomp/io/test/parallel_mpi_1/mpiiotest.h
diff --git a/src/io/test/parallel_mpi_1/mpiiowritertest.h → .../io/test/parallel_mpi_1/mpiiowritertest.h b/src/io/test/parallel_mpi_1/mpiiowritertest.h → .../io/test/parallel_mpi_1/mpiiowritertest.h
diff --git a/src/io/test/parallel_mpi_1/plottertest.h → ...comp/io/test/parallel_mpi_1/plottertest.h b/src/io/test/parallel_mpi_1/plottertest.h → ...comp/io/test/parallel_mpi_1/plottertest.h
diff --git a/src/io/test/parallel_mpi_1/ppmwritertest.h → ...mp/io/test/parallel_mpi_1/ppmwritertest.h b/src/io/test/parallel_mpi_1/ppmwritertest.h → ...mp/io/test/parallel_mpi_1/ppmwritertest.h
diff --git a/.../test/parallel_mpi_1/qtwidgetwritertest.h → .../test/parallel_mpi_1/qtwidgetwritertest.h b/.../test/parallel_mpi_1/qtwidgetwritertest.h → .../test/parallel_mpi_1/qtwidgetwritertest.h
diff --git a/...test/parallel_mpi_1/testinitializertest.h → ...test/parallel_mpi_1/testinitializertest.h b/...test/parallel_mpi_1/testinitializertest.h → ...test/parallel_mpi_1/testinitializertest.h
diff --git a/src/io/test/parallel_mpi_1/teststeerertest.h → .../io/test/parallel_mpi_1/teststeerertest.h b/src/io/test/parallel_mpi_1/teststeerertest.h → .../io/test/parallel_mpi_1/teststeerertest.h
diff --git a/...o/test/parallel_mpi_1/tracingwritertest.h → ...o/test/parallel_mpi_1/tracingwritertest.h b/...o/test/parallel_mpi_1/tracingwritertest.h → ...o/test/parallel_mpi_1/tracingwritertest.h
diff --git a/src/io/test/parallel_mpi_1/writertest.h → ...ecomp/io/test/parallel_mpi_1/writertest.h b/src/io/test/parallel_mpi_1/writertest.h → ...ecomp/io/test/parallel_mpi_1/writertest.h
diff --git a/src/libgeodecomp/io/test/parallel_mpi_2/CMakeLists.txt b/src/libgeodecomp/io/test/parallel_mpi_2/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/src/io/test/parallel_mpi_2/bovwritertest.h → ...mp/io/test/parallel_mpi_2/bovwritertest.h b/src/io/test/parallel_mpi_2/bovwritertest.h → ...mp/io/test/parallel_mpi_2/bovwritertest.h
diff --git a/...est/parallel_mpi_2/collectingwritertest.h → ...est/parallel_mpi_2/collectingwritertest.h b/...est/parallel_mpi_2/collectingwritertest.h → ...est/parallel_mpi_2/collectingwritertest.h
diff --git a/...est/parallel_mpi_2/mpiioinitializertest.h → ...est/parallel_mpi_2/mpiioinitializertest.h b/...est/parallel_mpi_2/mpiioinitializertest.h → ...est/parallel_mpi_2/mpiioinitializertest.h
diff --git a/src/io/test/parallel_mpi_2/mpiiotest.h → ...decomp/io/test/parallel_mpi_2/mpiiotest.h b/src/io/test/parallel_mpi_2/mpiiotest.h → ...decomp/io/test/parallel_mpi_2/mpiiotest.h
diff --git a/...parallel_mpi_2/parallelmemorywritertest.h → ...parallel_mpi_2/parallelmemorywritertest.h b/...parallel_mpi_2/parallelmemorywritertest.h → ...parallel_mpi_2/parallelmemorywritertest.h
diff --git a/.../parallel_mpi_2/parallelmpiiowritertest.h → .../parallel_mpi_2/parallelmpiiowritertest.h b/.../parallel_mpi_2/parallelmpiiowritertest.h → .../parallel_mpi_2/parallelmpiiowritertest.h
diff --git a/...o/test/parallel_mpi_2/remotesteerertest.h → ...o/test/parallel_mpi_2/remotesteerertest.h b/...o/test/parallel_mpi_2/remotesteerertest.h → ...o/test/parallel_mpi_2/remotesteerertest.h
diff --git a/...o/test/parallel_mpi_2/tracingwritertest.h → ...o/test/parallel_mpi_2/tracingwritertest.h b/...o/test/parallel_mpi_2/tracingwritertest.h → ...o/test/parallel_mpi_2/tracingwritertest.h
diff --git a/src/libgeodecomp/io/test/unit/CMakeLists.txt b/src/libgeodecomp/io/test/unit/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/...est/unit/clonableinitializerwrappertest.h → ...est/unit/clonableinitializerwrappertest.h b/...est/unit/clonableinitializerwrappertest.h → ...est/unit/clonableinitializerwrappertest.h
diff --git a/src/io/test/unit/initializertest.h → ...bgeodecomp/io/test/unit/initializertest.h b/src/io/test/unit/initializertest.h → ...bgeodecomp/io/test/unit/initializertest.h
diff --git a/src/io/test/unit/serialbovwritertest.h → ...decomp/io/test/unit/serialbovwritertest.h b/src/io/test/unit/serialbovwritertest.h → ...decomp/io/test/unit/serialbovwritertest.h
diff --git a/src/io/test/unit/silowritertest.h → ...ibgeodecomp/io/test/unit/silowritertest.h b/src/io/test/unit/silowritertest.h → ...ibgeodecomp/io/test/unit/silowritertest.h
diff --git a/src/io/test/unit/steerertest.h → src/libgeodecomp/io/test/unit/steerertest.h b/src/io/test/unit/steerertest.h → src/libgeodecomp/io/test/unit/steerertest.h
diff --git a/src/io/test/unit/timetest.h → src/libgeodecomp/io/test/unit/timetest.h b/src/io/test/unit/timetest.h → src/libgeodecomp/io/test/unit/timetest.h
diff --git a/...st/unit/unstructuredtestinitializertest.h → ...st/unit/unstructuredtestinitializertest.h b/...st/unit/unstructuredtestinitializertest.h → ...st/unit/unstructuredtestinitializertest.h
diff --git a/src/io/test/unit/visitwritertest.h → ...bgeodecomp/io/test/unit/visitwritertest.h b/src/io/test/unit/visitwritertest.h → ...bgeodecomp/io/test/unit/visitwritertest.h
diff --git a/src/io/testinitializer.h → src/libgeodecomp/io/testinitializer.h b/src/io/testinitializer.h → src/libgeodecomp/io/testinitializer.h
diff --git a/src/io/teststeerer.h → src/libgeodecomp/io/teststeerer.h b/src/io/teststeerer.h → src/libgeodecomp/io/teststeerer.h
diff --git a/src/io/testwriter.h → src/libgeodecomp/io/testwriter.h b/src/io/testwriter.h → src/libgeodecomp/io/testwriter.h
diff --git a/src/io/time.h → src/libgeodecomp/io/time.h b/src/io/time.h → src/libgeodecomp/io/time.h
diff --git a/src/io/tracingwriter.h → src/libgeodecomp/io/tracingwriter.h b/src/io/tracingwriter.h → src/libgeodecomp/io/tracingwriter.h
diff --git a/src/io/unstructuredtestinitializer.h → ...eodecomp/io/unstructuredtestinitializer.h b/src/io/unstructuredtestinitializer.h → ...eodecomp/io/unstructuredtestinitializer.h
diff --git a/src/io/varstepinitializerproxy.h → ...libgeodecomp/io/varstepinitializerproxy.h b/src/io/varstepinitializerproxy.h → ...libgeodecomp/io/varstepinitializerproxy.h
diff --git a/src/io/visitwriter.h → src/libgeodecomp/io/visitwriter.h b/src/io/visitwriter.h → src/libgeodecomp/io/visitwriter.h
diff --git a/src/io/writer.h → src/libgeodecomp/io/writer.h b/src/io/writer.h → src/libgeodecomp/io/writer.h
diff --git a/src/loadbalancer/CMakeLists.txt → src/libgeodecomp/loadbalancer/CMakeLists.txt b/src/loadbalancer/CMakeLists.txt → src/libgeodecomp/loadbalancer/CMakeLists.txt
diff --git a/src/loadbalancer/biasbalancer.cpp → ...ibgeodecomp/loadbalancer/biasbalancer.cpp b/src/loadbalancer/biasbalancer.cpp → ...ibgeodecomp/loadbalancer/biasbalancer.cpp
diff --git a/src/loadbalancer/biasbalancer.h → src/libgeodecomp/loadbalancer/biasbalancer.h b/src/loadbalancer/biasbalancer.h → src/libgeodecomp/loadbalancer/biasbalancer.h
diff --git a/src/loadbalancer/loadbalancer.cpp → ...ibgeodecomp/loadbalancer/loadbalancer.cpp b/src/loadbalancer/loadbalancer.cpp → ...ibgeodecomp/loadbalancer/loadbalancer.cpp
diff --git a/src/loadbalancer/loadbalancer.h → src/libgeodecomp/loadbalancer/loadbalancer.h b/src/loadbalancer/loadbalancer.h → src/libgeodecomp/loadbalancer/loadbalancer.h
diff --git a/src/loadbalancer/mockbalancer.cpp → ...ibgeodecomp/loadbalancer/mockbalancer.cpp b/src/loadbalancer/mockbalancer.cpp → ...ibgeodecomp/loadbalancer/mockbalancer.cpp
diff --git a/src/loadbalancer/mockbalancer.h → src/libgeodecomp/loadbalancer/mockbalancer.h b/src/loadbalancer/mockbalancer.h → src/libgeodecomp/loadbalancer/mockbalancer.h
diff --git a/src/loadbalancer/noopbalancer.h → src/libgeodecomp/loadbalancer/noopbalancer.h b/src/loadbalancer/noopbalancer.h → src/libgeodecomp/loadbalancer/noopbalancer.h
diff --git a/src/loadbalancer/oozebalancer.cpp → ...ibgeodecomp/loadbalancer/oozebalancer.cpp b/src/loadbalancer/oozebalancer.cpp → ...ibgeodecomp/loadbalancer/oozebalancer.cpp
diff --git a/src/loadbalancer/oozebalancer.h → src/libgeodecomp/loadbalancer/oozebalancer.h b/src/loadbalancer/oozebalancer.h → src/libgeodecomp/loadbalancer/oozebalancer.h
diff --git a/src/loadbalancer/randombalancer.cpp → ...geodecomp/loadbalancer/randombalancer.cpp b/src/loadbalancer/randombalancer.cpp → ...geodecomp/loadbalancer/randombalancer.cpp
diff --git a/src/loadbalancer/randombalancer.h → ...ibgeodecomp/loadbalancer/randombalancer.h b/src/loadbalancer/randombalancer.h → ...ibgeodecomp/loadbalancer/randombalancer.h
diff --git a/...er/test/parallel_hpx_1/oozebalancertest.h → ...er/test/parallel_hpx_1/oozebalancertest.h b/...er/test/parallel_hpx_1/oozebalancertest.h → ...er/test/parallel_hpx_1/oozebalancertest.h
diff --git a/src/libgeodecomp/loadbalancer/test/unit/CMakeLists.txt b/src/libgeodecomp/loadbalancer/test/unit/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/...loadbalancer/test/unit/biasbalancertest.h → ...loadbalancer/test/unit/biasbalancertest.h b/...loadbalancer/test/unit/biasbalancertest.h → ...loadbalancer/test/unit/biasbalancertest.h
diff --git a/...loadbalancer/test/unit/noopbalancertest.h → ...loadbalancer/test/unit/noopbalancertest.h b/...loadbalancer/test/unit/noopbalancertest.h → ...loadbalancer/test/unit/noopbalancertest.h
diff --git a/...loadbalancer/test/unit/oozebalancertest.h → ...loadbalancer/test/unit/oozebalancertest.h b/...loadbalancer/test/unit/oozebalancertest.h → ...loadbalancer/test/unit/oozebalancertest.h
diff --git a/...adbalancer/test/unit/randombalancertest.h → ...adbalancer/test/unit/randombalancertest.h b/...adbalancer/test/unit/randombalancertest.h → ...adbalancer/test/unit/randombalancertest.h
diff --git a/...dbalancer/test/unit/tracingbalancertest.h → ...dbalancer/test/unit/tracingbalancertest.h b/...dbalancer/test/unit/tracingbalancertest.h → ...dbalancer/test/unit/tracingbalancertest.h
diff --git a/src/loadbalancer/tracingbalancer.h → ...bgeodecomp/loadbalancer/tracingbalancer.h b/src/loadbalancer/tracingbalancer.h → ...bgeodecomp/loadbalancer/tracingbalancer.h
diff --git a/src/misc/CMakeLists.txt → src/libgeodecomp/misc/CMakeLists.txt b/src/misc/CMakeLists.txt → src/libgeodecomp/misc/CMakeLists.txt
diff --git a/src/misc/apitraits.h → src/libgeodecomp/misc/apitraits.h b/src/misc/apitraits.h → src/libgeodecomp/misc/apitraits.h
diff --git a/src/misc/cacheblockingsimulationfactory.h → ...omp/misc/cacheblockingsimulationfactory.h b/src/misc/cacheblockingsimulationfactory.h → ...omp/misc/cacheblockingsimulationfactory.h
diff --git a/src/misc/chronometer.h → src/libgeodecomp/misc/chronometer.h b/src/misc/chronometer.h → src/libgeodecomp/misc/chronometer.h
diff --git a/src/misc/clonable.h → src/libgeodecomp/misc/clonable.h b/src/misc/clonable.h → src/libgeodecomp/misc/clonable.h
diff --git a/src/misc/color.cpp → src/libgeodecomp/misc/color.cpp b/src/misc/color.cpp → src/libgeodecomp/misc/color.cpp
diff --git a/src/misc/color.h → src/libgeodecomp/misc/color.h b/src/misc/color.h → src/libgeodecomp/misc/color.h
diff --git a/src/misc/cudasimulationfactory.h → ...libgeodecomp/misc/cudasimulationfactory.h b/src/misc/cudasimulationfactory.h → ...libgeodecomp/misc/cudasimulationfactory.h
diff --git a/src/misc/cudautil.h → src/libgeodecomp/misc/cudautil.h b/src/misc/cudautil.h → src/libgeodecomp/misc/cudautil.h
diff --git a/src/misc/fpscounter.h → src/libgeodecomp/misc/fpscounter.h b/src/misc/fpscounter.h → src/libgeodecomp/misc/fpscounter.h
diff --git a/src/misc/likely.h → src/libgeodecomp/misc/likely.h b/src/misc/likely.h → src/libgeodecomp/misc/likely.h
diff --git a/src/misc/math.h → src/libgeodecomp/misc/math.h b/src/misc/math.h → src/libgeodecomp/misc/math.h
diff --git a/src/misc/nonpodtestcell.h → src/libgeodecomp/misc/nonpodtestcell.h b/src/misc/nonpodtestcell.h → src/libgeodecomp/misc/nonpodtestcell.h
diff --git a/src/misc/optimizer.h → src/libgeodecomp/misc/optimizer.h b/src/misc/optimizer.h → src/libgeodecomp/misc/optimizer.h
diff --git a/src/misc/palette.h → src/libgeodecomp/misc/palette.h b/src/misc/palette.h → src/libgeodecomp/misc/palette.h
diff --git a/src/misc/patternoptimizer.cpp → src/libgeodecomp/misc/patternoptimizer.cpp b/src/misc/patternoptimizer.cpp → src/libgeodecomp/misc/patternoptimizer.cpp
diff --git a/src/misc/patternoptimizer.h → src/libgeodecomp/misc/patternoptimizer.h b/src/misc/patternoptimizer.h → src/libgeodecomp/misc/patternoptimizer.h
diff --git a/src/misc/quickpalette.h → src/libgeodecomp/misc/quickpalette.h b/src/misc/quickpalette.h → src/libgeodecomp/misc/quickpalette.h
diff --git a/src/misc/random.cpp → src/libgeodecomp/misc/random.cpp b/src/misc/random.cpp → src/libgeodecomp/misc/random.cpp
diff --git a/src/misc/random.h → src/libgeodecomp/misc/random.h b/src/misc/random.h → src/libgeodecomp/misc/random.h
diff --git a/src/misc/scopedtimer.h → src/libgeodecomp/misc/scopedtimer.h b/src/misc/scopedtimer.h → src/libgeodecomp/misc/scopedtimer.h
diff --git a/src/misc/serialsimulationfactory.h → ...bgeodecomp/misc/serialsimulationfactory.h b/src/misc/serialsimulationfactory.h → ...bgeodecomp/misc/serialsimulationfactory.h
diff --git a/src/misc/sharedptr.h → src/libgeodecomp/misc/sharedptr.h b/src/misc/sharedptr.h → src/libgeodecomp/misc/sharedptr.h
diff --git a/src/misc/simfabtestmodel.h → src/libgeodecomp/misc/simfabtestmodel.h b/src/misc/simfabtestmodel.h → src/libgeodecomp/misc/simfabtestmodel.h
diff --git a/src/misc/simplexoptimizer.cpp → src/libgeodecomp/misc/simplexoptimizer.cpp b/src/misc/simplexoptimizer.cpp → src/libgeodecomp/misc/simplexoptimizer.cpp
diff --git a/src/misc/simplexoptimizer.h → src/libgeodecomp/misc/simplexoptimizer.h b/src/misc/simplexoptimizer.h → src/libgeodecomp/misc/simplexoptimizer.h
diff --git a/src/misc/simulationfactory.h → src/libgeodecomp/misc/simulationfactory.h b/src/misc/simulationfactory.h → src/libgeodecomp/misc/simulationfactory.h
diff --git a/src/misc/simulationparameters.h → src/libgeodecomp/misc/simulationparameters.h b/src/misc/simulationparameters.h → src/libgeodecomp/misc/simulationparameters.h
diff --git a/src/misc/stdcontaineroverloads.h → ...libgeodecomp/misc/stdcontaineroverloads.h b/src/misc/stdcontaineroverloads.h → ...libgeodecomp/misc/stdcontaineroverloads.h
diff --git a/src/misc/stringops.h → src/libgeodecomp/misc/stringops.h b/src/misc/stringops.h → src/libgeodecomp/misc/stringops.h
diff --git a/src/misc/stringvec.h → src/libgeodecomp/misc/stringvec.h b/src/misc/stringvec.h → src/libgeodecomp/misc/stringvec.h
diff --git a/src/misc/tempfile.cpp → src/libgeodecomp/misc/tempfile.cpp b/src/misc/tempfile.cpp → src/libgeodecomp/misc/tempfile.cpp
diff --git a/src/misc/tempfile.h → src/libgeodecomp/misc/tempfile.h b/src/misc/tempfile.h → src/libgeodecomp/misc/tempfile.h
diff --git a/src/libgeodecomp/misc/test/parallel_mpi_1/CMakeLists.txt b/src/libgeodecomp/misc/test/parallel_mpi_1/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/src/misc/test/parallel_mpi_1/apitraitstest.h → .../misc/test/parallel_mpi_1/apitraitstest.h b/src/misc/test/parallel_mpi_1/apitraitstest.h → .../misc/test/parallel_mpi_1/apitraitstest.h
diff --git a/src/libgeodecomp/misc/test/parallel_openmp_1/CMakeLists.txt b/src/libgeodecomp/misc/test/parallel_openmp_1/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/...parallel_openmp_1/simulationfactorytest.h → ...parallel_openmp_1/simulationfactorytest.h b/...parallel_openmp_1/simulationfactorytest.h → ...parallel_openmp_1/simulationfactorytest.h
diff --git a/src/libgeodecomp/misc/test/unit/CMakeLists.txt b/src/libgeodecomp/misc/test/unit/CMakeLists.txt
@@ -0,0 +1 @@
+include(../../../../../CMakeModules/CMakeLists.test.txt)
diff --git a/src/misc/test/unit/apitraitstest.h → ...bgeodecomp/misc/test/unit/apitraitstest.h b/src/misc/test/unit/apitraitstest.h → ...bgeodecomp/misc/test/unit/apitraitstest.h
diff --git a/src/misc/test/unit/chronometertest.h → ...eodecomp/misc/test/unit/chronometertest.h b/src/misc/test/unit/chronometertest.h → ...eodecomp/misc/test/unit/chronometertest.h
diff --git a/src/misc/test/unit/clonabletest.h → ...ibgeodecomp/misc/test/unit/clonabletest.h b/src/misc/test/unit/clonabletest.h → ...ibgeodecomp/misc/test/unit/clonabletest.h
diff --git a/src/misc/test/unit/cudautiltest.h → ...ibgeodecomp/misc/test/unit/cudautiltest.h b/src/misc/test/unit/cudautiltest.h → ...ibgeodecomp/misc/test/unit/cudautiltest.h
diff --git a/src/misc/test/unit/nonpodtestcelltest.h → ...ecomp/misc/test/unit/nonpodtestcelltest.h b/src/misc/test/unit/nonpodtestcelltest.h → ...ecomp/misc/test/unit/nonpodtestcelltest.h
diff --git a/src/misc/test/unit/optimizertest.h → ...bgeodecomp/misc/test/unit/optimizertest.h b/src/misc/test/unit/optimizertest.h → ...bgeodecomp/misc/test/unit/optimizertest.h
diff --git a/src/misc/test/unit/optimizertestfunctions.h → ...p/misc/test/unit/optimizertestfunctions.h b/src/misc/test/unit/optimizertestfunctions.h → ...p/misc/test/unit/optimizertestfunctions.h
diff --git a/src/misc/test/unit/palettetest.h → ...libgeodecomp/misc/test/unit/palettetest.h b/src/misc/test/unit/palettetest.h → ...libgeodecomp/misc/test/unit/palettetest.h
diff --git a/src/misc/test/unit/quickpalettetest.h → ...odecomp/misc/test/unit/quickpalettetest.h b/src/misc/test/unit/quickpalettetest.h → ...odecomp/misc/test/unit/quickpalettetest.h
diff --git a/src/misc/test/unit/randomtest.h → src/libgeodecomp/misc/test/unit/randomtest.h b/src/misc/test/unit/randomtest.h → src/libgeodecomp/misc/test/unit/randomtest.h
diff --git a/src/misc/test/unit/scopedtimertest.h → ...eodecomp/misc/test/unit/scopedtimertest.h b/src/misc/test/unit/scopedtimertest.h → ...eodecomp/misc/test/unit/scopedtimertest.h
diff --git a/...test/unit/simulationfactorywithcudatest.h → ...test/unit/simulationfactorywithcudatest.h b/...test/unit/simulationfactorywithcudatest.h → ...test/unit/simulationfactorywithcudatest.h
diff --git a/...t/unit/simulationfactorywithoutcudatest.h → ...t/unit/simulationfactorywithoutcudatest.h b/...t/unit/simulationfactorywithoutcudatest.h → ...t/unit/simulationfactorywithoutcudatest.h
diff --git a/...misc/test/unit/simulationparameterstest.h → ...misc/test/unit/simulationparameterstest.h b/...misc/test/unit/simulationparameterstest.h → ...misc/test/unit/simulationparameterstest.h
diff --git a/...isc/test/unit/stdcontaineroverloadstest.h → ...isc/test/unit/stdcontaineroverloadstest.h b/...isc/test/unit/stdcontaineroverloadstest.h → ...isc/test/unit/stdcontaineroverloadstest.h
diff --git a/src/misc/test/unit/stringopstest.h → ...bgeodecomp/misc/test/unit/stringopstest.h b/src/misc/test/unit/stringopstest.h → ...bgeodecomp/misc/test/unit/stringopstest.h
diff --git a/src/misc/test/unit/tempfiletest.h → ...ibgeodecomp/misc/test/unit/tempfiletest.h b/src/misc/test/unit/tempfiletest.h → ...ibgeodecomp/misc/test/unit/tempfiletest.h
diff --git a/src/misc/test/unit/testcelltest.h → ...ibgeodecomp/misc/test/unit/testcelltest.h b/src/misc/test/unit/testcelltest.h → ...ibgeodecomp/misc/test/unit/testcelltest.h
diff --git a/src/misc/test/unit/testhelpertest.h → ...geodecomp/misc/test/unit/testhelpertest.h b/src/misc/test/unit/testhelpertest.h → ...geodecomp/misc/test/unit/testhelpertest.h
diff --git a/...misc/test/unit/unstructuredtestcelltest.h → ...misc/test/unit/unstructuredtestcelltest.h b/...misc/test/unit/unstructuredtestcelltest.h → ...misc/test/unit/unstructuredtestcelltest.h
diff --git a/src/misc/testcell.h → src/libgeodecomp/misc/testcell.h b/src/misc/testcell.h → src/libgeodecomp/misc/testcell.h
diff --git a/src/misc/testhelper.h → src/libgeodecomp/misc/testhelper.h b/src/misc/testhelper.h → src/libgeodecomp/misc/testhelper.h
diff --git a/src/misc/unstructuredtestcell.h → src/libgeodecomp/misc/unstructuredtestcell.h b/src/misc/unstructuredtestcell.h → src/libgeodecomp/misc/unstructuredtestcell.h
diff --git a/src/parallelization/CMakeLists.txt → ...bgeodecomp/parallelization/CMakeLists.txt b/src/parallelization/CMakeLists.txt → ...bgeodecomp/parallelization/CMakeLists.txt
diff --git a/src/parallelization/autotuningsimulator.h → ...omp/parallelization/autotuningsimulator.h b/src/parallelization/autotuningsimulator.h → ...omp/parallelization/autotuningsimulator.h
diff --git a/src/parallelization/cacheblockingsimulator.h → .../parallelization/cacheblockingsimulator.h b/src/parallelization/cacheblockingsimulator.h → .../parallelization/cacheblockingsimulator.h
diff --git a/src/parallelization/cudasimulator.h → ...geodecomp/parallelization/cudasimulator.h b/src/parallelization/cudasimulator.h → ...geodecomp/parallelization/cudasimulator.h
diff --git a/src/parallelization/distributedsimulator.h → ...mp/parallelization/distributedsimulator.h b/src/parallelization/distributedsimulator.h → ...mp/parallelization/distributedsimulator.h
diff --git a/src/parallelization/hierarchicalsimulator.h → ...p/parallelization/hierarchicalsimulator.h b/src/parallelization/hierarchicalsimulator.h → ...p/parallelization/hierarchicalsimulator.h
diff --git a/src/parallelization/hiparsimulator.h → ...eodecomp/parallelization/hiparsimulator.h b/src/parallelization/hiparsimulator.h → ...eodecomp/parallelization/hiparsimulator.h
diff --git a/src/parallelization/hpxdataflowsimulator.h → ...mp/parallelization/hpxdataflowsimulator.h b/src/parallelization/hpxdataflowsimulator.h → ...mp/parallelization/hpxdataflowsimulator.h
diff --git a/src/parallelization/hpxsimulator.cpp → ...eodecomp/parallelization/hpxsimulator.cpp b/src/parallelization/hpxsimulator.cpp → ...eodecomp/parallelization/hpxsimulator.cpp
diff --git a/src/parallelization/hpxsimulator.h → ...bgeodecomp/parallelization/hpxsimulator.h b/src/parallelization/hpxsimulator.h → ...bgeodecomp/parallelization/hpxsimulator.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		include(../../../../../../CMakeModules/CMakeLists.test.txt)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		include(../../../../../CMakeModules/CMakeLists.test.txt)