diff --git a/test/io/CMakeLists.txt b/test/io/CMakeLists.txt
index ad790477b5a6a8d445b5ef4a345ccdf8c84a1ac6..8d5a10a188d7c1d4df50005350e2322c61075721 100644
--- a/test/io/CMakeLists.txt
+++ b/test/io/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory("gnuplotinterface")
-add_subdirectory("gridcreator")
+add_subdirectory("gridmanager")
add_subdirectory("container")
diff --git a/test/io/gridcreator/CMakeLists.txt b/test/io/gridmanager/CMakeLists.txt
similarity index 67%
rename from test/io/gridcreator/CMakeLists.txt
rename to test/io/gridmanager/CMakeLists.txt
index 40f182bc30c53efbf7e625ae4202a46811dde754..320308f86908f25873642ec1bbd01b781aa46c3d 100644
--- a/test/io/gridcreator/CMakeLists.txt
+++ b/test/io/gridmanager/CMakeLists.txt
@@ -1,170 +1,170 @@
add_input_file_links()
dune_symlink_to_source_files(FILES grids)
-dune_add_test(NAME test_gridcreator_cake
- SOURCES test_gridcreator_cake.cc
+dune_add_test(NAME test_gridmanager_cake
+ SOURCES test_gridmanager_cake.cc
CMAKE_GUARD "( dune-uggrid_FOUND OR dune-alugrid_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_cake"
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake"
--files ${CMAKE_SOURCE_DIR}/test/references/cake-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/cake-00000.vtu)
-dune_add_test(NAME test_gridcreator_subgrid
- SOURCES test_gridcreator_subgrid.cc
+dune_add_test(NAME test_gridmanager_subgrid
+ SOURCES test_gridmanager_subgrid.cc
CMAKE_GUARD dune-subgrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_subgrid"
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_subgrid"
--files ${CMAKE_SOURCE_DIR}/test/references/subgrid-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/subgrid_three.vtu)
-dune_symlink_to_source_files(FILES "test_gridcreator_gmsh_3d.input"
- "test_gridcreator_gmsh_e_markers.input"
- "test_gridcreator_dgf_e_markers.input")
+dune_symlink_to_source_files(FILES "test_gridmanager_gmsh_3d.input"
+ "test_gridmanager_gmsh_e_markers.input"
+ "test_gridmanager_dgf_e_markers.input")
-add_executable(test_gridcreator_gmsh_3d_alu EXCLUDE_FROM_ALL test_gridcreator_gmsh_3d.cc)
-target_compile_definitions(test_gridcreator_gmsh_3d_alu PUBLIC GRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::nonconforming>)
+add_executable(test_gridmanager_gmsh_3d_alu EXCLUDE_FROM_ALL test_gridmanager_gmsh_3d.cc)
+target_compile_definitions(test_gridmanager_gmsh_3d_alu PUBLIC GRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::nonconforming>)
-dune_add_test(NAME test_gridcreator_gmsh_3d_alu_sequential
- TARGET test_gridcreator_gmsh_3d_alu
+dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential
+ TARGET test_gridmanager_gmsh_3d_alu
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_3d_alu -Problem.Name bifurcation_alu -Grid.Refine false"
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_3d_alu -Problem.Name bifurcation_alu -Grid.Refine false"
--files ${CMAKE_SOURCE_DIR}/test/references/bifurcation_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/bifurcation_alu-00000.vtu)
-dune_add_test(NAME test_gridcreator_gmsh_3d_alu_parallel
- TARGET test_gridcreator_gmsh_3d_alu
+dune_add_test(NAME test_gridmanager_gmsh_3d_alu_parallel
+ TARGET test_gridmanager_gmsh_3d_alu
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
- --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_3d_alu -Problem.Name bifurcation_alu_parallel -Grid.Refine false"
+ --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_3d_alu -Problem.Name bifurcation_alu_parallel -Grid.Refine false"
--files ${CMAKE_SOURCE_DIR}/test/references/bifurcation_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-bifurcation_alu_parallel-00000.pvtu)
-add_executable(test_gridcreator_gmsh_3d_ug EXCLUDE_FROM_ALL test_gridcreator_gmsh_3d.cc)
-target_compile_definitions(test_gridcreator_gmsh_3d_ug PUBLIC GRIDTYPE=Dune::UGGrid<3>)
+add_executable(test_gridmanager_gmsh_3d_ug EXCLUDE_FROM_ALL test_gridmanager_gmsh_3d.cc)
+target_compile_definitions(test_gridmanager_gmsh_3d_ug PUBLIC GRIDTYPE=Dune::UGGrid<3>)
-dune_add_test(NAME test_gridcreator_gmsh_3d_ug_sequential
- TARGET test_gridcreator_gmsh_3d_ug
+dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential
+ TARGET test_gridmanager_gmsh_3d_ug
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_3d_ug -Problem.Name bifurcation_ug"
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_3d_ug -Problem.Name bifurcation_ug"
--files ${CMAKE_SOURCE_DIR}/test/references/bifurcation_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/bifurcation_ug-00000.vtu
${CMAKE_SOURCE_DIR}/test/references/bifurcation_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/bifurcation_ug-00001.vtu)
-dune_add_test(NAME test_gridcreator_gmsh_3d_ug_parallel
- TARGET test_gridcreator_gmsh_3d_ug
+dune_add_test(NAME test_gridmanager_gmsh_3d_ug_parallel
+ TARGET test_gridmanager_gmsh_3d_ug
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
- --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_3d_ug -Problem.Name bifurcation_ug_parallel"
+ --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_3d_ug -Problem.Name bifurcation_ug_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/bifurcation_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-bifurcation_ug_parallel-00000.pvtu
${CMAKE_SOURCE_DIR}/test/references/bifurcation_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-bifurcation_ug_parallel-00001.pvtu)
-add_executable(test_gridcreator_gmsh_e_markers_alu EXCLUDE_FROM_ALL test_gridcreator_gmsh_e_markers.cc)
-target_compile_definitions(test_gridcreator_gmsh_e_markers_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>)
+add_executable(test_gridmanager_gmsh_e_markers_alu EXCLUDE_FROM_ALL test_gridmanager_gmsh_e_markers.cc)
+target_compile_definitions(test_gridmanager_gmsh_e_markers_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>)
-dune_add_test(NAME test_gridcreator_gmsh_e_markers_alu_sequential
- TARGET test_gridcreator_gmsh_e_markers_alu
+dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential
+ TARGET test_gridmanager_gmsh_e_markers_alu
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_e_markers_alu -Problem.Name fracture_alu"
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_e_markers_alu -Problem.Name fracture_alu"
--files ${CMAKE_SOURCE_DIR}/test/references/fracture_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/fracture_alu-00000.vtu
${CMAKE_SOURCE_DIR}/test/references/fracture_alu-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/fracture_alu-00001.vtu)
-dune_add_test(NAME test_gridcreator_gmsh_e_markers_alu_parallel
- TARGET test_gridcreator_gmsh_e_markers_alu
+dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_parallel
+ TARGET test_gridmanager_gmsh_e_markers_alu
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
- --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_e_markers_alu -Problem.Name fracture_alu_parallel"
+ --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_e_markers_alu -Problem.Name fracture_alu_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/fracture_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-fracture_alu_parallel-00000.pvtu
${CMAKE_SOURCE_DIR}/test/references/fracture_alu-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-fracture_alu_parallel-00001.pvtu)
-add_executable(test_gridcreator_gmsh_e_markers_ug EXCLUDE_FROM_ALL test_gridcreator_gmsh_e_markers.cc)
-target_compile_definitions(test_gridcreator_gmsh_e_markers_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>)
+add_executable(test_gridmanager_gmsh_e_markers_ug EXCLUDE_FROM_ALL test_gridmanager_gmsh_e_markers.cc)
+target_compile_definitions(test_gridmanager_gmsh_e_markers_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>)
-dune_add_test(NAME test_gridcreator_gmsh_e_markers_ug_sequential
- TARGET test_gridcreator_gmsh_e_markers_ug
+dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential
+ TARGET test_gridmanager_gmsh_e_markers_ug
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_e_markers_ug -Problem.Name fracture_ug"
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_e_markers_ug -Problem.Name fracture_ug"
--files ${CMAKE_SOURCE_DIR}/test/references/fracture_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/fracture_ug-00000.vtu
${CMAKE_SOURCE_DIR}/test/references/fracture_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/fracture_ug-00001.vtu)
-dune_add_test(NAME test_gridcreator_gmsh_e_markers_ug_parallel
- TARGET test_gridcreator_gmsh_e_markers_ug
+dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_parallel
+ TARGET test_gridmanager_gmsh_e_markers_ug
CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
- --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_e_markers_ug -Problem.Name fracture_ug_parallel"
+ --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_e_markers_ug -Problem.Name fracture_ug_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/fracture_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-fracture_ug_parallel-00000.pvtu
${CMAKE_SOURCE_DIR}/test/references/fracture_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-fracture_ug_parallel-00001.pvtu)
-add_executable(test_gridcreator_dgf_e_markers_alu EXCLUDE_FROM_ALL test_gridcreator_dgf_e_markers.cc)
-target_compile_definitions(test_gridcreator_dgf_e_markers_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>)
+add_executable(test_gridmanager_dgf_e_markers_alu EXCLUDE_FROM_ALL test_gridmanager_dgf_e_markers.cc)
+target_compile_definitions(test_gridmanager_dgf_e_markers_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>)
-dune_add_test(NAME test_gridcreator_dgf_e_markers_alu_sequential
- TARGET test_gridcreator_dgf_e_markers_alu
+dune_add_test(NAME test_gridmanager_dgf_e_markers_alu_sequential
+ TARGET test_gridmanager_dgf_e_markers_alu
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_dgf_e_markers_alu -Problem.Name co2_alu"
- --files ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_alu-reference.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_dgf_e_markers_alu -Problem.Name co2_alu"
+ --files ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_alu-00000.vtu
- ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_alu-reference-refined.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_alu-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_alu-00001.vtu)
-dune_add_test(NAME test_gridcreator_dgf_e_markers_alu_parallel
- TARGET test_gridcreator_dgf_e_markers_alu
+dune_add_test(NAME test_gridmanager_dgf_e_markers_alu_parallel
+ TARGET test_gridmanager_dgf_e_markers_alu
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
- --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_dgf_e_markers_alu -Problem.Name co2_alu_parallel"
- --files ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_alu-reference.vtu
+ --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_dgf_e_markers_alu -Problem.Name co2_alu_parallel"
+ --files ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-co2_alu_parallel-00000.pvtu
- ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_alu-reference-refined.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_alu-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-co2_alu_parallel-00001.pvtu)
-add_executable(test_gridcreator_dgf_e_markers_ug EXCLUDE_FROM_ALL test_gridcreator_dgf_e_markers.cc)
-target_compile_definitions(test_gridcreator_dgf_e_markers_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>)
+add_executable(test_gridmanager_dgf_e_markers_ug EXCLUDE_FROM_ALL test_gridmanager_dgf_e_markers.cc)
+target_compile_definitions(test_gridmanager_dgf_e_markers_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>)
-dune_add_test(NAME test_gridcreator_dgf_e_markers_ug_sequential
- TARGET test_gridcreator_dgf_e_markers_ug
+dune_add_test(NAME test_gridmanager_dgf_e_markers_ug_sequential
+ TARGET test_gridmanager_dgf_e_markers_ug
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_dgf_e_markers_ug -Problem.Name co2_ug"
- --files ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_ug-reference.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_dgf_e_markers_ug -Problem.Name co2_ug"
+ --files ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_ug-00000.vtu
- ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_ug-reference-refined.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_ug-00001.vtu)
-dune_add_test(NAME test_gridcreator_dgf_e_markers_ug_parallel
- TARGET test_gridcreator_dgf_e_markers_ug
+dune_add_test(NAME test_gridmanager_dgf_e_markers_ug_parallel
+ TARGET test_gridmanager_dgf_e_markers_ug
CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
- --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_dgf_e_markers_ug -Problem.Name co2_ug_parallel"
- --files ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_ug-reference.vtu
+ --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_dgf_e_markers_ug -Problem.Name co2_ug_parallel"
+ --files ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-co2_ug_parallel-00000.pvtu
- ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_ug-reference-refined.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-co2_ug_parallel-00001.pvtu)
diff --git a/test/io/gridcreator/gridmanagertests.hh b/test/io/gridmanager/gridmanagertests.hh
similarity index 100%
rename from test/io/gridcreator/gridmanagertests.hh
rename to test/io/gridmanager/gridmanagertests.hh
diff --git a/test/io/gridcreator/grids/bifurcation.geo b/test/io/gridmanager/grids/bifurcation.geo
similarity index 100%
rename from test/io/gridcreator/grids/bifurcation.geo
rename to test/io/gridmanager/grids/bifurcation.geo
diff --git a/test/io/gridcreator/grids/bifurcation.msh b/test/io/gridmanager/grids/bifurcation.msh
similarity index 100%
rename from test/io/gridcreator/grids/bifurcation.msh
rename to test/io/gridmanager/grids/bifurcation.msh
diff --git a/test/io/gridcreator/grids/complex_equi_coarse_quad.msh b/test/io/gridmanager/grids/complex_equi_coarse_quad.msh
similarity index 100%
rename from test/io/gridcreator/grids/complex_equi_coarse_quad.msh
rename to test/io/gridmanager/grids/complex_equi_coarse_quad.msh
diff --git a/test/io/gridcreator/grids/complex_equi_coarse_tri.msh b/test/io/gridmanager/grids/complex_equi_coarse_tri.msh
similarity index 100%
rename from test/io/gridcreator/grids/complex_equi_coarse_tri.msh
rename to test/io/gridmanager/grids/complex_equi_coarse_tri.msh
diff --git a/test/io/gridcreator/grids/heterogeneousSmall.dgf b/test/io/gridmanager/grids/heterogeneousSmall.dgf
similarity index 100%
rename from test/io/gridcreator/grids/heterogeneousSmall.dgf
rename to test/io/gridmanager/grids/heterogeneousSmall.dgf
diff --git a/test/io/gridcreator/grids/unitcube.geo b/test/io/gridmanager/grids/unitcube.geo
similarity index 100%
rename from test/io/gridcreator/grids/unitcube.geo
rename to test/io/gridmanager/grids/unitcube.geo
diff --git a/test/io/gridcreator/grids/unitcube.msh b/test/io/gridmanager/grids/unitcube.msh
similarity index 100%
rename from test/io/gridcreator/grids/unitcube.msh
rename to test/io/gridmanager/grids/unitcube.msh
diff --git a/test/io/gridcreator/grids/unitsquare.geo b/test/io/gridmanager/grids/unitsquare.geo
similarity index 100%
rename from test/io/gridcreator/grids/unitsquare.geo
rename to test/io/gridmanager/grids/unitsquare.geo
diff --git a/test/io/gridcreator/grids/unitsquare_quad.msh b/test/io/gridmanager/grids/unitsquare_quad.msh
similarity index 100%
rename from test/io/gridcreator/grids/unitsquare_quad.msh
rename to test/io/gridmanager/grids/unitsquare_quad.msh
diff --git a/test/io/gridcreator/grids/unitsquare_tri.msh b/test/io/gridmanager/grids/unitsquare_tri.msh
similarity index 100%
rename from test/io/gridcreator/grids/unitsquare_tri.msh
rename to test/io/gridmanager/grids/unitsquare_tri.msh
diff --git a/test/io/gridcreator/test_gridcreator_cake.cc b/test/io/gridmanager/test_gridmanager_cake.cc
similarity index 98%
rename from test/io/gridcreator/test_gridcreator_cake.cc
rename to test/io/gridmanager/test_gridmanager_cake.cc
index 7ecfee27bfb42f599de17a91b0f0179a4108d34d..5112e69af4a2abd63b0dae051235c9735c576ede 100644
--- a/test/io/gridcreator/test_gridcreator_cake.cc
+++ b/test/io/gridmanager/test_gridmanager_cake.cc
@@ -64,7 +64,7 @@ int main(int argc, char** argv) try
GridManager gridManager;
// first read parameters from input file
- Dumux::Parameters::init(argc, argv, "test_gridcreator_cake.input");
+ Dumux::Parameters::init(argc, argv, "test_gridmanager_cake.input");
// make the grid
Dune::Timer timer;
diff --git a/test/io/gridcreator/test_gridcreator_cake.input b/test/io/gridmanager/test_gridmanager_cake.input
similarity index 100%
rename from test/io/gridcreator/test_gridcreator_cake.input
rename to test/io/gridmanager/test_gridmanager_cake.input
diff --git a/test/io/gridcreator/test_gridcreator_dgf_e_markers.cc b/test/io/gridmanager/test_gridmanager_dgf_e_markers.cc
similarity index 96%
rename from test/io/gridcreator/test_gridcreator_dgf_e_markers.cc
rename to test/io/gridmanager/test_gridmanager_dgf_e_markers.cc
index 3f5b245a15a62e4d96904384c41bf8a255a8c0ed..9dac335fcb55c94263559fbcc65ba9e6c3967602 100644
--- a/test/io/gridcreator/test_gridcreator_dgf_e_markers.cc
+++ b/test/io/gridmanager/test_gridmanager_dgf_e_markers.cc
@@ -31,7 +31,7 @@ int main(int argc, char** argv) try
{
Dune::MPIHelper::instance(argc, argv);
- Dumux::Parameters::init(argc, argv, "test_gridcreator_dgf_e_markers.input");
+ Dumux::Parameters::init(argc, argv, "test_gridmanager_dgf_e_markers.input");
auto name = Dumux::getParam<std::string>("Problem.Name");
Dumux::GridManagerTests<GRIDTYPE>::testElementMarkers("dgf", name);
diff --git a/test/io/gridcreator/test_gridcreator_dgf_e_markers.input b/test/io/gridmanager/test_gridmanager_dgf_e_markers.input
similarity index 100%
rename from test/io/gridcreator/test_gridcreator_dgf_e_markers.input
rename to test/io/gridmanager/test_gridmanager_dgf_e_markers.input
diff --git a/test/io/gridcreator/test_gridcreator_gmsh_3d.cc b/test/io/gridmanager/test_gridmanager_gmsh_3d.cc
similarity index 97%
rename from test/io/gridcreator/test_gridcreator_gmsh_3d.cc
rename to test/io/gridmanager/test_gridmanager_gmsh_3d.cc
index 2ae6aadf1f166003b2bae9b3bf3227c5ce7ed50a..7aa302c1e4a2073e8f245a0bd95a44c4e9c6a272 100644
--- a/test/io/gridcreator/test_gridcreator_gmsh_3d.cc
+++ b/test/io/gridmanager/test_gridmanager_gmsh_3d.cc
@@ -32,7 +32,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// initialize MPI, finalize is done automatically on exit
Dune::MPIHelper::instance(argc, argv);
- Parameters::init(argc, argv, "test_gridcreator_gmsh_3d.input");
+ Parameters::init(argc, argv, "test_gridmanager_gmsh_3d.input");
const auto name = getParam<std::string>("Problem.Name");
const auto refine = Dumux::getParam<bool>("Grid.Refine", true);
GridManagerTests<GRIDTYPE>::testBoundaryAndElementMarkers("gmsh", name, refine);
diff --git a/test/io/gridcreator/test_gridcreator_gmsh_3d.input b/test/io/gridmanager/test_gridmanager_gmsh_3d.input
similarity index 100%
rename from test/io/gridcreator/test_gridcreator_gmsh_3d.input
rename to test/io/gridmanager/test_gridmanager_gmsh_3d.input
diff --git a/test/io/gridcreator/test_gridcreator_gmsh_e_markers.cc b/test/io/gridmanager/test_gridmanager_gmsh_e_markers.cc
similarity index 96%
rename from test/io/gridcreator/test_gridcreator_gmsh_e_markers.cc
rename to test/io/gridmanager/test_gridmanager_gmsh_e_markers.cc
index 47dfb3ebcf3fc88d63be4d6e055d34d5f6a2339a..79090a43136ca8703f0eb5288deeebdf04de364d 100644
--- a/test/io/gridcreator/test_gridcreator_gmsh_e_markers.cc
+++ b/test/io/gridmanager/test_gridmanager_gmsh_e_markers.cc
@@ -31,7 +31,7 @@ int main(int argc, char** argv) try
{
Dune::MPIHelper::instance(argc, argv);
- Dumux::Parameters::init(argc, argv, "test_gridcreator_gmsh_e_markers.input");
+ Dumux::Parameters::init(argc, argv, "test_gridmanager_gmsh_e_markers.input");
auto name = Dumux::getParam<std::string>("Problem.Name");
Dumux::GridManagerTests<GRIDTYPE>::testElementMarkers("gmsh", name);
diff --git a/test/io/gridcreator/test_gridcreator_gmsh_e_markers.input b/test/io/gridmanager/test_gridmanager_gmsh_e_markers.input
similarity index 100%
rename from test/io/gridcreator/test_gridcreator_gmsh_e_markers.input
rename to test/io/gridmanager/test_gridmanager_gmsh_e_markers.input
diff --git a/test/io/gridcreator/test_gridcreator_subgrid.cc b/test/io/gridmanager/test_gridmanager_subgrid.cc
similarity index 100%
rename from test/io/gridcreator/test_gridcreator_subgrid.cc
rename to test/io/gridmanager/test_gridmanager_subgrid.cc
diff --git a/test/io/gridcreator/test_gridcreator_subgrid.input b/test/io/gridmanager/test_gridmanager_subgrid.input
similarity index 100%
rename from test/io/gridcreator/test_gridcreator_subgrid.input
rename to test/io/gridmanager/test_gridmanager_subgrid.input
diff --git a/test/references/gridcreator-co2_alu-reference-refined.vtu b/test/references/gridmanager-co2_alu-reference-refined.vtu
similarity index 100%
rename from test/references/gridcreator-co2_alu-reference-refined.vtu
rename to test/references/gridmanager-co2_alu-reference-refined.vtu
diff --git a/test/references/gridcreator-co2_alu-reference.vtu b/test/references/gridmanager-co2_alu-reference.vtu
similarity index 100%
rename from test/references/gridcreator-co2_alu-reference.vtu
rename to test/references/gridmanager-co2_alu-reference.vtu
diff --git a/test/references/gridcreator-co2_ug-reference-refined.vtu b/test/references/gridmanager-co2_ug-reference-refined.vtu
similarity index 100%
rename from test/references/gridcreator-co2_ug-reference-refined.vtu
rename to test/references/gridmanager-co2_ug-reference-refined.vtu
diff --git a/test/references/gridcreator-co2_ug-reference.vtu b/test/references/gridmanager-co2_ug-reference.vtu
similarity index 100%
rename from test/references/gridcreator-co2_ug-reference.vtu
rename to test/references/gridmanager-co2_ug-reference.vtu