fix some dune 2.3 deprecation warnings

also use the actual grid headers for grids, not the corresponding DGF parser header.
2025-02-15 11:23:24 -06:00 · 2013-12-01 11:51:05 +01:00 · 2013-12-01 11:51:05 +01:00 · d47687be5d
commit d47687be5d
parent d9c4d1058e
19 changed files with 160 additions and 46 deletions
--- a/examples/tutorial1problem.hh
+++ b/examples/tutorial1problem.hh
@ -42,6 +42,7 @@

 // For Dune::FieldMatrix
 #include <dune/common/fmatrix.hh>
+#include <dune/common/version.hh>

 namespace Ewoms {
 // forward declaration of the problem class
@ -153,7 +154,13 @@ class TutorialProblemCoupled
 public:
    //! The constructor of the problem
    TutorialProblemCoupled(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
        , eps_(3e-6)
    {
        // Use an isotropic and homogeneous intrinsic permeability
--- a/tests/models/problems/co2injectionproblem.hh
+++ b/tests/models/problems/co2injectionproblem.hh
@ -39,8 +39,9 @@
 #include <opm/material/binarycoefficients/Brine_CO2.hpp>
 #include <opm/material/StaticTabulated2dFunction.hpp>

-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dune/grid/yaspgrid.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -228,7 +229,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    Co2InjectionProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 1e-6;

--- a/tests/models/problems/cuvetteproblem.hh
+++ b/tests/models/problems/cuvetteproblem.hh
@ -36,8 +36,9 @@

 #include <ewoms/models/pvs/pvsproperties.hh>

-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dune/grid/yaspgrid.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -194,8 +195,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    CuvetteProblem(TimeManager &timeManager)
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
        : ParentType(timeManager,
                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
        , eps_(1e-6)
    {
        if (Valgrind::IsRunning())
--- a/tests/models/problems/diffusionproblem.hh
+++ b/tests/models/problems/diffusionproblem.hh
@ -33,6 +33,7 @@
 #include <opm/material/fluidstates/CompositionalFluidState.hpp>
 #include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -166,7 +167,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    DiffusionProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        FluidSystem::init();

--- a/tests/models/problems/fingerproblem.hh
+++ b/tests/models/problems/fingerproblem.hh
@ -39,6 +39,7 @@

 #include <ewoms/models/immiscible/immiscibleproperties.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -206,7 +207,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    FingerProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 3e-6;
        FluidSystem::init();
@ -253,7 +260,11 @@ public:

        // initialize the material parameter objects of the individual
        // finite volumes
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        int n = GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView().size(dimWorld);
+#else
        int n = GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView().size(dimWorld);
+#endif
        materialParams_.resize(n);
        for (int i = 0; i < n; ++i) {
            materialParams_[i].setMicParams(&micParams_);
--- a/tests/models/problems/fractureproblem.hh
+++ b/tests/models/problems/fractureproblem.hh
@ -41,6 +41,7 @@

 #include <ewoms/models/discretefracture/discretefracturemodel.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>

@ -207,7 +208,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    FractureProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 3e-6;
        temperature_ = 273.15 + 20; // -> 20°C
--- a/tests/models/problems/groundwaterproblem.hh
+++ b/tests/models/problems/groundwaterproblem.hh
@ -33,6 +33,7 @@

 #include <dune/grid/io/file/dgfparser/dgfyasp.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>

@ -147,7 +148,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    GroundWaterProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 1.0e-3;

--- a/tests/models/problems/infiltrationproblem.hh
+++ b/tests/models/problems/infiltrationproblem.hh
@ -33,10 +33,9 @@
 #include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
 #include <opm/material/heatconduction/Somerton.hpp>

-#include <dune/grid/io/file/dgfparser/dgfug.hh>
-#include <dune/grid/io/file/dgfparser/dgfs.hh>
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dune/grid/yaspgrid.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -189,8 +188,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    InfiltrationProblem(TimeManager &timeManager)
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
        : ParentType(timeManager,
                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
        , eps_(1e-6)
    {
        temperature_ = 273.15 + 10.0; // -> 10 degrees Celsius
--- a/tests/models/problems/lensproblem.hh
+++ b/tests/models/problems/lensproblem.hh
@ -38,6 +38,7 @@
 #include <opm/material/components/SimpleH2O.hpp>
 #include <opm/material/components/Dnapl.hpp>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -222,7 +223,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    LensProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 3e-6;
        FluidSystem::init();
--- a/tests/models/problems/navierstokestestproblem.hh
+++ b/tests/models/problems/navierstokestestproblem.hh
@ -30,17 +30,9 @@
 #include <opm/material/fluidsystems/GasPhase.hpp>
 #include <opm/material/components/N2.hpp>

-#if HAVE_ALUGRID
 #include <dune/grid/alugrid/2d/alugrid.hh>
-#elif HAVE_UG
-#include <dune/grid/io/file/dgfparser/dgfug.hh>
-#else
-#warning UG or ALUGrid necessary for this test.
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-#endif
-
-#include <dune/grid/io/file/dgfparser.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>

 namespace Ewoms {
@ -53,13 +45,7 @@ namespace Properties {
 NEW_TYPE_TAG(NavierStokesTestProblem, INHERITS_FROM(VcfvNavierStokes));

 // Set the grid type
-#if HAVE_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>);
-#else
-SET_TYPE_PROP(NavierStokesTestProblem, Grid, Dune::YaspGrid<2>);
-#endif
+SET_TYPE_PROP(NavierStokesTestProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);

 // Set the property which defines the type of the physical problem
 SET_TYPE_PROP(NavierStokesTestProblem, Problem, Ewoms::NavierStokesTestProblem<TypeTag>);
@ -139,7 +125,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    NavierStokesTestProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    { eps_ = 1e-6; }

    /*!
--- a/tests/models/problems/obstacleproblem.hh
+++ b/tests/models/problems/obstacleproblem.hh
@ -35,10 +35,9 @@
 #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
 #include <opm/material/heatconduction/Somerton.hpp>

-#include <dune/grid/io/file/dgfparser/dgfug.hh>
-#include <dune/grid/io/file/dgfparser/dgfs.hh>
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dune/grid/yaspgrid.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -181,8 +180,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    ObstacleProblem(TimeManager &timeManager)
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
        : ParentType(timeManager,
                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 1e-6;
        temperature_ = 273.15 + 25; // -> 25°C
--- a/tests/models/problems/outflowproblem.hh
+++ b/tests/models/problems/outflowproblem.hh
@ -30,6 +30,7 @@

 #include <dune/grid/io/file/dgfparser/dgfyasp.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -128,7 +129,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    OutflowProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
        , eps_(1e-6)
    {
        temperature_ = 273.15 + 20;
--- a/tests/models/problems/powerinjectionproblem.hh
+++ b/tests/models/problems/powerinjectionproblem.hh
@ -35,6 +35,7 @@
 #include <ewoms/models/immiscible/immisciblemodel.hh>
 #include <ewoms/io/cubegridcreator.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -180,7 +181,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    PowerInjectionProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 3e-6;
        FluidSystem::init();
--- a/tests/models/problems/reservoirproblem.hh
+++ b/tests/models/problems/reservoirproblem.hh
@ -30,8 +30,9 @@
 #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
 #include <opm/material/fluidstates/CompositionalFluidState.hpp>

-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dune/grid/yaspgrid.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -179,7 +180,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    ReservoirProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 1e-6;

--- a/tests/models/problems/richardslensproblem.hh
+++ b/tests/models/problems/richardslensproblem.hh
@ -35,6 +35,7 @@

 #include <dune/grid/io/file/dgfparser.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -177,7 +178,11 @@ public:
     */
    RichardsLensProblem(TimeManager &timeManager)
        : ParentType(timeManager,
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
        , pnRef_(1e5)
    {
        eps_ = 3e-6;
--- a/tests/models/problems/stokes2ctestproblem.hh
+++ b/tests/models/problems/stokes2ctestproblem.hh
@ -27,7 +27,9 @@
 #include <ewoms/models/stokes/stokesmodel.hh>
 #include <opm/material/fluidsystems/H2OAirFluidSystem.hpp>

-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dune/grid/yaspgrid.hh>
+
+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>

 namespace Ewoms {
@ -125,7 +127,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    Stokes2cTestProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 1e-6;

--- a/tests/models/problems/stokesnitestproblem.hh
+++ b/tests/models/problems/stokesnitestproblem.hh
@ -27,7 +27,9 @@
 #include <ewoms/io/simplexgridcreator.hh>
 #include <opm/material/fluidsystems/H2OAirFluidSystem.hpp>

-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dune/grid/yaspgrid.hh>
+
+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>

 namespace Ewoms {
@ -131,7 +133,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    StokesNITestProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        eps_ = 1e-6;

--- a/tests/models/problems/stokestestproblem.hh
+++ b/tests/models/problems/stokestestproblem.hh
@ -30,7 +30,9 @@
 #include <opm/material/fluidsystems/H2ON2FluidSystem.hpp>
 #include <opm/material/fluidsystems/GasPhase.hpp>

-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dune/grid/yaspgrid.hh>
+
+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>

 namespace Ewoms {
@ -126,7 +128,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    StokesTestProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    { eps_ = 1e-6; }

    /*!
--- a/tests/models/problems/waterairproblem.hh
+++ b/tests/models/problems/waterairproblem.hh
@ -36,10 +36,9 @@
 #include <opm/material/heatconduction/Somerton.hpp>
 #include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>

-#include <dune/grid/io/file/dgfparser/dgfug.hh>
-#include <dune/grid/io/file/dgfparser/dgfs.hh>
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dune/grid/yaspgrid.hh>

+#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

@ -208,7 +207,13 @@ public:
     * \copydoc Doxygen::defaultProblemConstructor
     */
    WaterAirProblem(TimeManager &timeManager)
-        : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafGridView())
+#else
+        : ParentType(timeManager,
+                     GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
+#endif
    {
        maxDepth_ = 1000.0; // [m]
        eps_ = 1e-6;