diff --git a/dumux/io/grid/gridmanager_sub.hh b/dumux/io/grid/gridmanager_sub.hh
index 2c47f037ac91c5b741d56b4af81bbcc07e9e1baf..712a85827469252b243873a52fa7a951f3498694 100644
--- a/dumux/io/grid/gridmanager_sub.hh
+++ b/dumux/io/grid/gridmanager_sub.hh
@@ -29,6 +29,7 @@
#include <dune/common/shared_ptr.hh>
#include <dune/common/concept.hh>
+#include <dune/grid/yaspgrid.hh>
// SubGrid specific includes
#if HAVE_DUNE_SUBGRID
@@ -37,9 +38,7 @@
#include <dumux/io/rasterimagewriter.hh>
#endif
-#ifndef DUMUX_IO_GRID_MANAGER_HH
-#include <dumux/io/grid/gridmanager.hh>
-#endif
+#include <dumux/io/grid/gridmanager_base.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/boundaryflag.hh>
diff --git a/test/discretization/test_walldistance.cc b/test/discretization/test_walldistance.cc
index 1a57534c0ca89d928b866e978a036a95bad40f02..b66f94422789eaffa3f71b03b8f111d8faacd6a7 100644
--- a/test/discretization/test_walldistance.cc
+++ b/test/discretization/test_walldistance.cc
@@ -30,7 +30,9 @@
#include <dumux/common/initialize.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dune/grid/yaspgrid.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_alu.hh>
#include <dumux/geometry/distancefield.hh>
#include <dumux/discretization/method.hh>
diff --git a/test/freeflow/navierstokes/channel/2d/main.cc b/test/freeflow/navierstokes/channel/2d/main.cc
index 4f2f60446a407867324e7efdbed8da909d7e86c4..e5aad4e5cf03f9d72ba72563979d72a6ff45871c 100644
--- a/test/freeflow/navierstokes/channel/2d/main.cc
+++ b/test/freeflow/navierstokes/channel/2d/main.cc
@@ -38,7 +38,7 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/linear/istlsolvers.hh>
#include <dumux/linear/linearsolvertraits.hh>
#include <dumux/linear/linearalgebratraits.hh>
diff --git a/test/freeflow/navierstokes/donea/main.cc b/test/freeflow/navierstokes/donea/main.cc
index 541ec64892ca377fb6744a15307cf9a0173b77d4..94a527dddc13f1765eaeb517c30e43f10efcbc9a 100644
--- a/test/freeflow/navierstokes/donea/main.cc
+++ b/test/freeflow/navierstokes/donea/main.cc
@@ -34,7 +34,8 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_alu.hh>
#include <dumux/io/vtkoutputmodule.hh>
#include <dumux/linear/istlsolvers.hh>
diff --git a/test/freeflow/navierstokes/donea/main_momentum.cc b/test/freeflow/navierstokes/donea/main_momentum.cc
index af23d0888a4fe87e6c5beaf17bf95d90db93524b..d26f055d2686da82fe21de4b8ab18ba9c5c637bc 100644
--- a/test/freeflow/navierstokes/donea/main_momentum.cc
+++ b/test/freeflow/navierstokes/donea/main_momentum.cc
@@ -40,7 +40,8 @@
#include <dumux/assembly/fvassembler.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_alu.hh>
#include <dumux/io/vtkoutputmodule.hh>
#include <dumux/io/vtk/function.hh>
#include <dumux/io/vtk/intersectionwriter.hh>
diff --git a/test/freeflow/navierstokes/periodic/main.cc b/test/freeflow/navierstokes/periodic/main.cc
index 033dba53ec0b5c030c6d23b193076e5506e702d0..5b2a0defa675fc9b4654dbd403dbb909f3991667 100644
--- a/test/freeflow/navierstokes/periodic/main.cc
+++ b/test/freeflow/navierstokes/periodic/main.cc
@@ -34,7 +34,7 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_sp.hh>
#include <dumux/io/vtkoutputmodule.hh>
#include <dumux/io/vtk/function.hh>
#include <dumux/linear/istlsolvers.hh>
diff --git a/test/freeflow/navierstokesnc/channel/main.cc b/test/freeflow/navierstokesnc/channel/main.cc
index 0581764f1784d354f5b13d0cd1a6c9887f9eafb3..96d817b8cc725daaa8979f3df215686736a4867c 100644
--- a/test/freeflow/navierstokesnc/channel/main.cc
+++ b/test/freeflow/navierstokesnc/channel/main.cc
@@ -38,7 +38,7 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/io/staggeredvtkoutputmodule.hh>
#include <dumux/linear/istlsolvers.hh>
#include <dumux/linear/linearsolvertraits.hh>
diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
index be57c5c6713a0bbf11217baf9cd3cbf3c4496407..b016fa05120c1951ba953a03a0d3644027b8bb8b 100644
--- a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
@@ -38,7 +38,7 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/io/staggeredvtkoutputmodule.hh>
#include <dumux/linear/istlsolvers.hh>
#include <dumux/linear/linearsolvertraits.hh>
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/main.cc b/test/freeflow/navierstokesnc/maxwellstefan/main.cc
index 89e912bc177cb8503a6f6b11303e0d32811f21c9..04ce698b92d25b62933da78636dd26587ad45471 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/main.cc
+++ b/test/freeflow/navierstokesnc/maxwellstefan/main.cc
@@ -38,7 +38,7 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/io/staggeredvtkoutputmodule.hh>
#include <dumux/linear/istlsolvers.hh>
#include <dumux/linear/linearsolvertraits.hh>
diff --git a/test/freeflow/rans/main.cc b/test/freeflow/rans/main.cc
index d1d447bd5fc8d8947b8056098ec7d2adb6319c91..685a32fae0c4043136d7a7e220715f64abfff605 100644
--- a/test/freeflow/rans/main.cc
+++ b/test/freeflow/rans/main.cc
@@ -40,7 +40,7 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/io/staggeredvtkoutputmodule.hh>
#include <dumux/linear/istlsolvers.hh>
#include <dumux/linear/linearsolvertraits.hh>
diff --git a/test/freeflow/ransnc/main.cc b/test/freeflow/ransnc/main.cc
index e0bcb9d1dd62ceeba53bc6be68bf236ef390619a..168596ca5886ff238d06633b7f054186bd4d1a8b 100644
--- a/test/freeflow/ransnc/main.cc
+++ b/test/freeflow/ransnc/main.cc
@@ -39,7 +39,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/io/loadsolution.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/io/staggeredvtkoutputmodule.hh>
#include <dumux/linear/istlsolvers.hh>
#include <dumux/linear/linearsolvertraits.hh>
@@ -48,27 +48,6 @@
#include "properties.hh"
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\nPlease use the provided input files.\n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
int main(int argc, char** argv)
{
using namespace Dumux;
@@ -85,7 +64,7 @@ int main(int argc, char** argv)
DumuxMessage::print(/*firstCall=*/true);
// parse command line arguments and input file
- Parameters::init(argc, argv, usage);
+ Parameters::init(argc, argv);
// try to create a grid (from the given grid file or the input file)
GridManager<GetPropType<TypeTag, Properties::Grid>> gridManager;
diff --git a/test/freeflow/shallowwater/bowl/main.cc b/test/freeflow/shallowwater/bowl/main.cc
index e1b1c448cd9ebdb9a8585fcdc38c74d6008a151d..dd6df53ec5e580ab3f03f829540ad50ce65067e6 100644
--- a/test/freeflow/shallowwater/bowl/main.cc
+++ b/test/freeflow/shallowwater/bowl/main.cc
@@ -36,7 +36,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/dumuxmessage.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/linear/linearsolvertraits.hh>
#include <dumux/linear/istlsolvers.hh>
#include <dumux/linear/linearalgebratraits.hh>
diff --git a/test/freeflow/shallowwater/dambreak/main.cc b/test/freeflow/shallowwater/dambreak/main.cc
index 6873c39f7c34fb96cf9786ee8525636799b53e4f..26a7f840712bf7ea79d743979a2786386eb3d14a 100644
--- a/test/freeflow/shallowwater/dambreak/main.cc
+++ b/test/freeflow/shallowwater/dambreak/main.cc
@@ -36,7 +36,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/dumuxmessage.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/linear/linearsolvertraits.hh>
#include <dumux/linear/linearalgebratraits.hh>
diff --git a/test/freeflow/shallowwater/roughchannel/limitednikuradse/main.cc b/test/freeflow/shallowwater/roughchannel/limitednikuradse/main.cc
index d652eb50357c7de80bb30bc884c4667f5a88eb25..c6e463649a76ae2f22dc8c18798e1f0e9aea5a35 100644
--- a/test/freeflow/shallowwater/roughchannel/limitednikuradse/main.cc
+++ b/test/freeflow/shallowwater/roughchannel/limitednikuradse/main.cc
@@ -35,7 +35,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/dumuxmessage.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/linear/istlsolvers.hh>
#include <dumux/linear/linearsolvertraits.hh>
#include <dumux/linear/linearalgebratraits.hh>
diff --git a/test/freeflow/shallowwater/roughchannel/main.cc b/test/freeflow/shallowwater/roughchannel/main.cc
index ef8d37c36b672a5692a3cb62f7d31edb2206914c..b77d42e5d762f34e78d2a6d54429ccfe0c642f94 100644
--- a/test/freeflow/shallowwater/roughchannel/main.cc
+++ b/test/freeflow/shallowwater/roughchannel/main.cc
@@ -36,7 +36,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/dumuxmessage.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/linear/istlsolvers.hh>
#include <dumux/linear/linearalgebratraits.hh>
#include <dumux/linear/linearsolvertraits.hh>
diff --git a/test/geomechanics/elastic/main.cc b/test/geomechanics/elastic/main.cc
index b8bfc9c5cd4bf353eb8d2df2618d2780c0955591..d0ca937992900dd47331dbaacd2bdce420277309 100644
--- a/test/geomechanics/elastic/main.cc
+++ b/test/geomechanics/elastic/main.cc
@@ -47,7 +47,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
// main function
int main(int argc, char** argv)
diff --git a/test/geomechanics/poroelastic/main.cc b/test/geomechanics/poroelastic/main.cc
index 4b1a995c95129a0fc694cf0e62926ee34408352d..4f0ec0aca123579ee3d318f03c762d51c1369be9 100644
--- a/test/geomechanics/poroelastic/main.cc
+++ b/test/geomechanics/poroelastic/main.cc
@@ -49,7 +49,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/discretization/elementsolution.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
// function to evaluate the element stresses
template< class StressType,
diff --git a/test/io/gridmanager/gmshboundaryflagtest.hh b/test/io/gridmanager/gmshboundaryflagtest.hh
index 98c517f15b3a8c776b2ee5791ff4e2fe73d51a3d..e0fc4a2a6f8979f967a80c724fe3b298c6dd840d 100644
--- a/test/io/gridmanager/gmshboundaryflagtest.hh
+++ b/test/io/gridmanager/gmshboundaryflagtest.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_TEST_IO_GMSHBOUNDARYFLAG_TEST_HH
#define DUMUX_TEST_IO_GMSHBOUNDARYFLAG_TEST_HH
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_base.hh>
#include <dumux/discretization/method.hh>
#include <iostream>
diff --git a/test/io/gridmanager/test_gmshboundaryflag.cc b/test/io/gridmanager/test_gmshboundaryflag.cc
index 6f824c137638e80fbb2816859ef1b0b49acb5d3b..f347d29624e32d8c4f74be7c0aab9d790a6e22cc 100644
--- a/test/io/gridmanager/test_gmshboundaryflag.cc
+++ b/test/io/gridmanager/test_gmshboundaryflag.cc
@@ -28,7 +28,7 @@
#include <dune/alugrid/grid.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/boundaryflag.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_alu.hh>
#include <dumux/common/initialize.hh>
#include <dumux/discretization/box.hh>
diff --git a/test/io/gridmanager/test_gridmanager_subgrid.cc b/test/io/gridmanager/test_gridmanager_subgrid.cc
index 7f7fd4f5c168498e658f66b338cb134b588d81f5..e1f03e698eeb622c6b2a29578821c2303eb59482 100644
--- a/test/io/gridmanager/test_gridmanager_subgrid.cc
+++ b/test/io/gridmanager/test_gridmanager_subgrid.cc
@@ -31,6 +31,8 @@
#include <dune/alugrid/grid.hh>
#endif
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_alu.hh>
#include <dumux/io/grid/gridmanager_sub.hh>
#include <dumux/common/initialize.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/io/gridmanager/test_gridmanager_vtk.cc b/test/io/gridmanager/test_gridmanager_vtk.cc
index b935dc363eb39edbf54ae4e1275c68c027fae2a6..cd06fb35ecdd4732a34ca0a20f85f7a8140494ce 100644
--- a/test/io/gridmanager/test_gridmanager_vtk.cc
+++ b/test/io/gridmanager/test_gridmanager_vtk.cc
@@ -28,7 +28,8 @@
#include <dumux/common/initialize.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
+#include <dumux/io/grid/gridmanager_foam.hh>
namespace Dumux {
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc
index 333e394a80bb2fa549791525df4bde1d69f6339e..cdcc25ac21e0f3900af9b6282c93a6ed6ffab42f 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc
@@ -39,6 +39,7 @@
#include <dumux/linear/linearsolvertraits.hh>
#include <dumux/linear/linearalgebratraits.hh>
#include <dumux/io/vtkoutputmodule.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/io/grid/gridmanager_sub.hh>
#include <dumux/multidomain/traits.hh>
diff --git a/test/porousmediumflow/1p/compressible/instationary/main.cc b/test/porousmediumflow/1p/compressible/instationary/main.cc
index 4a61da7c404fcb1b8a9dedc62d56c97afc6e23ba..7c92b41642f47bf6455747101fe1a6fc38a4f0d6 100644
--- a/test/porousmediumflow/1p/compressible/instationary/main.cc
+++ b/test/porousmediumflow/1p/compressible/instationary/main.cc
@@ -46,7 +46,7 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include "properties.hh"
diff --git a/test/porousmediumflow/1p/compressible/instationary/main_experimental.cc b/test/porousmediumflow/1p/compressible/instationary/main_experimental.cc
index 98019bca2ca1c38b915ebc6ca68330fb2d013f79..5aa567e16d5a7b5cff52a31066f6b62930bc850d 100644
--- a/test/porousmediumflow/1p/compressible/instationary/main_experimental.cc
+++ b/test/porousmediumflow/1p/compressible/instationary/main_experimental.cc
@@ -45,7 +45,7 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include "properties.hh"
#include "assembler.hh"
diff --git a/test/porousmediumflow/1p/compressible/stationary/main.cc b/test/porousmediumflow/1p/compressible/stationary/main.cc
index 9b4b4926a993a0683847dec0410644343168089d..13fbe548e02909fa7855b607d20cf07028b656af 100644
--- a/test/porousmediumflow/1p/compressible/stationary/main.cc
+++ b/test/porousmediumflow/1p/compressible/stationary/main.cc
@@ -47,7 +47,7 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1p/convergence/analyticsolution/main.cc b/test/porousmediumflow/1p/convergence/analyticsolution/main.cc
index 80e53a1368ac6d9ca557f2af5e022955fe5581fc..b009540883b5cc3b10b56eabe6b4439b88d34044 100644
--- a/test/porousmediumflow/1p/convergence/analyticsolution/main.cc
+++ b/test/porousmediumflow/1p/convergence/analyticsolution/main.cc
@@ -38,7 +38,8 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
#include <dumux/assembly/fvassembler.hh>
diff --git a/test/porousmediumflow/1p/convergence/discretesolution/properties.hh b/test/porousmediumflow/1p/convergence/discretesolution/properties.hh
index d833179586662ad5014cb9e71c6f53cf59ca35ad..735ad0bc6dce72ef311e438fa4e45723c9de3124 100644
--- a/test/porousmediumflow/1p/convergence/discretesolution/properties.hh
+++ b/test/porousmediumflow/1p/convergence/discretesolution/properties.hh
@@ -26,7 +26,7 @@
#include <cmath>
#include <dune/grid/yaspgrid.hh>
-
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/discretization/cctpfa.hh>
#include <dumux/discretization/ccmpfa.hh>
diff --git a/test/porousmediumflow/1p/convergence/discretesolution/solver.hh b/test/porousmediumflow/1p/convergence/discretesolution/solver.hh
index d7b8d599788ba20c4faa827e28b69203a3e4d1a7..d8899ae1580f722b820180472ec7b1ecd7348fe6 100644
--- a/test/porousmediumflow/1p/convergence/discretesolution/solver.hh
+++ b/test/porousmediumflow/1p/convergence/discretesolution/solver.hh
@@ -39,7 +39,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_base.hh>
#include <dumux/assembly/fvassembler.hh>
#include <dumux/assembly/diffmethod.hh>
diff --git a/test/porousmediumflow/1p/fracture2d3d/main.cc b/test/porousmediumflow/1p/fracture2d3d/main.cc
index 3fa7a9cd8eeac208b3e91f064247dc919081a4ee..c9e5659eff081bb4821a2d6110205534edf82547 100644
--- a/test/porousmediumflow/1p/fracture2d3d/main.cc
+++ b/test/porousmediumflow/1p/fracture2d3d/main.cc
@@ -50,7 +50,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_foam.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1p/incompressible/main.cc b/test/porousmediumflow/1p/incompressible/main.cc
index 63a1a67a524780efb821e1f640f5bd96d4d46d3e..1a77ac731066908c31648108d5ecf654b41ddc1e 100644
--- a/test/porousmediumflow/1p/incompressible/main.cc
+++ b/test/porousmediumflow/1p/incompressible/main.cc
@@ -48,7 +48,8 @@
#include <dumux/common/initialize.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
#include <dumux/io/pointcloudvtkwriter.hh>
#include <dumux/discretization/method.hh>
diff --git a/test/porousmediumflow/1p/isothermal/main.cc b/test/porousmediumflow/1p/isothermal/main.cc
index f39b7cf850bd7eec9b2dcbf6e1046a9eaf40d796..df0ee8d56ed1a77f82a47adf2bedc279496ce845 100644
--- a/test/porousmediumflow/1p/isothermal/main.cc
+++ b/test/porousmediumflow/1p/isothermal/main.cc
@@ -50,7 +50,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1p/network1d3d/main.cc b/test/porousmediumflow/1p/network1d3d/main.cc
index 4c63af744c098441e7b3a1ace891467c9e39f862..28996121a95cafc8eddee14500ac8ce5c4018411 100644
--- a/test/porousmediumflow/1p/network1d3d/main.cc
+++ b/test/porousmediumflow/1p/network1d3d/main.cc
@@ -50,7 +50,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_foam.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1p/nonisothermal/main.cc b/test/porousmediumflow/1p/nonisothermal/main.cc
index 1367cf79b8a483ba11747342d88429333a5645ab..24fac4921873798598f9ad8c52c413d4a1aef83b 100644
--- a/test/porousmediumflow/1p/nonisothermal/main.cc
+++ b/test/porousmediumflow/1p/nonisothermal/main.cc
@@ -49,7 +49,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/io/loadsolution.hh>
int main(int argc, char** argv)
diff --git a/test/porousmediumflow/1p/periodicbc/main.cc b/test/porousmediumflow/1p/periodicbc/main.cc
index d4fc147472c4a8e8cfce2f084388d32f25f47047..0d0a947e4cd2317b42beacbc1ce806195ada950a 100644
--- a/test/porousmediumflow/1p/periodicbc/main.cc
+++ b/test/porousmediumflow/1p/periodicbc/main.cc
@@ -39,7 +39,7 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_sp.hh>
#include <dumux/assembly/fvassembler.hh>
diff --git a/test/porousmediumflow/1p/pointsources/timedependent/main.cc b/test/porousmediumflow/1p/pointsources/timedependent/main.cc
index 5582fa4b29d5586103398095e1b9ef8f3c12eace..8a70f3f6a8f7c6a783b36bfbffe19c65c31b05d0 100644
--- a/test/porousmediumflow/1p/pointsources/timedependent/main.cc
+++ b/test/porousmediumflow/1p/pointsources/timedependent/main.cc
@@ -47,7 +47,8 @@
#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1p/pointsources/timeindependent/main.cc b/test/porousmediumflow/1p/pointsources/timeindependent/main.cc
index da33538c8bd21610eb3cb56d9180b82c885c4c2d..24600d09d3f8a64fd8717b5f17be5d155125920e 100644
--- a/test/porousmediumflow/1p/pointsources/timeindependent/main.cc
+++ b/test/porousmediumflow/1p/pointsources/timeindependent/main.cc
@@ -47,7 +47,8 @@
#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1pnc/1p2c/isothermal/main.cc b/test/porousmediumflow/1pnc/1p2c/isothermal/main.cc
index ba26030ec67db2fd1e22f5a4b8709b60918a7ed7..ff6d2dca8ae2f3f79dca8685f8c2e8a8a6d0d0da 100644
--- a/test/porousmediumflow/1pnc/1p2c/isothermal/main.cc
+++ b/test/porousmediumflow/1pnc/1p2c/isothermal/main.cc
@@ -44,7 +44,8 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
#include "properties.hh"
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc
index 9e406c1c4b277e4a42e1e2be99ca05598fbc17bf..10ac6ad9e5d972273e62281aac1e3d7adce52b1c 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc
@@ -46,7 +46,8 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc
index 2baa9ecfd7d4d1b9714bf9a0ee40bddb79eac8a7..f030ec829ca6d10f2074755e0b3397f0dca303e3 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc
@@ -46,7 +46,8 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc
index 1667ebc6331bfd369cdd8e1beb49d74e1b5533c5..be977ca92abc4cbfa228cef01f4a2ac735b96304 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc
@@ -46,7 +46,8 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1pnc/1p3c/main.cc b/test/porousmediumflow/1pnc/1p3c/main.cc
index 6b98e4fb8f20d5dc7f9a091defd754ae2bf957b7..c66a6dfea242295c52f37959b54811a24dde6e44 100644
--- a/test/porousmediumflow/1pnc/1p3c/main.cc
+++ b/test/porousmediumflow/1pnc/1p3c/main.cc
@@ -44,7 +44,8 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
#include "properties.hh"
diff --git a/test/porousmediumflow/1pnc/nonequilibrium/main.cc b/test/porousmediumflow/1pnc/nonequilibrium/main.cc
index 1617fc90bcd9034e32e9baafd06b942697933cd7..c68950eed5437e4cd4b12dff1dcc4ae09407c28e 100644
--- a/test/porousmediumflow/1pnc/nonequilibrium/main.cc
+++ b/test/porousmediumflow/1pnc/nonequilibrium/main.cc
@@ -46,7 +46,8 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/1pncmin/nonisothermal/main.cc b/test/porousmediumflow/1pncmin/nonisothermal/main.cc
index cd8a7b8db7239f852126986c74eca20e013d581a..a170c54fbff59a8cff38fc9a57240169309b0c61 100644
--- a/test/porousmediumflow/1pncmin/nonisothermal/main.cc
+++ b/test/porousmediumflow/1pncmin/nonisothermal/main.cc
@@ -39,7 +39,7 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include "properties.hh"
diff --git a/test/porousmediumflow/2p/incompressible/main.cc b/test/porousmediumflow/2p/incompressible/main.cc
index f2e75bb0a45aceeb530cc5af214479a701d797b4..ff5790c34f708511a4b4de7f9bdca6486c02e852 100644
--- a/test/porousmediumflow/2p/incompressible/main.cc
+++ b/test/porousmediumflow/2p/incompressible/main.cc
@@ -42,7 +42,7 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/io/loadsolution.hh>
#include "properties.hh"
diff --git a/test/porousmediumflow/2p/nonisothermal/main.cc b/test/porousmediumflow/2p/nonisothermal/main.cc
index 081a9c6a892893137bd4a76adaa03d87ee8a34c8..02e37fd432e18c46ad66494ea6d8e820b662908e 100644
--- a/test/porousmediumflow/2p/nonisothermal/main.cc
+++ b/test/porousmediumflow/2p/nonisothermal/main.cc
@@ -41,7 +41,9 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_alu.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
#include "properties.hh"
diff --git a/test/porousmediumflow/3p/infiltration/main.cc b/test/porousmediumflow/3p/infiltration/main.cc
index e6a8f183ba3c7a6d24fe28e461328eafe0fa1200..e16a4c918a44af3cdd7b1b706ee911c004453d98 100644
--- a/test/porousmediumflow/3p/infiltration/main.cc
+++ b/test/porousmediumflow/3p/infiltration/main.cc
@@ -46,7 +46,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
int main(int argc, char** argv)
{
diff --git a/test/porousmediumflow/richards/lens/main.cc b/test/porousmediumflow/richards/lens/main.cc
index 22c88b273d1b6d1284b4844d31be3e0aa51c550a..4488b1b62e2e85610e54f9af14f67bb79e60ff0e 100644
--- a/test/porousmediumflow/richards/lens/main.cc
+++ b/test/porousmediumflow/richards/lens/main.cc
@@ -43,7 +43,9 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+#include <dumux/io/grid/gridmanager_alu.hh>
+#include <dumux/io/grid/gridmanager_ug.hh>
#include <dumux/io/loadsolution.hh>
#include "properties.hh"
diff --git a/test/porousmediumflow/richards/nonisothermal/evaporation/main.cc b/test/porousmediumflow/richards/nonisothermal/evaporation/main.cc
index 4486298c65a967da46f602b6c08798400ea596bc..87af886fc427311a87311bd329bd1b0336ef78f3 100644
--- a/test/porousmediumflow/richards/nonisothermal/evaporation/main.cc
+++ b/test/porousmediumflow/richards/nonisothermal/evaporation/main.cc
@@ -44,7 +44,7 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
////////////////////////
// the main function
diff --git a/test/porousmediumflow/tracer/2ptracer/main.cc b/test/porousmediumflow/tracer/2ptracer/main.cc
index d496c20f15c5ab5fb99cec6b50f744cb087cdf03..d5364b6dbb12c8bc8ea0b05df651f4609695c698 100644
--- a/test/porousmediumflow/tracer/2ptracer/main.cc
+++ b/test/porousmediumflow/tracer/2ptracer/main.cc
@@ -46,7 +46,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include "properties.hh"
diff --git a/test/porousmediumflow/tracer/constvel/main.cc b/test/porousmediumflow/tracer/constvel/main.cc
index b0732978178bf04beb97bd819d2fffdb535fc1ac..d2c2b597c23a50076444a77ad9e2f1d1cef6c782 100644
--- a/test/porousmediumflow/tracer/constvel/main.cc
+++ b/test/porousmediumflow/tracer/constvel/main.cc
@@ -42,7 +42,7 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include "properties.hh"
diff --git a/test/porousmediumflow/tracer/multiphase/main.cc b/test/porousmediumflow/tracer/multiphase/main.cc
index d6b9aa0b463c4c9ff78e497637c20a09fba22583..79f9d4866664afab5b4f5694a59a560a99469ed1 100644
--- a/test/porousmediumflow/tracer/multiphase/main.cc
+++ b/test/porousmediumflow/tracer/multiphase/main.cc
@@ -41,7 +41,7 @@
#include <dumux/assembly/fvassembler.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
#include "properties.hh"