From 8f57f01a40f3257d65838fe75f7492fc4d904c01 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Thu, 4 Oct 2012 12:48:41 +0000
Subject: [PATCH] New property names: set default to the value of the
 corresponding old-named property. Set defaults for old-named properties,
 including "true" for EnableGravity". Reviewed by Christoph.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9187 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 dumux/boxmodels/1p/1pfluxvariables.hh         |  2 +-
 dumux/boxmodels/1p/1ppropertydefaults.hh      | 17 +++++++++--------
 dumux/boxmodels/1p2c/1p2cpropertydefaults.hh  | 17 ++++++++++-------
 dumux/boxmodels/2p/2ppropertydefaults.hh      | 19 ++++++++++---------
 dumux/boxmodels/2p2c/2p2cpropertydefaults.hh  | 16 +++++++++-------
 .../2p2cni/2p2cnipropertydefaults.hh          | 11 ++---------
 dumux/boxmodels/2pni/2pnipropertydefaults.hh  |  7 ++-----
 dumux/boxmodels/3p3c/3p3cpropertydefaults.hh  | 16 +++++++++-------
 .../3p3cni/3p3cnipropertydefaults.hh          | 10 ++--------
 dumux/boxmodels/mpnc/mpncfluxvariables.hh     |  1 -
 dumux/boxmodels/mpnc/mpncpropertydefaults.hh  | 19 +++++++++----------
 .../richards/richardsfluxvariables.hh         |  2 +-
 .../richards/richardspropertydefaults.hh      | 16 +++++++++-------
 dumux/decoupled/1p/1pproperties.hh            | 10 +++++++---
 dumux/decoupled/2p/2pproperties.hh            | 15 ++++++++++-----
 dumux/decoupled/2p2c/2p2cproperties.hh        |  9 +++++++--
 .../freeflow/stokes/stokespropertydefaults.hh |  9 ++++-----
 .../stokes2c/stokes2cpropertydefaults.hh      |  6 ++----
 .../stokes2cni/stokes2cnipropertydefaults.hh  |  6 ++----
 19 files changed, 105 insertions(+), 103 deletions(-)

diff --git a/dumux/boxmodels/1p/1pfluxvariables.hh b/dumux/boxmodels/1p/1pfluxvariables.hh
index 681eecc4c9..35a2bc0e96 100644
--- a/dumux/boxmodels/1p/1pfluxvariables.hh
+++ b/dumux/boxmodels/1p/1pfluxvariables.hh
@@ -165,7 +165,7 @@ private:
         ///////////////
         // correct the pressure gradients by the gravitational acceleration
         ///////////////
-        if (GET_PARAM(TypeTag, bool, EnableGravity)) {
+        if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity)) {
             // estimate the gravitational acceleration at a given SCV face
             // using the arithmetic mean
             DimVector g(problem.boxGravity(element, fvGeometry_, face().i));
diff --git a/dumux/boxmodels/1p/1ppropertydefaults.hh b/dumux/boxmodels/1p/1ppropertydefaults.hh
index b90e8112bb..5434367436 100644
--- a/dumux/boxmodels/1p/1ppropertydefaults.hh
+++ b/dumux/boxmodels/1p/1ppropertydefaults.hh
@@ -38,8 +38,8 @@
 #include <dumux/material/fluidsystems/gasphase.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/components/nullcomponent.hh>
-
 #include <dumux/material/fluidsystems/1pfluidsystem.hh>
+#include <dumux/material/spatialparams/boxspatialparams1p.hh>
 
 namespace Dumux
 {
@@ -67,13 +67,13 @@ SET_TYPE_PROP(BoxOneP, VolumeVariables, OnePVolumeVariables<TypeTag>);
 SET_TYPE_PROP(BoxOneP, FluxVariables, BoxDarcyFluxVariables<TypeTag>);
 
 //! The indices required by the isothermal single-phase model
-SET_TYPE_PROP(BoxOneP, Indices, OnePIndices);
-
-//! DEPRECATED OnePIndices property
-SET_TYPE_PROP(BoxOneP, OnePIndices, typename GET_PROP_TYPE(TypeTag, Indices));
+SET_TYPE_PROP(BoxOneP, Indices, typename GET_PROP_TYPE(TypeTag, OnePIndices));
+SET_TYPE_PROP(BoxOneP, OnePIndices, OnePIndices);//DEPRECATED
 
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(BoxOneP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParamsOneP by default.
+SET_TYPE_PROP(BoxOneP, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(BoxOneP, SpatialParameters, BoxSpatialParamsOneP<TypeTag>);//DEPRECATED
 
 //! The weight of the upwind control volume when calculating
 //! fluxes. Use central differences by default.
@@ -95,8 +95,9 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
 };
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(BoxOneP, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(BoxOneP, EnableGravity, true);//DEPRECATED
 
 // \}
 } // end namepace Properties
diff --git a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
index 6cbe25ce51..b73b31e9d6 100644
--- a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
+++ b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
@@ -37,6 +37,8 @@
 #include "1p2cfluxvariables.hh"
 #include "1p2cindices.hh"
 
+#include <dumux/material/spatialparams/boxspatialparams1p.hh>
+
 namespace Dumux
 {
 // \{
@@ -69,19 +71,20 @@ SET_SCALAR_PROP(BoxOnePTwoC, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, U
 SET_SCALAR_PROP(BoxOnePTwoC, UpwindWeight, 1.0);//DEPRECATED!!
 
 //! Set the indices used by the 1p2c model
-SET_TYPE_PROP(BoxOnePTwoC, Indices, Dumux::OnePTwoCIndices<TypeTag, 0>);
-
-//! DEPRECATED OnePTwoCIndices property
-SET_TYPE_PROP(BoxOnePTwoC, OnePTwoCIndices, typename GET_PROP_TYPE(TypeTag, Indices));
+SET_TYPE_PROP(BoxOnePTwoC, Indices, typename GET_PROP_TYPE(TypeTag, OnePTwoCIndices));
+SET_TYPE_PROP(BoxOnePTwoC, OnePTwoCIndices, Dumux::OnePTwoCIndices<TypeTag, 0>);//DEPRECATED
 
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(BoxOnePTwoC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParamsOneP by default.
+SET_TYPE_PROP(BoxOnePTwoC, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(BoxOnePTwoC, SpatialParameters, BoxSpatialParamsOneP<TypeTag>);//DEPRECATED
 
 //! Set the phaseIndex per default to zero (important for two-phase fluidsystems).
 SET_INT_PROP(BoxOnePTwoC, PhaseIdx, 0);
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(BoxOnePTwoC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(BoxOnePTwoC, EnableGravity, true);//DEPRECATED
 }
 // \}
 }
diff --git a/dumux/boxmodels/2p/2ppropertydefaults.hh b/dumux/boxmodels/2p/2ppropertydefaults.hh
index e1aafc6352..41e23552dd 100644
--- a/dumux/boxmodels/2p/2ppropertydefaults.hh
+++ b/dumux/boxmodels/2p/2ppropertydefaults.hh
@@ -38,9 +38,9 @@
 #include <dumux/material/fluidsystems/gasphase.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/components/nullcomponent.hh>
-
 #include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
 #include <dumux/material/fluidstates/immisciblefluidstate.hh>
+#include <dumux/material/spatialparams/boxspatialparams.hh>
 
 namespace Dumux
 {
@@ -80,15 +80,15 @@ SET_SCALAR_PROP(BoxTwoP, ImplicitMobilityUpwindWeight, GET_PROP_VALUE(TypeTag, M
 SET_SCALAR_PROP(BoxTwoP, MobilityUpwindWeight, 1.0);//DEPRECATED
 
 //! The indices required by the isothermal 2p model
+SET_TYPE_PROP(BoxTwoP, Indices, typename GET_PROP_TYPE(TypeTag, TwoPIndices));
 SET_TYPE_PROP(BoxTwoP,
-              Indices,
-              TwoPIndices<TypeTag, GET_PROP_VALUE(TypeTag, Formulation), 0>);
-
-//! DEPRECATED TwoPIndices property
-SET_TYPE_PROP(BoxTwoP, TwoPIndices, typename GET_PROP_TYPE(TypeTag, Indices));
+              TwoPIndices,
+              TwoPIndices<TypeTag, GET_PROP_VALUE(TypeTag, Formulation), 0>);//DEPRECATED
 
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(BoxTwoP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParams by default.
+SET_TYPE_PROP(BoxTwoP, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(BoxTwoP, SpatialParameters, BoxSpatialParams<TypeTag>);//DEPRECATED
 
 /*!
  * \brief Set the property for the material parameters by extracting
@@ -137,8 +137,9 @@ public:
 SET_BOOL_PROP(BoxTwoP, VtkAddVelocity, GET_PROP_VALUE(TypeTag, EnableVelocityOutput));
 SET_BOOL_PROP(BoxTwoP, EnableVelocityOutput, false);//DEPRECATED
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(BoxTwoP, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(BoxTwoP, EnableGravity, true);//DEPRECATED
 }
 //
 
diff --git a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
index 7e46ad7334..c6f8c790df 100644
--- a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
+++ b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
@@ -37,6 +37,7 @@
 #include "2p2cnewtoncontroller.hh"
 
 #include <dumux/boxmodels/common/boxdarcyfluxvariables.hh>
+#include <dumux/material/spatialparams/boxspatialparams.hh>
 
 namespace Dumux
 {
@@ -132,26 +133,27 @@ SET_SCALAR_PROP(BoxTwoPTwoC, MassUpwindWeight, 1.0);//DEPRECATED
 SET_SCALAR_PROP(BoxTwoPTwoC, ImplicitMobilityUpwindWeight, 1.0);
 
 //! The indices required by the isothermal 2p2c model
+SET_TYPE_PROP(BoxTwoPTwoC, Indices, typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices));
 SET_PROP(BoxTwoPTwoC,
-         Indices)
+         TwoPTwoCIndices) //DEPRECATED
 { private:
     enum { Formulation = GET_PROP_VALUE(TypeTag, Formulation) };
  public:
     typedef TwoPTwoCIndices<TypeTag, Formulation, 0> type;
 };
 
-//! DEPRECATED TwoPTwoCIndices property
-SET_TYPE_PROP(BoxTwoPTwoC, TwoPTwoCIndices, typename GET_PROP_TYPE(TypeTag, Indices));
-
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(BoxTwoPTwoC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParams by default.
+SET_TYPE_PROP(BoxTwoPTwoC, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(BoxTwoPTwoC, SpatialParameters, BoxSpatialParams<TypeTag>);//DEPRECATED
 
 // disable velocity output by default
 SET_BOOL_PROP(BoxTwoPTwoC, VtkAddVelocity, GET_PROP_VALUE(TypeTag, EnableVelocityOutput));
 SET_BOOL_PROP(BoxTwoPTwoC, EnableVelocityOutput, false);
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(BoxTwoPTwoC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(BoxTwoPTwoC, EnableGravity, true);//DEPRECATED
 
 //
 }
diff --git a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh b/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
index f50b7958d1..a42488ef4b 100644
--- a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
@@ -64,21 +64,14 @@ SET_TYPE_PROP(BoxTwoPTwoCNI, VolumeVariables, TwoPTwoCNIVolumeVariables<TypeTag>
 SET_TYPE_PROP(BoxTwoPTwoCNI, FluxVariables, TwoPTwoCNIFluxVariables<TypeTag>);
 
 //! The indices required by the non-isothermal 2p2c model
-SET_PROP(BoxTwoPTwoCNI, Indices)
+SET_TYPE_PROP(BoxTwoPTwoCNI, Indices, typename GET_PROP_TYPE(TypeTag, TwoPTwoCNIIndices));
+SET_PROP(BoxTwoPTwoCNI, TwoPTwoCNIIndices) //DEPRECATED
 { private:
     enum { formulation = GET_PROP_VALUE(TypeTag, Formulation) };
  public:
     typedef TwoPTwoCNIIndices<TypeTag, formulation, 0> type;
 };
 
-//! DEPRECATED TwoPTwoCIndices and TwoPTwoCNIIndices properties
-SET_TYPE_PROP(BoxTwoPTwoCNI, TwoPTwoCIndices, typename GET_PROP_TYPE(TypeTag, Indices));
-SET_TYPE_PROP(BoxTwoPTwoCNI, TwoPTwoCNIIndices, typename GET_PROP_TYPE(TypeTag, Indices));
-
-
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(BoxTwoPTwoCNI, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
-
 }
 
 }
diff --git a/dumux/boxmodels/2pni/2pnipropertydefaults.hh b/dumux/boxmodels/2pni/2pnipropertydefaults.hh
index da370ec864..a00f70f864 100644
--- a/dumux/boxmodels/2pni/2pnipropertydefaults.hh
+++ b/dumux/boxmodels/2pni/2pnipropertydefaults.hh
@@ -63,11 +63,8 @@ SET_TYPE_PROP(BoxTwoPNI, VolumeVariables, TwoPNIVolumeVariables<TypeTag>);
 SET_TYPE_PROP(BoxTwoPNI, FluxVariables, TwoPNIFluxVariables<TypeTag>);
 
 //! The indices required by the non-isothermal two-phase model
-SET_TYPE_PROP(BoxTwoPNI, Indices, TwoPNIIndices<TypeTag, 0>);
-
-//! DEPRECATED TwoPIndices and TwoPNIIndices properties
-SET_TYPE_PROP(BoxTwoPNI, TwoPIndices, typename GET_PROP_TYPE(TypeTag, Indices));
-SET_TYPE_PROP(BoxTwoPNI, TwoPNIIndices, typename GET_PROP_TYPE(TypeTag, Indices));
+SET_TYPE_PROP(BoxTwoPNI, Indices, typename GET_PROP_TYPE(TypeTag, TwoPNIIndices));
+SET_TYPE_PROP(BoxTwoPNI, TwoPNIIndices, TwoPNIIndices<TypeTag, 0>);
 
 }
 
diff --git a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh b/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
index 66cbaa3d86..e3c77d2e12 100644
--- a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
+++ b/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
@@ -39,6 +39,7 @@
 // #include "3p3cboundaryvariables.hh"
 
 #include <dumux/boxmodels/common/boxdarcyfluxvariables.hh>
+#include <dumux/material/spatialparams/boxspatialparams.hh>
 
 namespace Dumux
 {
@@ -120,16 +121,17 @@ SET_SCALAR_PROP(BoxThreePThreeC, ImplicitMobilityUpwindWeight, 1.0);
 SET_BOOL_PROP(BoxThreePThreeC, UseConstraintSolver, false);
 
 //! The indices required by the isothermal 3p3c model
-SET_TYPE_PROP(BoxThreePThreeC, Indices, ThreePThreeCIndices<TypeTag, /*PVOffset=*/0>);
+SET_TYPE_PROP(BoxThreePThreeC, Indices, typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices));
+SET_TYPE_PROP(BoxThreePThreeC, ThreePThreeCIndices, ThreePThreeCIndices<TypeTag, /*PVOffset=*/0>);//DEPRECATED
 
-//! DEPRECATED ThreePThreeCIndices property
-SET_TYPE_PROP(BoxThreePThreeC, ThreePThreeCIndices, typename GET_PROP_TYPE(TypeTag, Indices));
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParams by default.
+SET_TYPE_PROP(BoxThreePThreeC, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(BoxThreePThreeC, SpatialParameters, BoxSpatialParams<TypeTag>);//DEPRECATED
 
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(BoxThreePThreeC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
-
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(BoxThreePThreeC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(BoxThreePThreeC, EnableGravity, true);//DEPRECATED
 }
 
 }
diff --git a/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh b/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
index 17c1932780..660c027d67 100644
--- a/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
@@ -64,14 +64,8 @@ SET_TYPE_PROP(BoxThreePThreeCNI, VolumeVariables, ThreePThreeCNIVolumeVariables<
 SET_TYPE_PROP(BoxThreePThreeCNI, FluxVariables, ThreePThreeCNIFluxVariables<TypeTag>);
 
 //! The indices required by the non-isothermal 3p3c model
-SET_TYPE_PROP(BoxThreePThreeCNI, Indices, ThreePThreeCNIIndices<TypeTag, 0>);
-
-//! DEPRECATED ThreePThreeCIndices and ThreePThreeCNIIndices properties
-SET_TYPE_PROP(BoxThreePThreeCNI, ThreePThreeCIndices, typename GET_PROP_TYPE(TypeTag, Indices));
-SET_TYPE_PROP(BoxThreePThreeCNI, ThreePThreeCNIIndices, typename GET_PROP_TYPE(TypeTag, Indices));
-
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(BoxThreePThreeCNI, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+SET_TYPE_PROP(BoxThreePThreeCNI, Indices, typename GET_PROP_TYPE(TypeTag, ThreePThreeCNIIndices));
+SET_TYPE_PROP(BoxThreePThreeCNI, ThreePThreeCNIIndices, ThreePThreeCNIIndices<TypeTag, 0>);//DEPRECATED
 
 }
 
diff --git a/dumux/boxmodels/mpnc/mpncfluxvariables.hh b/dumux/boxmodels/mpnc/mpncfluxvariables.hh
index 895abcdc7f..76925f3f05 100644
--- a/dumux/boxmodels/mpnc/mpncfluxvariables.hh
+++ b/dumux/boxmodels/mpnc/mpncfluxvariables.hh
@@ -68,7 +68,6 @@ class MPNCFluxVariables
     enum {enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy)};
     enum {enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic)};
     enum {enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy)};
-    enum {enableGravity = GET_PROP_VALUE(TypeTag, ProblemEnableGravity)};
 
     typedef Dune::FieldVector<Scalar, dim> DimVector;
     typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
diff --git a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
index b431f81b82..8c5a613555 100644
--- a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
+++ b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
@@ -35,6 +35,7 @@
 #include "energy/mpncvtkwriterenergy.hh"
 
 #include <dumux/material/constraintsolvers/compositionfromfugacities.hh>
+#include <dumux/material/spatialparams/boxspatialparams.hh>
 
 
 /*!
@@ -163,10 +164,8 @@ SET_TYPE_PROP(BoxMPNC, BaseFluxVariables, BoxDarcyFluxVariables<TypeTag>);
 SET_BOOL_PROP(BoxMPNC, NewtonEnableChop, true);
 
 //! The indices required by the mpnc model
-SET_PROP(BoxMPNC, Indices)
-{
-    typedef MPNCIndices<TypeTag, 0> type;
-};
+SET_TYPE_PROP(BoxMPNC, Indices, typename GET_PROP_TYPE(TypeTag, MPNCIndices));
+SET_TYPE_PROP(BoxMPNC, MPNCIndices, MPNCIndices<TypeTag, 0>);//DEPRECATED
 
 //! the upwind weight for the mass conservation equations.
 SET_SCALAR_PROP(BoxMPNC, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight));
@@ -176,11 +175,10 @@ SET_SCALAR_PROP(BoxMPNC, MassUpwindWeight, 1.0);//DEPRECATED
 SET_SCALAR_PROP(BoxMPNC, ImplicitMobilityUpwindWeight, GET_PROP_VALUE(TypeTag, MobilityUpwindWeight));
 SET_SCALAR_PROP(BoxMPNC, MobilityUpwindWeight, 1.0);//DEPRECATED
 
-//! DEPRECATED MPNCIndices property
-SET_TYPE_PROP(BoxMPNC, MPNCIndices, typename GET_PROP_TYPE(TypeTag, Indices));
-
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(BoxMPNC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParams by default.
+SET_TYPE_PROP(BoxMPNC, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(BoxMPNC, SpatialParameters, BoxSpatialParams<TypeTag>);//DEPRECATED
 
 //! The VTK writer module for common quantities
 SET_PROP(BoxMPNC, MPNCVtkCommonModule)
@@ -276,8 +274,9 @@ SET_BOOL_PROP(BoxMPNC, MPNCVtkAddNusselt, false);//DEPRECATED
 SET_BOOL_PROP(BoxMPNC, MPNCVtkAddInterfacialArea, false);//DEPRECATED
 SET_BOOL_PROP(BoxMPNC, MPNCVtkAddxEquil, false);//DEPRECATED
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(BoxMPNC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(BoxMPNC, EnableGravity, true);//DEPRECATED
 
 }
 
diff --git a/dumux/boxmodels/richards/richardsfluxvariables.hh b/dumux/boxmodels/richards/richardsfluxvariables.hh
index 267bf53019..d245cbba87 100644
--- a/dumux/boxmodels/richards/richardsfluxvariables.hh
+++ b/dumux/boxmodels/richards/richardsfluxvariables.hh
@@ -171,7 +171,7 @@ protected:
         ///////////////
         // correct the pressure gradients by the gravitational acceleration
         ///////////////
-        if (GET_PARAM(TypeTag, bool, EnableGravity)) {
+        if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity)) {
             // calculate the phase density at the integration point. we
             // only do this if the wetting phase is present in both cells
             Scalar SI = elemVolVars[face().i].saturation(wPhaseIdx);
diff --git a/dumux/boxmodels/richards/richardspropertydefaults.hh b/dumux/boxmodels/richards/richardspropertydefaults.hh
index e373576af0..1b8b6213f3 100644
--- a/dumux/boxmodels/richards/richardspropertydefaults.hh
+++ b/dumux/boxmodels/richards/richardspropertydefaults.hh
@@ -38,6 +38,7 @@
 
 #include <dumux/material/components/nullcomponent.hh>
 #include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
+#include <dumux/material/spatialparams/boxspatialparams.hh>
 
 namespace Dumux
 {
@@ -78,13 +79,13 @@ SET_SCALAR_PROP(BoxRichards, ImplicitMobilityUpwindWeight, GET_PROP_VALUE(TypeTa
 SET_SCALAR_PROP(BoxRichards, MobilityUpwindWeight, 1.0);// DEPRECATED
 
 //! The class with all index definitions for the model
-SET_TYPE_PROP(BoxRichards, Indices, RichardsIndices<TypeTag>);
+SET_TYPE_PROP(BoxRichards, Indices, typename GET_PROP_TYPE(TypeTag, RichardsIndices));
+SET_TYPE_PROP(BoxRichards, RichardsIndices, RichardsIndices<TypeTag>);//DEPRECATED
 
-//! DEPRECATED RichardsIndices property
-SET_TYPE_PROP(BoxRichards, RichardsIndices, typename GET_PROP_TYPE(TypeTag, Indices));
-
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(BoxRichards, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParams by default.
+SET_TYPE_PROP(BoxRichards, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(BoxRichards, SpatialParameters, BoxSpatialParams<TypeTag>);//DEPRECATED
 
 /*!
  * \brief Set type of the parameter objects for the material law
@@ -153,8 +154,9 @@ public:
                                                 NonwettingPhase> type;
 };
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(BoxRichards, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(BoxRichards, EnableGravity, true);//DEPRECATED
 
 // \}
 }
diff --git a/dumux/decoupled/1p/1pproperties.hh b/dumux/decoupled/1p/1pproperties.hh
index 573d1c7621..1fc5fbebe4 100644
--- a/dumux/decoupled/1p/1pproperties.hh
+++ b/dumux/decoupled/1p/1pproperties.hh
@@ -30,6 +30,7 @@
 
 //Dumux-includes
 #include <dumux/decoupled/common/decoupledproperties.hh>
+#include <dumux/material/spatialparams/fvspatialparams1p.hh>
 
 namespace Dumux
 {
@@ -98,11 +99,14 @@ SET_TYPE_PROP(DecoupledOneP, Variables, VariableClass<TypeTag>);
 //! Set standart CellData of immiscible one-phase models as default
 SET_TYPE_PROP(DecoupledOneP, CellData, CellData1P<TypeTag>);
 
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(DecoupledOneP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParams by default.
+SET_TYPE_PROP(DecoupledOneP, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(DecoupledOneP, SpatialParameters, FVSpatialParamsOneP<TypeTag>);//DEPRECATED
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(DecoupledOneP, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(DecoupledOneP, EnableGravity, true);//DEPRECATED
 }
 }
 #endif
diff --git a/dumux/decoupled/2p/2pproperties.hh b/dumux/decoupled/2p/2pproperties.hh
index 146b925fcf..11021a5b31 100644
--- a/dumux/decoupled/2p/2pproperties.hh
+++ b/dumux/decoupled/2p/2pproperties.hh
@@ -33,6 +33,7 @@
 //Dumux-includes
 #include <dumux/decoupled/common/decoupledproperties.hh>
 #include "2pindices.hh"
+#include <dumux/material/spatialparams/fvspatialparams.hh>
 
 namespace Dumux
 {
@@ -75,7 +76,7 @@ NEW_PROP_TAG( FluidState );//!< Defines the fluid state
 
 //! \cond \private
 // keep only for compatibility with box models
-NEW_PROP_TAG( TwoPIndices );
+NEW_PROP_TAG( TwoPIndices );//DEPRECATED
 //! \endcond
 
 NEW_PROP_TAG( ImpetErrorTermFactor ); //!< Scaling factor for the error term (term to damp unphysical saturation overshoots via pressure correction)
@@ -124,7 +125,7 @@ typedef DecoupledTwoPIndices<GET_PROP_VALUE(TypeTag, Formulation), 0> type;
 /** \cond \private
  *  \deprecated TwoPIndices property
  */
-SET_TYPE_PROP(DecoupledTwoP, TwoPIndices, typename GET_PROP_TYPE(TypeTag, Indices));
+SET_TYPE_PROP(DecoupledTwoP, TwoPIndices, typename GET_PROP_TYPE(TypeTag, Indices));//DEPRECATED
 //! \endcond
 
 //! Set the default pressure formulation according to the chosen two-phase formulation
@@ -163,8 +164,11 @@ private:
 public:
     typedef IsothermalImmiscibleFluidState<Scalar, FluidSystem> type;
 };
-//! DEPRECATED SpatialParameters property
-SET_TYPE_PROP(DecoupledTwoP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParams by default.
+SET_TYPE_PROP(DecoupledTwoP, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(DecoupledTwoP, SpatialParameters, FVSpatialParams<TypeTag>);//DEPRECATED
 
 /*!
  * \brief Set the property for the material parameters by extracting
@@ -189,8 +193,9 @@ SET_SCALAR_PROP(DecoupledTwoP, ErrorTermLowerBound, 0.1);//DEPRECATED
 SET_SCALAR_PROP(DecoupledTwoP, ImpetErrorTermUpperBound, GET_PROP_VALUE(TypeTag, ErrorTermUpperBound));
 SET_SCALAR_PROP(DecoupledTwoP, ErrorTermUpperBound, 0.9);//DEPRECATED
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(DecoupledTwoP, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(DecoupledTwoP, EnableGravity, true);//DEPRECATED
 // \}
 }
 
diff --git a/dumux/decoupled/2p2c/2p2cproperties.hh b/dumux/decoupled/2p2c/2p2cproperties.hh
index fd65900abf..bc2398b0f2 100644
--- a/dumux/decoupled/2p2c/2p2cproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cproperties.hh
@@ -31,6 +31,7 @@
 #include <dumux/decoupled/common/pressureproperties.hh>
 #include <dumux/decoupled/common/transportproperties.hh>
 #include <dumux/decoupled/common/impetproperties.hh>
+#include <dumux/material/spatialparams/fvspatialparams.hh>
 
 namespace Dumux
 {
@@ -161,7 +162,10 @@ SET_TYPE_PROP(DecoupledTwoPTwoC, CellData, CellData2P2C<TypeTag>);
 SET_TYPE_PROP(DecoupledTwoPTwoC, FluidState, TwoPTwoCFluidState<TypeTag>);
 
 
-SET_TYPE_PROP(DecoupledTwoPTwoC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));//!< DEPRECATED SpatialParameters property
+//! The spatial parameters to be employed. 
+//! Use BoxSpatialParams by default.
+SET_TYPE_PROP(DecoupledTwoPTwoC, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
+SET_TYPE_PROP(DecoupledTwoPTwoC, SpatialParameters, FVSpatialParams<TypeTag>);//DEPRECATED
 
 SET_BOOL_PROP(DecoupledTwoPTwoC, ImpetEnableVolumeIntegral, GET_PROP_VALUE(TypeTag,EnableVolumeIntegral)); //!< Regard volume integral in pressure equation
 SET_BOOL_PROP(DecoupledTwoPTwoC, EnableVolumeIntegral, true); //!< DEPRECATED Regard volume integral in pressure equation
@@ -173,8 +177,9 @@ SET_SCALAR_PROP(DecoupledTwoPTwoC, ErrorTermLowerBound, 0.2); //!< Lower bound w
 SET_SCALAR_PROP(DecoupledTwoPTwoC, ImpetErrorTermUpperBound, GET_PROP_VALUE(TypeTag, ErrorTermUpperBound)); //!< Upper bound for regularized error damping
 SET_SCALAR_PROP(DecoupledTwoPTwoC, ErrorTermUpperBound, 0.9); //!< Upper bound for regularized error damping
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(DecoupledTwoPTwoC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(DecoupledTwoPTwoC, EnableGravity, true);//DEPRECATED
 }
 
 /*!
diff --git a/dumux/freeflow/stokes/stokespropertydefaults.hh b/dumux/freeflow/stokes/stokespropertydefaults.hh
index 0a3eb01735..55727f48c1 100644
--- a/dumux/freeflow/stokes/stokespropertydefaults.hh
+++ b/dumux/freeflow/stokes/stokespropertydefaults.hh
@@ -116,10 +116,8 @@ public:
 };
 
 //! Set the indices used by the Stokes model
-SET_TYPE_PROP(BoxStokes, Indices, StokesCommonIndices<TypeTag>);
-
-//! DEPRECATED Set the indices used by the Stokes model
-SET_TYPE_PROP(BoxStokes, StokesIndices, typename GET_PROP_TYPE(TypeTag, Indices));
+SET_TYPE_PROP(BoxStokes, Indices, typename GET_PROP_TYPE(TypeTag, StokesIndices));
+SET_TYPE_PROP(BoxStokes, StokesIndices, StokesCommonIndices<TypeTag>);//DEPRECATED
 
 //! Choose the type of the employed fluid state.
 SET_PROP(BoxStokes, FluidState)
@@ -152,8 +150,9 @@ SET_SCALAR_PROP(BoxStokes, StabilizationAlpha, 0.0);//DEPRECATED
 SET_SCALAR_PROP(BoxStokes, StokesStabilizationBeta, GET_PROP_VALUE(TypeTag, StabilizationBeta));
 SET_SCALAR_PROP(BoxStokes, StabilizationBeta, 0.0);//DEPRECATED
 
-//Has to be removed if DEPRECATED EnableGravity is removed!
+// enable gravity by default
 SET_BOOL_PROP(BoxStokes, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+SET_BOOL_PROP(BoxStokes, EnableGravity, true);//DEPRECATED
 
 }
 
diff --git a/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh b/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
index 9101a76bae..271e6d1a69 100644
--- a/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
+++ b/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
@@ -70,10 +70,8 @@ SET_TYPE_PROP(BoxStokes2c, VolumeVariables, Stokes2cVolumeVariables<TypeTag>);
 SET_TYPE_PROP(BoxStokes2c, FluxVariables, Stokes2cFluxVariables<TypeTag>);
 
 //! Set the Indices for the Stokes2c model.
-SET_TYPE_PROP(BoxStokes2c, Indices, Stokes2cCommonIndices<TypeTag>);
-
-//! DEPRECATED Set the Indices for the Stokes2c model.
-SET_TYPE_PROP(BoxStokes2c, Stokes2cIndices, typename GET_PROP_TYPE(TypeTag, Indices));
+SET_TYPE_PROP(BoxStokes2c, Indices, typename GET_PROP_TYPE(TypeTag, Stokes2cIndices));
+SET_TYPE_PROP(BoxStokes2c, Stokes2cIndices, Stokes2cCommonIndices<TypeTag>);//DEPRECATED
 
 //! Set the number of components to 2
 SET_INT_PROP(BoxStokes2c, NumComponents, 2);
diff --git a/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh b/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
index da021e0bf4..aa97eed3bf 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
@@ -68,10 +68,8 @@ SET_TYPE_PROP(BoxStokes2cni, VolumeVariables, Stokes2cniVolumeVariables<TypeTag>
 SET_TYPE_PROP(BoxStokes2cni, FluxVariables, Stokes2cniFluxVariables<TypeTag>);
 
 // Set the indices for the Stokes2cni model
-SET_TYPE_PROP(BoxStokes2cni, Indices, Stokes2cniCommonIndices<TypeTag>);
-
-// DEPRECATED Set the indices for the Stokes2cni model
-SET_TYPE_PROP(BoxStokes2cni, Stokes2cniIndices,  typename GET_PROP_TYPE(TypeTag, Indices));
+SET_TYPE_PROP(BoxStokes2cni, Indices,  typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices));
+SET_TYPE_PROP(BoxStokes2cni, Stokes2cniIndices, Stokes2cniCommonIndices<TypeTag>);
 }
 }
 #endif
-- 
GitLab