Remove deprecated support for ALUGrid.

Use dune-ALUGrid instead.
(reviewed and improved by timok)

dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh

@@ -30,10 +30,7 @@
 // dumux environment
 #include <dumux/decoupled/common/decoupledproperties.hh>
 #include <dune/grid/yaspgrid.hh>
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/2d/alugrid.hh>
-#include <dune/grid/alugrid/3d/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #endif
 #if HAVE_UG
@@ -72,7 +69,7 @@ struct GridImp<Dune::YaspGrid<dim>, dim>
     static const int imp = GridTypes::yaspGrid;
 };
 
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 template<int dim>
 struct GridImp<Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming>, dim>
 {

dumux/io/adaptivegridrestart.hh

@@ -25,10 +25,7 @@
 
 #include <dune/common/version.hh>
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/2d/alugrid.hh>
-#include <dune/grid/alugrid/3d/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #endif
 #if HAVE_ALBERTA
@@ -56,7 +53,7 @@ struct GridRestartCheck
 };
 
 // the specializations for grid managers that support restart
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 template<int dim, int dimworld, Dune::ALUGridElementType elType, Dune::ALUGridRefinementType refinementType>
 struct GridRestartCheck<Dune::ALUGrid<dim, dimworld, elType, refinementType> >
 {
@@ -88,7 +85,7 @@ public:
     static void serializeGrid(Problem& problem)
     {
         DUNE_THROW(Dune::NotImplemented,
-                   "Adaptive restart functionality currently only works for ALUGrid / dune-alugrid.");
+                   "Adaptive restart functionality currently only works for dune-ALUGrid.");
     }
 
     /*!
@@ -98,7 +95,7 @@ public:
     static void restartGrid(Problem& problem)
     {
         DUNE_THROW(Dune::NotImplemented,
-                   "Adaptive restart functionality currently only works for ALUGrid / dune-alugrid.");
+                   "Adaptive restart functionality currently only works for dune-ALUGrid.");
     }
 };
 
@@ -133,13 +130,7 @@ public:
      */
     template<class Problem>
     static void restartGrid(Problem& problem)
-    {
-#if HAVE_ALUGRID
-        std::string gridName = restartGridFileName_(problem);
-        double time = problem.timeManager().time();
-        problem.grid().template readGrid<Dune::xdr>(gridName, time);
-#endif
-    }
+    {}
 
 private:
     //! \brief Return the restart file name.

dumux/io/gridcreator.hh

@@ -56,11 +56,6 @@
 #include <dune/alugrid/grid.hh>
 #include <dune/alugrid/dgf.hh>
 #endif
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/3d/alugrid.hh>
-#include <dune/grid/alugrid/2d/alugrid.hh>
-#include <dune/grid/io/file/dgfparser/dgfalu.hh>
-#endif
 
 // FoamGrid specific includes
 #if HAVE_DUNE_FOAMGRID
@@ -813,7 +808,7 @@ private:
 
 #endif // HAVE_UG
 
-#if HAVE_DUNE_ALUGRID || HAVE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 
 /*!
  * \brief Provides a grid creator for Dune ALUGrids
@@ -906,7 +901,7 @@ public:
     }
 };
 
-#endif // HAVE_DUNE_ALUGRID || HAVE_ALUGRID
+#endif // HAVE_DUNE_ALUGRID
 
 #if HAVE_DUNE_FOAMGRID
 

test/decoupled/1p/test_diffusion3d.cc

@@ -25,7 +25,7 @@
 #include "config.h"
 #include <iostream>
 
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID || HAVE_UG
+#if HAVE_DUNE_ALUGRID || HAVE_UG
 
 #include <dune/common/exceptions.hh>
 #include <dune/common/parallel/mpihelper.hh>
@@ -231,4 +231,4 @@ int main()
     std::cerr << "You need to have dune-ALUGrid or UG installed to run this test\n";
     return 77;
 }
-#endif // HAVE_ALUGRID || HAVE_DUNE_ALUGRID || HAVE_UG
+#endif // HAVE_DUNE_ALUGRID || HAVE_UG

test/decoupled/1p/test_diffusionproblem3d.hh

@@ -22,11 +22,9 @@
 #ifndef DUMUX_TEST_DIFFUSION_3D_PROBLEM_HH
 #define DUMUX_TEST_DIFFUSION_3D_PROBLEM_HH
 
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID || HAVE_UG
+#if HAVE_DUNE_ALUGRID || HAVE_UG
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/3d/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #endif
 #include <dune/grid/uggrid.hh>
@@ -57,7 +55,7 @@ namespace Properties
 NEW_TYPE_TAG(DiffusionTestProblem, INHERITS_FROM(DecoupledTwoP, TestDiffusionSpatialParams3d));
 
 // Set the grid type
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
 #else
 SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::UGGrid<3>);
@@ -270,6 +268,6 @@ private:
 };
 } //end namespace
 
-#endif // HAVE_ALUGRID || HAVE_DUNE_ALUGRID || HAVE_UGGRID
+#endif // HAVE_DUNE_ALUGRID || HAVE_UGGRID
 
 #endif

test/decoupled/2p/test_3d2p.cc

@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 
 #include "test_3d2pproblem.hh"
 #include <dumux/common/start.hh>

test/decoupled/2p/test_3d2pproblem.hh

@@ -24,9 +24,7 @@
 #ifndef DUMUX_TEST_3D2P_PROBLEM_HH
 #define DUMUX_TEST_3D2P_PROBLEM_HH
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/3d/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #endif
 
@@ -64,7 +62,7 @@ namespace Properties
 NEW_TYPE_TAG(ThreeDTwoPTestProblem, INHERITS_FROM(Test3d2pSpatialParams));
 
 // Set the grid type
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(ThreeDTwoPTestProblem, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
 #endif
 

test/decoupled/2p/test_impesadaptive.cc

@@ -24,7 +24,7 @@
  */
 #include "config.h"
 
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 
 #include "test_impesadaptiveproblem.hh"
 #include <dumux/common/start.hh>
@@ -68,4 +68,4 @@ int main()
     std::cerr << "You need to have dune-ALUGrid installed to run this test\n";
     return 77;
 }
-#endif // HAVE_ALUGRID
+#endif // HAVE_DUNE_ALUGRID

test/decoupled/2p/test_impesadaptiveproblem.hh

@@ -24,9 +24,7 @@
 #ifndef DUMUX_TEST_IMPES_ADAPTIVE_PROBLEM_HH
 #define DUMUX_TEST_IMPES_ADAPTIVE_PROBLEM_HH
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/2d/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #endif
 
@@ -59,7 +57,7 @@ NEW_TYPE_TAG(TestIMPESAdaptiveProblem, INHERITS_FROM(FVPressureTwoPAdaptive, FVT
 NEW_TYPE_TAG(TestIMPESAdaptiveRestartProblem, INHERITS_FROM(TestIMPESAdaptiveProblem));
 
 // Set the grid type
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(TestIMPESAdaptiveProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
 #endif
 

test/decoupled/2p/test_impesadaptiverestart.cc

@@ -24,7 +24,7 @@
  */
 #include "config.h"
 
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 
 #include "test_impesadaptiveproblem.hh"
 #include <dumux/common/start.hh>
@@ -42,12 +42,6 @@ void usage(const char *progName, const std::string &errorMsg)
                     errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
                                        "\t-TimeManager.TEnd      End of the simulation [s] \n"
                                        "\t-TimeManager.DtInitial Initial timestep size [s] \n"
-#if HAVE_ALUGRID
-                                       "\t-Grid.NumberOfCellsX   Resolution in x-direction [-]\n"
-                                       "\t-Grid.NumberOfCellsY   Resolution in y-direction [-]\n"
-                                       "\t-Grid.UpperRightX      Length of the domain [m]\n"
-                                       "\t-Grid.UpperRightY      Height of the domain [m]\n"
-#endif
                                        "\t-Problem.Name          Name passed to the output routines \n"
                                        "\t-Restart               Restart time [s] \n";
         std::cout << errorMessageOut
@@ -70,4 +64,4 @@ int main()
     std::cerr << "You need to have dune-ALUGrid installed to run this test\n";
     return 77;
 }
-#endif // HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#endif // HAVE_DUNE_ALUGRID

test/decoupled/2p/test_mpfa2p.cc

@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 
 #include "test_mpfa2pproblem.hh"
 #include <dumux/common/start.hh>

test/decoupled/2p/test_mpfa2pproblem.hh

@@ -24,9 +24,7 @@
 #ifndef DUMUX_TEST_MPFA2P_PROBLEM_HH
 #define DUMUX_TEST_MPFA2P_PROBLEM_HH
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/2d/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #endif
 
@@ -67,7 +65,7 @@ namespace Properties
 NEW_TYPE_TAG(MPFATwoPTestProblem, INHERITS_FROM(Test2PSpatialParams));
 
 // Set the grid type
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
 #endif
 

test/decoupled/2p2c/test_adaptive2p2c2d.cc

@@ -55,12 +55,12 @@ void usage(const char *progName, const std::string &errorMsg)
 // The main function using the standard start procedure
 int main(int argc, char** argv)
 {
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
     typedef TTAG(Adaptive2p2c2d) TypeTag;
     return Dumux::start<TypeTag>(argc, argv, usage);
 #else
-#warning ALUGrid needed for this test.
-    std::cerr << "ALUGrid needed for this test. Aborting." << std::endl;
+#warning dune-ALUGrid needed for this test.
+    std::cerr << "dune-ALUGrid needed for this test. Aborting." << std::endl;
     return 77;
 #endif
 }

test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh

@@ -24,9 +24,7 @@
 #ifndef DUMUX_TEST_ADAPTIVE2D_2P2C_PROBLEM_HH
 #define DUMUX_TEST_ADAPTIVE2D_2P2C_PROBLEM_HH
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #else
 #include <dune/grid/yaspgrid.hh>
@@ -55,7 +53,7 @@ namespace Properties
 NEW_TYPE_TAG(Adaptive2p2c2d, INHERITS_FROM(DecoupledTwoPTwoCAdaptive,Test2P2CSpatialParams));
 
 // Set the grid type
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
 #else
 SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::YaspGrid<2>);

test/decoupled/2p2c/test_adaptive2p2c3d.cc

@@ -23,7 +23,7 @@
  */
 #include "config.h"
 
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 
 #include "test_adaptive2p2c3dproblem.hh"
 #include <dumux/common/start.hh>
@@ -71,4 +71,4 @@ int main()
     std::cerr << "You need to have dune-ALUGrid installed to run this test\n";
     return 77;
 }
-#endif // HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#endif // HAVE_DUNE_ALUGRID

test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh

@@ -24,9 +24,7 @@
 #ifndef DUMUX_TEST_ADAPTIVE3D_2P2C_PROBLEM_HH
 #define DUMUX_TEST_ADAPTIVE3D_2P2C_PROBLEM_HH
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #else
 #include <dune/grid/yaspgrid.hh>
@@ -53,7 +51,7 @@ namespace Properties
 NEW_TYPE_TAG(Adaptive2p2c3d, INHERITS_FROM(DecoupledTwoPTwoCAdaptive,Test2P2CSpatialParams, MPFAProperties));
 
 // Set the grid type
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(Adaptive2p2c3d, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
 #else
 SET_TYPE_PROP(Adaptive2p2c3d, Grid, Dune::YaspGrid<3>);

test/freeflow/navierstokes/navierstokestestproblem.hh

@@ -23,9 +23,7 @@
 #ifndef DUMUX_TEST_FREEFLOW_NAVIERSTOKESTESTPROBLEM_HH
 #define DUMUX_TEST_FREEFLOW_NAVIERSTOKESTESTPROBLEM_HH
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/2d/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #elif HAVE_UG
 #include <dune/grid/io/file/dgfparser/dgfug.hh>
@@ -52,7 +50,7 @@ namespace Dumux
     NEW_TYPE_TAG(NavierStokesTestProblem, INHERITS_FROM(BoxStokes));
 
     // Set the grid type
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
     SET_TYPE_PROP(NavierStokesTestProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
 #elif HAVE_UG
     SET_TYPE_PROP(NavierStokesTestProblem, Grid, Dune::UGGrid<2>);

test/freeflow/navierstokes/test_navierstokes.cc

@@ -51,7 +51,7 @@ void usage(const char *progName, const std::string &errorMsg)
 
 int main(int argc, char** argv)
 {
-#if HAVE_SUPERLU && (HAVE_ALUGRID || HAVE_DUNE_ALUGRID || HAVE_UG)
+#if HAVE_SUPERLU && (HAVE_DUNE_ALUGRID || HAVE_UG)
     typedef TTAG(NavierStokesTestProblem) ProblemTypeTag;
     return Dumux::start<ProblemTypeTag>(argc, argv, usage);
 #else

test/implicit/1p/1ptestproblem.hh

@@ -28,9 +28,7 @@
 #if HAVE_UG
 #include <dune/grid/io/file/dgfparser/dgfug.hh>
 #endif
-#if HAVE_ALUGRID
-#include <dune/grid/io/file/dgfparser/dgfalu.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #endif
 #include <dune/grid/io/file/dgfparser/dgfyasp.hh>

test/implicit/2p/lensproblem.hh

@@ -26,9 +26,7 @@
 #ifndef DUMUX_LENSPROBLEM_HH
 #define DUMUX_LENSPROBLEM_HH
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/2d/alugrid.hh>
-#elif HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #endif
 
@@ -73,7 +71,7 @@ SET_TYPE_PROP(LensCCProblem, Grid, Dune::YaspGrid<2>);
 SET_TYPE_PROP(LensBoxProblem, Grid, Dune::YaspGrid<2>);
 #endif
 
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(LensBoxAdaptiveProblem, Grid, Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>);
 SET_TYPE_PROP(LensCCAdaptiveProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
 #endif
@@ -102,7 +100,7 @@ public:
 // Linear solver settings
 SET_TYPE_PROP(LensCCProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
 SET_TYPE_PROP(LensBoxProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(LensCCAdaptiveProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
 SET_TYPE_PROP(LensBoxAdaptiveProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
 
@@ -118,7 +116,7 @@ SET_TYPE_PROP(LensBoxAdaptiveProblem,  AdaptionInitializationIndicator, Implicit
 NEW_PROP_TAG(BaseProblem);
 SET_TYPE_PROP(LensBoxProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
 SET_TYPE_PROP(LensCCProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(LensCCAdaptiveProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
 SET_TYPE_PROP(LensBoxAdaptiveProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
 #endif