From f36ddccbb87e6634ad474368e43fc1e53e391de1 Mon Sep 17 00:00:00 2001
From: Timo Koch <timokoch@math.uio.no>
Date: Wed, 22 Mar 2023 20:02:28 +0100
Subject: [PATCH] [cleanup][gridmanager] Only include what we use
---
dumux/io/grid/gridmanager_sub.hh | 5 ++--
test/discretization/test_walldistance.cc | 4 ++-
test/freeflow/navierstokes/channel/2d/main.cc | 2 +-
test/freeflow/navierstokes/donea/main.cc | 3 ++-
.../navierstokes/donea/main_momentum.cc | 3 ++-
test/freeflow/navierstokes/periodic/main.cc | 2 +-
test/freeflow/navierstokesnc/channel/main.cc | 2 +-
.../navierstokesnc/densitydrivenflow/main.cc | 2 +-
.../navierstokesnc/maxwellstefan/main.cc | 2 +-
test/freeflow/rans/main.cc | 2 +-
test/freeflow/ransnc/main.cc | 25 ++-----------------
test/freeflow/shallowwater/bowl/main.cc | 2 +-
test/freeflow/shallowwater/dambreak/main.cc | 2 +-
.../roughchannel/limitednikuradse/main.cc | 2 +-
.../shallowwater/roughchannel/main.cc | 2 +-
test/geomechanics/elastic/main.cc | 2 +-
test/geomechanics/poroelastic/main.cc | 2 +-
test/io/gridmanager/gmshboundaryflagtest.hh | 2 +-
test/io/gridmanager/test_gmshboundaryflag.cc | 2 +-
.../gridmanager/test_gridmanager_subgrid.cc | 2 ++
test/io/gridmanager/test_gridmanager_vtk.cc | 3 ++-
.../boundary/darcydarcy/1p_2p/main.cc | 1 +
.../1p/compressible/instationary/main.cc | 2 +-
.../instationary/main_experimental.cc | 2 +-
.../1p/compressible/stationary/main.cc | 2 +-
.../1p/convergence/analyticsolution/main.cc | 3 ++-
.../discretesolution/properties.hh | 2 +-
.../1p/convergence/discretesolution/solver.hh | 2 +-
test/porousmediumflow/1p/fracture2d3d/main.cc | 2 +-
.../1p/incompressible/main.cc | 3 ++-
test/porousmediumflow/1p/isothermal/main.cc | 2 +-
test/porousmediumflow/1p/network1d3d/main.cc | 2 +-
.../porousmediumflow/1p/nonisothermal/main.cc | 2 +-
test/porousmediumflow/1p/periodicbc/main.cc | 2 +-
.../1p/pointsources/timedependent/main.cc | 3 ++-
.../1p/pointsources/timeindependent/main.cc | 3 ++-
.../1pnc/1p2c/isothermal/main.cc | 3 ++-
.../1p2c/nonisothermal/conduction/main.cc | 3 ++-
.../1p2c/nonisothermal/convection/main.cc | 3 ++-
.../1p2c/nonisothermal/transientbc/main.cc | 3 ++-
test/porousmediumflow/1pnc/1p3c/main.cc | 3 ++-
.../1pnc/nonequilibrium/main.cc | 3 ++-
.../1pncmin/nonisothermal/main.cc | 2 +-
.../2p/incompressible/main.cc | 2 +-
.../porousmediumflow/2p/nonisothermal/main.cc | 4 ++-
test/porousmediumflow/3p/infiltration/main.cc | 2 +-
test/porousmediumflow/richards/lens/main.cc | 4 ++-
.../nonisothermal/evaporation/main.cc | 2 +-
test/porousmediumflow/tracer/2ptracer/main.cc | 2 +-
test/porousmediumflow/tracer/constvel/main.cc | 2 +-
.../tracer/multiphase/main.cc | 2 +-
51 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/dumux/io/grid/gridmanager_sub.hh b/dumux/io/grid/gridmanager_sub.hh
index 2c47f037ac..712a858274 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 1a57534c0c..b66f944227 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 4f2f60446a..e5aad4e5cf 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 541ec64892..94a527dddc 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 af23d0888a..d26f055d26 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 033dba53ec..5b2a0defa6 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 0581764f17..96d817b8cc 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 be57c5c671..b016fa0512 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 89e912bc17..04ce698b92 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 d1d447bd5f..685a32fae0 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 e0bcb9d1dd..168596ca58 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 e1b1c448cd..dd6df53ec5 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 6873c39f7c..26a7f84071 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 d652eb5035..c6e463649a 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 ef8d37c36b..b77d42e5d7 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 b8bfc9c5cd..d0ca937992 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 4b1a995c95..4f0ec0aca1 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 98c517f15b..e0fc4a2a6f 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 6f824c1376..f347d29624 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 7f7fd4f5c1..e1f03e698e 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 b935dc363e..cd06fb35ec 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 333e394a80..cdcc25ac21 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 4a61da7c40..7c92b41642 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 98019bca2c..5aa567e16d 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 9b4b4926a9..13fbe548e0 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 80e53a1368..b009540883 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 d833179586..735ad0bc6d 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 d7b8d59978..d8899ae158 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 3fa7a9cd8e..c9e5659eff 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 63a1a67a52..1a77ac7310 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 f39b7cf850..df0ee8d56e 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 4c63af744c..28996121a9 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 1367cf79b8..24fac49218 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 d4fc147472..0d0a947e4c 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 5582fa4b29..8a70f3f6a8 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 da33538c8b..24600d09d3 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 ba26030ec6..ff6d2dca8a 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 9e406c1c4b..10ac6ad9e5 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 2baa9ecfd7..f030ec829c 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 1667ebc633..be977ca92a 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 6b98e4fb8f..c66a6dfea2 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 1617fc90bc..c68950eed5 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 cd8a7b8db7..a170c54fbf 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 f2e75bb0a4..ff5790c34f 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 081a9c6a89..02e37fd432 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 e6a8f183ba..e16a4c918a 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 22c88b273d..4488b1b62e 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 4486298c65..87af886fc4 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 d496c20f15..d5364b6dbb 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 b073297817..d2c2b597c2 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 d6b9aa0b46..79f9d48666 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"
--
GitLab