From df9145d9550e095018f849e5ca05d6ae72a0468c Mon Sep 17 00:00:00 2001
From: Markus Wolff <markus.wolff@twt-gmbh.de>
Date: Fri, 3 Aug 2012 13:03:26 +0000
Subject: [PATCH] Changed grouping of parameters and properties which are
default parameters according to the Dumux meeting at 26.07.12 (see
/doc/propparams.ods)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8803 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/1p/1plocalresidual.hh | 2 +-
dumux/boxmodels/1p/1pproperties.hh | 6 +-
dumux/boxmodels/1p/1ppropertydefaults.hh | 6 +-
dumux/boxmodels/1p2c/1p2cfluxvariables.hh | 2 +-
dumux/boxmodels/1p2c/1p2clocalresidual.hh | 2 +-
dumux/boxmodels/1p2c/1p2cmodel.hh | 2 +-
dumux/boxmodels/1p2c/1p2cproperties.hh | 6 +-
dumux/boxmodels/1p2c/1p2cpropertydefaults.hh | 6 +-
dumux/boxmodels/2p/2plocalresidual.hh | 2 +-
dumux/boxmodels/2p/2pmodel.hh | 2 +-
dumux/boxmodels/2p/2pproperties.hh | 9 +-
dumux/boxmodels/2p/2ppropertydefaults.hh | 8 +-
dumux/boxmodels/2p2c/2p2cfluxvariables.hh | 2 +-
dumux/boxmodels/2p2c/2p2clocalresidual.hh | 2 +-
dumux/boxmodels/2p2c/2p2cmodel.hh | 8 +-
dumux/boxmodels/2p2c/2p2cproperties.hh | 9 +-
dumux/boxmodels/2p2c/2p2cpropertydefaults.hh | 7 +-
dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh | 2 +-
dumux/boxmodels/2pni/2pnilocalresidual.hh | 2 +-
dumux/boxmodels/3p3c/3p3clocalresidual.hh | 2 +-
dumux/boxmodels/3p3c/3p3cproperties.hh | 6 +-
dumux/boxmodels/3p3c/3p3cpropertydefaults.hh | 4 +
dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh | 2 +-
dumux/boxmodels/common/boxassembler.hh | 4 +-
.../boxmodels/common/boxdarcyfluxvariables.hh | 7 +-
dumux/boxmodels/common/boxlocaljacobian.hh | 2 +-
dumux/boxmodels/common/boxmodel.hh | 2 +-
dumux/boxmodels/common/boxproblem.hh | 2 +-
dumux/boxmodels/common/boxproperties.hh | 17 ++--
dumux/boxmodels/common/boxpropertydefaults.hh | 17 ++--
.../boxmodels/common/porousmediaboxproblem.hh | 5 +-
.../mpnc/energy/mpncvtkwriterenergy.hh | 8 +-
.../mpnc/mass/mpnclocalresidualmass.hh | 4 +-
.../boxmodels/mpnc/mass/mpncvtkwritermass.hh | 2 +-
dumux/boxmodels/mpnc/mpncfluxvariables.hh | 2 +-
dumux/boxmodels/mpnc/mpncmodel.hh | 8 +-
dumux/boxmodels/mpnc/mpncnewtoncontroller.hh | 2 +-
dumux/boxmodels/mpnc/mpncproperties.hh | 82 +++++++++++------
dumux/boxmodels/mpnc/mpncpropertydefaults.hh | 76 +++++++++++-----
dumux/boxmodels/mpnc/mpncvtkwritercommon.hh | 22 ++---
.../richards/richardslocalresidual.hh | 2 +-
.../richards/richardsnewtoncontroller.hh | 2 +-
.../boxmodels/richards/richardsproperties.hh | 6 +-
.../richards/richardspropertydefaults.hh | 4 +
dumux/common/basicproperties.hh | 18 ++++
dumux/common/cubegridcreator.hh | 12 +--
dumux/common/dgfgridcreator.hh | 2 +-
dumux/common/parameters.hh | 91 +++++++++++++++++--
dumux/common/simplexgridcreator.hh | 12 +--
dumux/common/start.hh | 26 +++---
dumux/decoupled/1p/1pproperties.hh | 6 +-
.../1p/diffusion/diffusionproblem1p.hh | 8 +-
dumux/decoupled/2p/2pproperties.hh | 25 +++--
.../2p/diffusion/diffusionproblem2p.hh | 8 +-
.../decoupled/2p/diffusion/fv/fvpressure2p.hh | 6 +-
.../2p/impes/gridadaptionindicator2p.hh | 4 +-
dumux/decoupled/2p/impes/impesproblem2p.hh | 4 +-
.../2p/transport/fv/fvsaturation2p.hh | 2 +-
.../2p/transport/transportproblem2p.hh | 8 +-
dumux/decoupled/2p2c/2p2cproperties.hh | 30 ++++--
dumux/decoupled/2p2c/fvpressure2p2c.hh | 8 +-
.../decoupled/2p2c/fvpressurecompositional.hh | 8 +-
dumux/decoupled/2p2c/fvtransport2p2c.hh | 4 +-
.../2p2c/fvtransport2p2cmultiphysics.hh | 2 +-
dumux/decoupled/common/fv/fvtransport.hh | 2 +-
dumux/decoupled/common/gridadapt.hh | 8 +-
.../gridadaptinitializationindicator.hh | 12 +--
...gridadaptinitializationindicatordefault.hh | 2 +-
dumux/decoupled/common/gridadaptproperties.hh | 66 +++++++++-----
dumux/decoupled/common/impet.hh | 10 +-
dumux/decoupled/common/impetproperties.hh | 20 +++-
dumux/decoupled/common/transportproperties.hh | 13 ++-
dumux/freeflow/stokes/stokeslocalresidual.hh | 6 +-
dumux/freeflow/stokes/stokesproblem.hh | 2 +-
dumux/freeflow/stokes/stokesproperties.hh | 12 ++-
.../freeflow/stokes/stokespropertydefaults.hh | 10 +-
dumux/linear/boxlinearsolver.hh | 6 +-
dumux/linear/impetbicgstabilu0solver.hh | 2 +-
dumux/linear/linearsolverproperties.hh | 18 ++--
dumux/linear/seqsolverbackend.hh | 16 ++--
dumux/nonlinear/newtoncontroller.hh | 7 +-
test/boxmodels/1p/test_1p.input | 8 +-
test/boxmodels/1p2c/test_1p2c.input | 6 +-
test/boxmodels/2p/test_2p.input | 8 +-
test/boxmodels/2p2c/injectionproblem.hh | 2 +-
test/boxmodels/2p2c/test_2p2c.input | 6 +-
test/boxmodels/2p2cni/test_2p2cni.input | 6 +-
test/boxmodels/2pni/test_2pni.input | 12 +--
test/boxmodels/3p3c/test_3p3c.input | 6 +-
test/boxmodels/3p3cni/test_3p3cni.input | 6 +-
test/boxmodels/mpnc/test_mpnc.input | 6 +-
test/boxmodels/richards/test_richards.input | 6 +-
test/decoupled/1p/test_1p.input | 21 +++--
test/decoupled/1p/test_1pproblem.hh | 4 +-
test/decoupled/2p/test_impes.input | 15 +--
test/decoupled/2p/test_impesproblem.hh | 2 +-
test/decoupled/2p/test_transport.input | 11 ++-
test/decoupled/2p2c/test_dec2p2c.input | 19 ++--
.../2padaptive/test_impesadaptive.input | 17 ++--
.../2padaptive/test_impesadaptiveproblem.hh | 4 +-
.../navierstokes/test_navierstokes.input | 11 ++-
test/freeflow/stokes/test_stokes.input | 11 ++-
test/freeflow/stokes2c/test_stokes2c.input | 11 ++-
.../freeflow/stokes2cni/test_stokes2cni.input | 10 +-
104 files changed, 688 insertions(+), 391 deletions(-)
diff --git a/dumux/boxmodels/1p/1plocalresidual.hh b/dumux/boxmodels/1p/1plocalresidual.hh
index a96b77340e..034d6521cc 100644
--- a/dumux/boxmodels/1p/1plocalresidual.hh
+++ b/dumux/boxmodels/1p/1plocalresidual.hh
@@ -77,7 +77,7 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- upwindWeight_ = GET_PARAM(TypeTag, Scalar, UpwindWeight);
+ upwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
};
/*!
diff --git a/dumux/boxmodels/1p/1pproperties.hh b/dumux/boxmodels/1p/1pproperties.hh
index 0039368906..a09f219302 100644
--- a/dumux/boxmodels/1p/1pproperties.hh
+++ b/dumux/boxmodels/1p/1pproperties.hh
@@ -59,8 +59,10 @@ NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters object
NEW_PROP_TAG(SpatialParameters); //!< DEPRECATED The type of the spatial parameters object
NEW_PROP_TAG(FluidSystem); //!< The type of the fluid system to use
NEW_PROP_TAG(Fluid); //!< The fluid used for the default fluid system
-NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(UpwindWeight); //!< Returns weight of the upwind cell when calculating fluxes
+NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
+NEW_PROP_TAG(UpwindWeight); //!< DEPRECATED Returns weight of the upwind cell when calculating fluxes
+NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< Returns weight of the upwind cell when calculating fluxes
NEW_PROP_TAG(MobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
// \}
diff --git a/dumux/boxmodels/1p/1ppropertydefaults.hh b/dumux/boxmodels/1p/1ppropertydefaults.hh
index aaf22a3ef6..88d6cb3c88 100644
--- a/dumux/boxmodels/1p/1ppropertydefaults.hh
+++ b/dumux/boxmodels/1p/1ppropertydefaults.hh
@@ -81,7 +81,8 @@ SET_TYPE_PROP(BoxOneP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, Spatia
//! The weight of the upwind control volume when calculating
//! fluxes. Use central differences by default.
-SET_SCALAR_PROP(BoxOneP, UpwindWeight, 0.5);
+SET_SCALAR_PROP(BoxOneP, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, UpwindWeight));
+SET_SCALAR_PROP(BoxOneP, UpwindWeight, 0.5);//DEPRECATED
//! weight for the upwind mobility in the velocity calculation
SET_SCALAR_PROP(BoxOneP, MobilityUpwindWeight, 1.0);
@@ -96,6 +97,9 @@ public:
typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
};
+//Has to be removed if DEPRECATED EnableGravity is removed!
+SET_BOOL_PROP(BoxOneP, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+
// \}
} // end namepace Properties
diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
index 16f8ffdb5c..ee7056abeb 100644
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
@@ -406,7 +406,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 rhoI = elemVolVars[face().i].density();
diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
index 5bfad15e80..3d38cfdd0b 100644
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
@@ -104,7 +104,7 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- upwindWeight_ = GET_PARAM(TypeTag, Scalar, UpwindWeight);
+ upwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
};
/*!
diff --git a/dumux/boxmodels/1p2c/1p2cmodel.hh b/dumux/boxmodels/1p2c/1p2cmodel.hh
index 7296adacec..75c0afddf0 100644
--- a/dumux/boxmodels/1p2c/1p2cmodel.hh
+++ b/dumux/boxmodels/1p2c/1p2cmodel.hh
@@ -105,7 +105,7 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- upwindWeight_ = GET_PARAM(TypeTag, Scalar, UpwindWeight);
+ upwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
}
/*!
diff --git a/dumux/boxmodels/1p2c/1p2cproperties.hh b/dumux/boxmodels/1p2c/1p2cproperties.hh
index 7eae384522..f0433209d9 100644
--- a/dumux/boxmodels/1p2c/1p2cproperties.hh
+++ b/dumux/boxmodels/1p2c/1p2cproperties.hh
@@ -62,8 +62,10 @@ NEW_PROP_TAG(Indices); //!< Enumerations for the model
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
NEW_PROP_TAG(SpatialParameters); //!< DEPRECATED The type of the spatial parameters
NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
-NEW_PROP_TAG(UpwindWeight); //!< The default value of the upwind weight
-NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(UpwindWeight); //!< DEPRECATED The default value of the upwind weight
+NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The default value of the upwind weight
+NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
NEW_PROP_TAG(UseMoles); //!Defines whether mole (true) or mass (false) fractions are used
NEW_PROP_TAG(Scaling); //!Defines Scaling of the model
}
diff --git a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
index df040c82ce..57d13d4b23 100644
--- a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
+++ b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
@@ -70,7 +70,8 @@ SET_TYPE_PROP(BoxOnePTwoC, VolumeVariables, OnePTwoCVolumeVariables<TypeTag>);
SET_TYPE_PROP(BoxOnePTwoC, FluxVariables, OnePTwoCFluxVariables<TypeTag>);
//! set default upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(BoxOnePTwoC, UpwindWeight, 1.0);
+SET_SCALAR_PROP(BoxOnePTwoC, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, UpwindWeight));
+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>);
@@ -83,6 +84,9 @@ SET_TYPE_PROP(BoxOnePTwoC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, Sp
//! 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!
+SET_BOOL_PROP(BoxOnePTwoC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
}
// \}
}
diff --git a/dumux/boxmodels/2p/2plocalresidual.hh b/dumux/boxmodels/2p/2plocalresidual.hh
index e5d69590c5..0d9441a27e 100644
--- a/dumux/boxmodels/2p/2plocalresidual.hh
+++ b/dumux/boxmodels/2p/2plocalresidual.hh
@@ -78,7 +78,7 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- massUpwindWeight_ = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
+ massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
};
/*!
diff --git a/dumux/boxmodels/2p/2pmodel.hh b/dumux/boxmodels/2p/2pmodel.hh
index 2ee4dbd233..9248a78957 100644
--- a/dumux/boxmodels/2p/2pmodel.hh
+++ b/dumux/boxmodels/2p/2pmodel.hh
@@ -129,7 +129,7 @@ public:
void addOutputVtkFields(const SolutionVector &sol,
MultiWriter &writer)
{
- bool velocityOutput = GET_PROP_VALUE(TypeTag, EnableVelocityOutput);
+ bool velocityOutput = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddVelocity);
typedef Dune::BlockVector<Dune::FieldVector<double, 1> > ScalarField;
typedef Dune::BlockVector<Dune::FieldVector<double, dim> > VectorField;
diff --git a/dumux/boxmodels/2p/2pproperties.hh b/dumux/boxmodels/2p/2pproperties.hh
index e79459b490..fb825fd8f5 100644
--- a/dumux/boxmodels/2p/2pproperties.hh
+++ b/dumux/boxmodels/2p/2pproperties.hh
@@ -59,8 +59,10 @@ NEW_TYPE_TAG(BoxTwoP, INHERITS_FROM(BoxModel));
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
-NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(MassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations
+NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
+NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations
+NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED The value of the weight of the upwind direction in the mass conservation equations
NEW_PROP_TAG(MobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
NEW_PROP_TAG(Formulation); //!< The formulation of the model
NEW_PROP_TAG(TwoPIndices); //!< DEPRECATED Enumerations for the 2p models
@@ -73,7 +75,8 @@ NEW_PROP_TAG(WettingPhase); //!< The wetting phase for two-phase models
NEW_PROP_TAG(NonwettingPhase); //!< The non-wetting phase for two-phase models
NEW_PROP_TAG(FluidSystem); //!<The fluid systems including the information about the phases
NEW_PROP_TAG(FluidState); //!<The phases state
-NEW_PROP_TAG(EnableVelocityOutput); //!< Returns whether vertex velocity vectors are written into the vtk output
+NEW_PROP_TAG(VtkAddVelocity); //!< Returns whether velocity vectors are written into the vtk output
+NEW_PROP_TAG(EnableVelocityOutput); //!< DEPRECATED Returns whether vertex velocity vectors are written into the vtk output
}
}
diff --git a/dumux/boxmodels/2p/2ppropertydefaults.hh b/dumux/boxmodels/2p/2ppropertydefaults.hh
index 326717f588..538c8b8ac2 100644
--- a/dumux/boxmodels/2p/2ppropertydefaults.hh
+++ b/dumux/boxmodels/2p/2ppropertydefaults.hh
@@ -76,7 +76,8 @@ SET_TYPE_PROP(BoxTwoP, VolumeVariables, TwoPVolumeVariables<TypeTag>);
SET_TYPE_PROP(BoxTwoP, FluxVariables, BoxDarcyFluxVariables<TypeTag>);
//! the upwind weight for the mass conservation equations.
-SET_SCALAR_PROP(BoxTwoP, MassUpwindWeight, 1.0);
+SET_SCALAR_PROP(BoxTwoP, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight));
+SET_SCALAR_PROP(BoxTwoP, MassUpwindWeight, 1.0);//DEPRECATED
//! weight for the upwind mobility in the velocity calculation
SET_SCALAR_PROP(BoxTwoP, MobilityUpwindWeight, 1.0);
@@ -136,8 +137,11 @@ public:
};
// disable velocity output by default
-SET_BOOL_PROP(BoxTwoP, EnableVelocityOutput, false);
+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!
+SET_BOOL_PROP(BoxTwoP, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
}
//
diff --git a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
index 9288b1e2da..0ad7c66f1b 100644
--- a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
@@ -184,7 +184,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)) {
// 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/2p2c/2p2clocalresidual.hh b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
index abf750f36f..d0a9ab42ef 100644
--- a/dumux/boxmodels/2p2c/2p2clocalresidual.hh
+++ b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
@@ -102,7 +102,7 @@ class TwoPTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- massUpwindWeight_ = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
+ massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
};
/*!
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index 9256acd6a1..58138be58c 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -153,7 +153,7 @@ public:
setSwitched_(false);
// check, if velocity output can be used (works only for cubes so far)
- velocityOutput_ = GET_PARAM(TypeTag, bool, EnableVelocityOutput);
+ velocityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddVelocity);
ElementIterator eIt = this->gridView_().template begin<0>();
ElementIterator eEndIt = this->gridView_().template end<0>();
for (; eIt != eEndIt; ++eIt)
@@ -162,7 +162,7 @@ public:
velocityOutput_ = false;
}
}
- if (velocityOutput_ != GET_PARAM(TypeTag, bool, EnableVelocityOutput))
+ if (velocityOutput_ != GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddVelocity))
std::cout << "ATTENTION: Velocity output only works for cubes and is set to false for simplices\n";
VertexIterator vIt = this->gridView_().template begin<dim> ();
@@ -182,7 +182,7 @@ public:
= staticVertexDat_[globalIdx].phasePresence;
}
- massUpwindWeight_ = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
+ massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
}
/*!
@@ -432,7 +432,7 @@ public:
// Get the Darcy velocities. The Darcy velocities are divided by the area of the subcontrolvolume
// face in the reference element.
- massUpwindWeight_ = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
+ massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
PhasesVector flux;
flux[phaseIdx] = fluxVars.KmvpNormal(phaseIdx)
* (massUpwindWeight_
diff --git a/dumux/boxmodels/2p2c/2p2cproperties.hh b/dumux/boxmodels/2p2c/2p2cproperties.hh
index e865f4b822..599ac05a49 100644
--- a/dumux/boxmodels/2p2c/2p2cproperties.hh
+++ b/dumux/boxmodels/2p2c/2p2cproperties.hh
@@ -65,10 +65,13 @@ NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatial parameters)
NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extracted from the spatial parameters)
-NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(MassUpwindWeight); //!< The value of the upwind weight for the mass conservation equations
+NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
+NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind weight for the mass conservation equations
+NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED The value of the upwind weight for the mass conservation equations
NEW_PROP_TAG(ReplaceCompEqIdx); //!< The index of the total mass balance equation, if one component balance is replaced (ReplaceCompEqIdx < NumComponents)
-NEW_PROP_TAG(EnableVelocityOutput); //!< Returns whether vertex velocity vectors are written into the vtk output
+NEW_PROP_TAG(VtkAddVelocity); //!< Returns whether velocity vectors are written into the vtk output
+NEW_PROP_TAG(EnableVelocityOutput); //!< DEPRECATED Returns whether vertex velocity vectors are written into the vtk output
}
}
diff --git a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
index 7f0815b3de..7067782dbb 100644
--- a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
+++ b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
@@ -123,7 +123,8 @@ SET_TYPE_PROP(BoxTwoPTwoC, VolumeVariables, TwoPTwoCVolumeVariables<TypeTag>);
SET_TYPE_PROP(BoxTwoPTwoC, FluxVariables, TwoPTwoCFluxVariables<TypeTag>);
//! the upwind weight for the mass conservation equations.
-SET_SCALAR_PROP(BoxTwoPTwoC, MassUpwindWeight, 1.0);
+SET_SCALAR_PROP(BoxTwoPTwoC, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight));
+SET_SCALAR_PROP(BoxTwoPTwoC, MassUpwindWeight, 1.0);//DEPRECATED
//! The indices required by the isothermal 2p2c model
SET_PROP(BoxTwoPTwoC,
@@ -141,8 +142,12 @@ SET_TYPE_PROP(BoxTwoPTwoC, TwoPTwoCIndices, typename GET_PROP_TYPE(TypeTag, Indi
SET_TYPE_PROP(BoxTwoPTwoC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
// 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!
+SET_BOOL_PROP(BoxTwoPTwoC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+
//
}
diff --git a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
index 83f3490576..9686c77e10 100644
--- a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
@@ -75,7 +75,7 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- massUpwindWeight_ = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
+ massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
};
/*!
diff --git a/dumux/boxmodels/2pni/2pnilocalresidual.hh b/dumux/boxmodels/2pni/2pnilocalresidual.hh
index 0a9c711190..3e274f65ef 100644
--- a/dumux/boxmodels/2pni/2pnilocalresidual.hh
+++ b/dumux/boxmodels/2pni/2pnilocalresidual.hh
@@ -81,7 +81,7 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- massUpwindWeight_ = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
+ massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
};
/*!
diff --git a/dumux/boxmodels/3p3c/3p3clocalresidual.hh b/dumux/boxmodels/3p3c/3p3clocalresidual.hh
index 8c83931e0d..5191e0f69b 100644
--- a/dumux/boxmodels/3p3c/3p3clocalresidual.hh
+++ b/dumux/boxmodels/3p3c/3p3clocalresidual.hh
@@ -158,7 +158,7 @@ public:
void computeAdvectiveFlux(PrimaryVariables &flux, const FluxVariables &fluxVars) const
{
- Scalar massUpwindWeight = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
+ Scalar massUpwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
////////
// advective fluxes of all components in all phases
diff --git a/dumux/boxmodels/3p3c/3p3cproperties.hh b/dumux/boxmodels/3p3c/3p3cproperties.hh
index 6a4043f8f1..0ff0cf0881 100644
--- a/dumux/boxmodels/3p3c/3p3cproperties.hh
+++ b/dumux/boxmodels/3p3c/3p3cproperties.hh
@@ -63,8 +63,10 @@ NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatial parameters)
NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extracted from the spatial parameters)
-NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(MassUpwindWeight); //!< The value of the upwind parameter for the mobility
+NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
+NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind parameter for the mobility
+NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED The value of the upwind parameter for the mobility
NEW_PROP_TAG(UseConstraintSolver); //!< Determines whether a constraint solver should be used explicitly
}
}
diff --git a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh b/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
index f7bc246710..ae38b35bdd 100644
--- a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
+++ b/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
@@ -111,6 +111,7 @@ SET_TYPE_PROP(BoxThreePThreeC, VolumeVariables, ThreePThreeCVolumeVariables<Type
SET_TYPE_PROP(BoxThreePThreeC, FluxVariables, ThreePThreeCFluxVariables<TypeTag>);
//! the upwind factor for the mobility.
+SET_SCALAR_PROP(BoxThreePThreeC, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight));
SET_SCALAR_PROP(BoxThreePThreeC, MassUpwindWeight, 1.0);
//! Determines whether a constraint solver should be used explicitly
@@ -124,6 +125,9 @@ SET_TYPE_PROP(BoxThreePThreeC, ThreePThreeCIndices, typename GET_PROP_TYPE(TypeT
//! DEPRECATED SpatialParameters property
SET_TYPE_PROP(BoxThreePThreeC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+
+//Has to be removed if DEPRECATED EnableGravity is removed!
+SET_BOOL_PROP(BoxThreePThreeC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
}
}
diff --git a/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh b/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
index 83895715ae..260f3cc8e2 100644
--- a/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
@@ -153,7 +153,7 @@ public:
// advective mass flux
ParentType::computeAdvectiveFlux(flux, fluxData);
- static const Scalar massUpwindWeight = GET_PROP_VALUE(TypeTag, MassUpwindWeight);
+ static const Scalar massUpwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
// advective heat flux in all phases
flux[energyEqIdx] = 0;
diff --git a/dumux/boxmodels/common/boxassembler.hh b/dumux/boxmodels/common/boxassembler.hh
index c51a66e675..5e71c444e1 100644
--- a/dumux/boxmodels/common/boxassembler.hh
+++ b/dumux/boxmodels/common/boxassembler.hh
@@ -543,9 +543,9 @@ public:
private:
static bool enableJacobianRecycling_()
- { return GET_PARAM(TypeTag, bool, EnableJacobianRecycling); }
+ { return GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, EnableJacobianRecycling); }
static bool enablePartialReassemble_()
- { return GET_PARAM(TypeTag, bool, EnablePartialReassemble); }
+ { return GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, EnablePartialReassemble); }
// Construct the BCRS matrix for the global jacobian
void createMatrix_()
diff --git a/dumux/boxmodels/common/boxdarcyfluxvariables.hh b/dumux/boxmodels/common/boxdarcyfluxvariables.hh
index a10c5e37ad..dd670e8f3d 100644
--- a/dumux/boxmodels/common/boxdarcyfluxvariables.hh
+++ b/dumux/boxmodels/common/boxdarcyfluxvariables.hh
@@ -46,7 +46,8 @@ namespace Properties
NEW_PROP_TAG(MobilityUpwindWeight);
NEW_PROP_TAG(SpatialParams);
NEW_PROP_TAG(NumPhases);
-NEW_PROP_TAG(EnableGravity);
+NEW_PROP_TAG(ProblemEnableGravity);
+NEW_PROP_TAG(EnableGravity);//DEPRECATED
}
/*!
@@ -97,7 +98,7 @@ public:
const bool onBoundary = false)
: fvGeometry_(fvGeometry), faceIdx_(faceIdx), onBoundary_(onBoundary)
{
- mobilityUpwindWeight_ = GET_PARAM(TypeTag, Scalar, MobilityUpwindWeight);
+ mobilityUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MobilityUpwindWeight);
calculateNormalVelocity_(problem, element, elemVolVars);
}
@@ -215,7 +216,7 @@ private:
}
// correct the pressure gradient 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
diff --git a/dumux/boxmodels/common/boxlocaljacobian.hh b/dumux/boxmodels/common/boxlocaljacobian.hh
index 2953098ac8..81f1cab42b 100644
--- a/dumux/boxmodels/common/boxlocaljacobian.hh
+++ b/dumux/boxmodels/common/boxlocaljacobian.hh
@@ -104,7 +104,7 @@ private:
public:
BoxLocalJacobian()
{
- numericDifferenceMethod_ = GET_PARAM(TypeTag, int, NumericDifferenceMethod);
+ numericDifferenceMethod_ = GET_PARAM_FROM_GROUP(TypeTag, int, Implicit, NumericDifferenceMethod);
Valgrind::SetUndefined(problemPtr_);
}
diff --git a/dumux/boxmodels/common/boxmodel.hh b/dumux/boxmodels/common/boxmodel.hh
index bedaf8f8ee..395719c41c 100644
--- a/dumux/boxmodels/common/boxmodel.hh
+++ b/dumux/boxmodels/common/boxmodel.hh
@@ -94,7 +94,7 @@ public:
*/
BoxModel()
{
- enableHints_ = GET_PARAM(TypeTag, bool, EnableHints);
+ enableHints_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, EnableHints);
}
~BoxModel()
diff --git a/dumux/boxmodels/common/boxproblem.hh b/dumux/boxmodels/common/boxproblem.hh
index 54c21a2413..d4a273d571 100644
--- a/dumux/boxmodels/common/boxproblem.hh
+++ b/dumux/boxmodels/common/boxproblem.hh
@@ -518,7 +518,7 @@ public:
*/
Scalar nextTimeStepSize(const Scalar dt)
{
- return std::min(GET_PARAM(TypeTag, Scalar, MaxTimeStepSize),
+ return std::min(GET_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, MaxTimeStepSize),
newtonCtl_.suggestTimeStepSize(dt));
};
diff --git a/dumux/boxmodels/common/boxproperties.hh b/dumux/boxmodels/common/boxproperties.hh
index e5a24b9aab..2bbf860ad7 100644
--- a/dumux/boxmodels/common/boxproperties.hh
+++ b/dumux/boxmodels/common/boxproperties.hh
@@ -93,19 +93,21 @@ NEW_PROP_TAG(NewtonController); //!< The type of the newton controller
//! Specify whether the jacobian matrix of the last iteration of a
//! time step should be re-used as the jacobian of the first iteration
//! of the next time step.
-NEW_PROP_TAG(EnableJacobianRecycling);
+NEW_PROP_TAG(EnableJacobianRecycling);//DEPRECATED
+NEW_PROP_TAG(ImplicitEnableJacobianRecycling);
//! Specify whether the jacobian matrix should be only reassembled for
//! elements where at least one vertex is above the specified
//! tolerance
-NEW_PROP_TAG(EnablePartialReassemble);
-
+NEW_PROP_TAG(ImplicitEnablePartialReassemble);
+NEW_PROP_TAG(EnablePartialReassemble);//DEPRECATED
/*!
* \brief Specify the maximum size of a time integration [s].
*
* The default is to not limit the step size.
*/
-NEW_PROP_TAG(MaxTimeStepSize);
+NEW_PROP_TAG(TimeManagerMaxTimeStepSize);
+NEW_PROP_TAG(MaxTimeStepSize);//DEPRECATED
/*!
* \brief Specify which kind of method should be used to numerically
@@ -114,8 +116,8 @@ NEW_PROP_TAG(MaxTimeStepSize);
* -1 means backward differences, 0 means central differences, 1 means
* forward differences. By default we use central differences.
*/
-NEW_PROP_TAG(NumericDifferenceMethod);
-
+NEW_PROP_TAG(ImplicitNumericDifferenceMethod);
+NEW_PROP_TAG(NumericDifferenceMethod);//DEPRECATED
/*!
* \brief Specify whether to use the already calculated solutions as
* starting values of the volume variables.
@@ -124,7 +126,8 @@ NEW_PROP_TAG(NumericDifferenceMethod);
* very expensive (e.g. for non-linear fugacity functions where the
* solver converges faster).
*/
-NEW_PROP_TAG(EnableHints);
+NEW_PROP_TAG(ImplicitEnableHints);
+NEW_PROP_TAG(EnableHints);//DEPRECATED
// mappers from local to global indices
diff --git a/dumux/boxmodels/common/boxpropertydefaults.hh b/dumux/boxmodels/common/boxpropertydefaults.hh
index 2031c43ec6..0d45e04b2b 100644
--- a/dumux/boxmodels/common/boxpropertydefaults.hh
+++ b/dumux/boxmodels/common/boxpropertydefaults.hh
@@ -159,22 +159,27 @@ SET_TYPE_PROP(BoxModel, JacobianAssembler, Dumux::BoxAssembler<TypeTag>);
#if 0
// requires GCC 4.6 and above to call the constexpr function of
// numeric_limits
-SET_SCALAR_PROP(BoxModel, MaxTimeStepSize, std::numeric_limits<Scalar>::infinity());
+SET_SCALAR_PROP(BoxModel, MaxTimeStepSize, std::numeric_limits<Scalar>::infinity());//DEPRECATED
#else
-SET_SCALAR_PROP(BoxModel, MaxTimeStepSize, 1e100);
+SET_SCALAR_PROP(BoxModel, MaxTimeStepSize, 1e100);//DEPRECATED
#endif
+SET_SCALAR_PROP(BoxModel, TimeManagerMaxTimeStepSize, GET_PROP_VALUE(TypeTag, MaxTimeStepSize));
//! use forward differences to calculate the jacobian by default
-SET_INT_PROP(BoxModel, NumericDifferenceMethod, +1);
+SET_INT_PROP(BoxModel, ImplicitNumericDifferenceMethod, GET_PROP_VALUE(TypeTag, NumericDifferenceMethod));
+SET_INT_PROP(BoxModel, NumericDifferenceMethod, +1);//DEPRECATED
//! do not use hints by default
-SET_BOOL_PROP(BoxModel, EnableHints, false);
+SET_BOOL_PROP(BoxModel, ImplicitEnableHints, GET_PROP_VALUE(TypeTag, EnableHints));
+SET_BOOL_PROP(BoxModel, EnableHints, false);//DEPRECATED
// disable jacobian matrix recycling by default
-SET_BOOL_PROP(BoxModel, EnableJacobianRecycling, false);
+SET_BOOL_PROP(BoxModel, ImplicitEnableJacobianRecycling, GET_PROP_VALUE(TypeTag, EnableJacobianRecycling));
+SET_BOOL_PROP(BoxModel, EnableJacobianRecycling, false);//DEPRECATED
// disable partial reassembling by default
-SET_BOOL_PROP(BoxModel, EnablePartialReassemble, false);
+SET_BOOL_PROP(BoxModel, ImplicitEnablePartialReassemble, GET_PROP_VALUE(TypeTag, EnablePartialReassemble));
+SET_BOOL_PROP(BoxModel, EnablePartialReassemble, false);//DEPRECATED
//! Set the type of a global jacobian matrix from the solution types
SET_PROP(BoxModel, JacobianMatrix)
diff --git a/dumux/boxmodels/common/porousmediaboxproblem.hh b/dumux/boxmodels/common/porousmediaboxproblem.hh
index 79eb3e2aaf..37637b3132 100644
--- a/dumux/boxmodels/common/porousmediaboxproblem.hh
+++ b/dumux/boxmodels/common/porousmediaboxproblem.hh
@@ -36,7 +36,8 @@ namespace Dumux
namespace Properties
{
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters object
-NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
}
/*!
@@ -82,7 +83,7 @@ public:
newSpatialParams_ = true;
spatialParams_ = new SpatialParams(gridView);
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim-1] = -9.81;
}
diff --git a/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh b/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
index 59bb78a69d..65fab3cd01 100644
--- a/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
+++ b/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
@@ -69,7 +69,7 @@ public:
MPNCVtkWriterEnergy(const Problem &problem)
: ParentType(problem)
{
- temperatureOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddTemperatures);
+ temperatureOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddTemperatures);
}
/*!
@@ -151,9 +151,9 @@ public:
MPNCVtkWriterEnergy(const Problem &problem)
: ParentType(problem)
{
- temperatureOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddTemperatures);
- enthalpyOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddEnthalpies);
- internalEnergyOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddInternalEnergies);
+ temperatureOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddTemperatures);
+ enthalpyOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddEnthalpies);
+ internalEnergyOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddInternalEnergies);
}
/*!
diff --git a/dumux/boxmodels/mpnc/mass/mpnclocalresidualmass.hh b/dumux/boxmodels/mpnc/mass/mpnclocalresidualmass.hh
index 4b9559a52c..e23b374255 100644
--- a/dumux/boxmodels/mpnc/mass/mpnclocalresidualmass.hh
+++ b/dumux/boxmodels/mpnc/mass/mpnclocalresidualmass.hh
@@ -103,9 +103,9 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- const Scalar massUpwindWeight = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
+ const Scalar massUpwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
- static bool enableSmoothUpwinding_ = GET_PARAM(TypeTag, bool, EnableSmoothUpwinding);
+ static bool enableSmoothUpwinding_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, EnableSmoothUpwinding);
// data attached to upstream and the downstream vertices
// of the current phase
diff --git a/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh b/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
index 7f4f1920a6..2645ebd987 100644
--- a/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
+++ b/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
@@ -67,7 +67,7 @@ public:
MPNCVtkWriterMass(const Problem &problem)
: ParentType(problem)
{
- fugacityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddFugacities);
+ fugacityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddFugacities);
}
/*!
diff --git a/dumux/boxmodels/mpnc/mpncfluxvariables.hh b/dumux/boxmodels/mpnc/mpncfluxvariables.hh
index 8b9e3aa5fa..f0d4cdf999 100644
--- a/dumux/boxmodels/mpnc/mpncfluxvariables.hh
+++ b/dumux/boxmodels/mpnc/mpncfluxvariables.hh
@@ -71,7 +71,7 @@ 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, EnableGravity)};
+ 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/mpncmodel.hh b/dumux/boxmodels/mpnc/mpncmodel.hh
index 50c75a9729..985f9828a1 100644
--- a/dumux/boxmodels/mpnc/mpncmodel.hh
+++ b/dumux/boxmodels/mpnc/mpncmodel.hh
@@ -126,10 +126,10 @@ class MPNCModel : public GET_PROP_TYPE(TypeTag, BaseModel)
enum {enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion)};
enum {enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic)};
enum {enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy)};
- enum {enableSmoothUpwinding = GET_PROP_VALUE(TypeTag, EnableSmoothUpwinding)};
- enum {enablePartialReassemble = GET_PROP_VALUE(TypeTag, EnablePartialReassemble)};
- enum {enableJacobianRecycling = GET_PROP_VALUE(TypeTag, EnableJacobianRecycling)};
- enum {numDiffMethod = GET_PROP_VALUE(TypeTag, NumericDifferenceMethod)};
+ enum {enableSmoothUpwinding = GET_PROP_VALUE(TypeTag, ImplicitEnableSmoothUpwinding)};
+ enum {enablePartialReassemble = GET_PROP_VALUE(TypeTag, ImplicitEnablePartialReassemble)};
+ enum {enableJacobianRecycling = GET_PROP_VALUE(TypeTag, ImplicitEnableJacobianRecycling)};
+ enum {numDiffMethod = GET_PROP_VALUE(TypeTag, ImplicitNumericDifferenceMethod)};
enum {numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
enum {numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
enum {numEq = GET_PROP_VALUE(TypeTag, NumEq)};
diff --git a/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh b/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
index 12d48be360..4440fb4584 100644
--- a/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
+++ b/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
@@ -213,7 +213,7 @@ public:
this->writeConvergence_(uLastIter, deltaU);
- if (GET_PROP_VALUE(TypeTag, NewtonUseLineSearch)) {
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, UseLineSearch)) {
lineSearchUpdate_(uCurrentIter, uLastIter, deltaU);
}
else {
diff --git a/dumux/boxmodels/mpnc/mpncproperties.hh b/dumux/boxmodels/mpnc/mpncproperties.hh
index 6f74963f21..b6eb373363 100644
--- a/dumux/boxmodels/mpnc/mpncproperties.hh
+++ b/dumux/boxmodels/mpnc/mpncproperties.hh
@@ -62,30 +62,55 @@ NEW_PROP_TAG(MPNCVtkCustomModule); //!< Vtk writer module for writing the user-s
NEW_PROP_TAG(VelocityAveragingInModel);//!< Should the averaging of velocities be done in the model?
//! specify which quantities are written to the vtk output files
-NEW_PROP_TAG(MPNCVtkAddPorosity);
-NEW_PROP_TAG(MPNCVtkAddBoundaryTypes);
-NEW_PROP_TAG(MPNCVtkAddSaturations);
-NEW_PROP_TAG(MPNCVtkAddPressures);
-NEW_PROP_TAG(MPNCVtkAddVarPressures);
-NEW_PROP_TAG(MPNCVtkAddVelocities);
-NEW_PROP_TAG(MPNCVtkAddDensities);
-NEW_PROP_TAG(MPNCVtkAddMobilities);
-NEW_PROP_TAG(MPNCVtkAddAverageMolarMass);
-NEW_PROP_TAG(MPNCVtkAddMassFractions);
-NEW_PROP_TAG(MPNCVtkAddMoleFractions);
-NEW_PROP_TAG(MPNCVtkAddMolarities);
-NEW_PROP_TAG(MPNCVtkAddFugacities);
-NEW_PROP_TAG(MPNCVtkAddFugacityCoefficients);
-NEW_PROP_TAG(MPNCVtkAddTemperatures);
-NEW_PROP_TAG(MPNCVtkAddEnthalpies);
-NEW_PROP_TAG(MPNCVtkAddInternalEnergies);
-
-NEW_PROP_TAG(MPNCVtkAddxEquil);
-
-NEW_PROP_TAG(MPNCVtkAddReynolds);
-NEW_PROP_TAG(MPNCVtkAddPrandtl);
-NEW_PROP_TAG(MPNCVtkAddNusselt);
-NEW_PROP_TAG(MPNCVtkAddInterfacialArea);
+NEW_PROP_TAG(VtkAddPorosity);
+NEW_PROP_TAG(VtkAddBoundaryTypes);
+NEW_PROP_TAG(VtkAddSaturations);
+NEW_PROP_TAG(VtkAddPressures);
+NEW_PROP_TAG(VtkAddVarPressures);
+NEW_PROP_TAG(VtkAddVelocities);
+NEW_PROP_TAG(VtkAddDensities);
+NEW_PROP_TAG(VtkAddMobilities);
+NEW_PROP_TAG(VtkAddAverageMolarMass);
+NEW_PROP_TAG(VtkAddMassFractions);
+NEW_PROP_TAG(VtkAddMoleFractions);
+NEW_PROP_TAG(VtkAddMolarities);
+NEW_PROP_TAG(VtkAddFugacities);
+NEW_PROP_TAG(VtkAddFugacityCoefficients);
+NEW_PROP_TAG(VtkAddTemperatures);
+NEW_PROP_TAG(VtkAddEnthalpies);
+NEW_PROP_TAG(VtkAddInternalEnergies);
+
+NEW_PROP_TAG(VtkAddxEquil);
+
+NEW_PROP_TAG(VtkAddReynolds);
+NEW_PROP_TAG(VtkAddPrandtl);
+NEW_PROP_TAG(VtkAddNusselt);
+NEW_PROP_TAG(VtkAddInterfacialArea);
+
+NEW_PROP_TAG(MPNCVtkAddPorosity);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddBoundaryTypes);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddSaturations);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddPressures);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddVarPressures);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddVelocities);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddDensities);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddMobilities);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddAverageMolarMass);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddMassFractions);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddMoleFractions);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddMolarities);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddFugacities);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddFugacityCoefficients);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddTemperatures);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddEnthalpies);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddInternalEnergies);//DEPRECATED
+
+NEW_PROP_TAG(MPNCVtkAddxEquil);//DEPRECATED
+
+NEW_PROP_TAG(MPNCVtkAddReynolds);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddPrandtl);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddNusselt);//DEPRECATED
+NEW_PROP_TAG(MPNCVtkAddInterfacialArea);//DEPRECATED
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
NEW_PROP_TAG(SpatialParameters); //!< DEPRECATED The type of the spatial parameters
@@ -113,12 +138,15 @@ NEW_PROP_TAG(EnableKinetic);
NEW_PROP_TAG(EnableKineticEnergy);
//! Enable gravity?
-NEW_PROP_TAG(EnableGravity);
+NEW_PROP_TAG(ProblemEnableGravity);
+NEW_PROP_TAG(EnableGravity);//DEPRECATED
//! Use the smooth upwinding method?
-NEW_PROP_TAG(EnableSmoothUpwinding);
+NEW_PROP_TAG(ImplicitEnableSmoothUpwinding);
+NEW_PROP_TAG(EnableSmoothUpwinding);//DEPRECATED
-NEW_PROP_TAG(MassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations
+NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED The value of the weight of the upwind direction in the mass conservation equations
+NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations
NEW_PROP_TAG(MobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
//! Chop the Newton update at the beginning of the non-linear solver?
diff --git a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
index c43304e8ff..76f22e6803 100644
--- a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
+++ b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
@@ -150,7 +150,8 @@ SET_BOOL_PROP(BoxMPNC, EnableKinetic, false);
SET_BOOL_PROP(BoxMPNC, EnableKineticEnergy, false);
//! enable smooth upwinding by default
-SET_BOOL_PROP(BoxMPNC, EnableSmoothUpwinding, false);
+SET_BOOL_PROP(BoxMPNC, ImplicitEnableSmoothUpwinding, GET_PROP_VALUE(TypeTag, EnableSmoothUpwinding));
+SET_BOOL_PROP(BoxMPNC, EnableSmoothUpwinding, false);//DEPRECATED
//! the VolumeVariables property
SET_TYPE_PROP(BoxMPNC, VolumeVariables, MPNCVolumeVariables<TypeTag>);
@@ -168,7 +169,8 @@ SET_PROP(BoxMPNC, Indices)
};
//! the upwind weight for the mass conservation equations.
-SET_SCALAR_PROP(BoxMPNC, MassUpwindWeight, 1.0);
+SET_SCALAR_PROP(BoxMPNC, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight));
+SET_SCALAR_PROP(BoxMPNC, MassUpwindWeight, 1.0);//DEPRECATED
//! weight for the upwind mobility in the velocity calculation
SET_SCALAR_PROP(BoxMPNC, MobilityUpwindWeight, 1.0);
@@ -227,28 +229,54 @@ SET_PROP(BoxMPNC, FluidState){
SET_BOOL_PROP(BoxMPNC, VelocityAveragingInModel, false);
//! Specify what to add to the VTK output by default
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddPorosity, true);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddBoundaryTypes, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddSaturations, true);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddPressures, true);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddVarPressures, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddVelocities, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddDensities, true);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddMobilities, true);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddAverageMolarMass, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddMassFractions, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddMoleFractions, true);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddMolarities, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddFugacities, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddFugacityCoefficients, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddTemperatures, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddEnthalpies, true);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddInternalEnergies, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddReynolds, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddPrandtl, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddNusselt, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddInterfacialArea, false);
-SET_BOOL_PROP(BoxMPNC, MPNCVtkAddxEquil, false);
+SET_BOOL_PROP(BoxMPNC, VtkAddPorosity, GET_PROP_VALUE(TypeTag, MPNCVtkAddPorosity));
+SET_BOOL_PROP(BoxMPNC, VtkAddBoundaryTypes, GET_PROP_VALUE(TypeTag, MPNCVtkAddBoundaryTypes));
+SET_BOOL_PROP(BoxMPNC, VtkAddSaturations, GET_PROP_VALUE(TypeTag, MPNCVtkAddSaturations));
+SET_BOOL_PROP(BoxMPNC, VtkAddPressures, GET_PROP_VALUE(TypeTag, MPNCVtkAddPressures));
+SET_BOOL_PROP(BoxMPNC, VtkAddVarPressures, GET_PROP_VALUE(TypeTag, MPNCVtkAddVarPressures));
+SET_BOOL_PROP(BoxMPNC, VtkAddVelocities, GET_PROP_VALUE(TypeTag, MPNCVtkAddVelocities));
+SET_BOOL_PROP(BoxMPNC, VtkAddDensities, GET_PROP_VALUE(TypeTag, MPNCVtkAddDensities));
+SET_BOOL_PROP(BoxMPNC, VtkAddMobilities, GET_PROP_VALUE(TypeTag, MPNCVtkAddMobilities));
+SET_BOOL_PROP(BoxMPNC, VtkAddAverageMolarMass, GET_PROP_VALUE(TypeTag, MPNCVtkAddAverageMolarMass));
+SET_BOOL_PROP(BoxMPNC, VtkAddMassFractions, GET_PROP_VALUE(TypeTag, MPNCVtkAddMassFractions));
+SET_BOOL_PROP(BoxMPNC, VtkAddMoleFractions, GET_PROP_VALUE(TypeTag, MPNCVtkAddMoleFractions));
+SET_BOOL_PROP(BoxMPNC, VtkAddMolarities, GET_PROP_VALUE(TypeTag, MPNCVtkAddMolarities));
+SET_BOOL_PROP(BoxMPNC, VtkAddFugacities, GET_PROP_VALUE(TypeTag, MPNCVtkAddFugacities));
+SET_BOOL_PROP(BoxMPNC, VtkAddFugacityCoefficients, GET_PROP_VALUE(TypeTag, MPNCVtkAddFugacityCoefficients));
+SET_BOOL_PROP(BoxMPNC, VtkAddTemperatures, GET_PROP_VALUE(TypeTag, MPNCVtkAddTemperatures));
+SET_BOOL_PROP(BoxMPNC, VtkAddEnthalpies, GET_PROP_VALUE(TypeTag, MPNCVtkAddEnthalpies));
+SET_BOOL_PROP(BoxMPNC, VtkAddInternalEnergies, GET_PROP_VALUE(TypeTag, MPNCVtkAddInternalEnergies));
+SET_BOOL_PROP(BoxMPNC, VtkAddReynolds, GET_PROP_VALUE(TypeTag, MPNCVtkAddReynolds));
+SET_BOOL_PROP(BoxMPNC, VtkAddPrandtl, GET_PROP_VALUE(TypeTag, MPNCVtkAddPrandtl));
+SET_BOOL_PROP(BoxMPNC, VtkAddNusselt, GET_PROP_VALUE(TypeTag, MPNCVtkAddNusselt));
+SET_BOOL_PROP(BoxMPNC, VtkAddInterfacialArea, GET_PROP_VALUE(TypeTag, MPNCVtkAddInterfacialArea));
+SET_BOOL_PROP(BoxMPNC, VtkAddxEquil, GET_PROP_VALUE(TypeTag, MPNCVtkAddxEquil));
+
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddPorosity, true);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddBoundaryTypes, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddSaturations, true);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddPressures, true);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddVarPressures, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddVelocities, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddDensities, true);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddMobilities, true);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddAverageMolarMass, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddMassFractions, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddMoleFractions, true);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddMolarities, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddFugacities, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddFugacityCoefficients, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddTemperatures, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddEnthalpies, true);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddInternalEnergies, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddReynolds, false);//DEPRECATED
+SET_BOOL_PROP(BoxMPNC, MPNCVtkAddPrandtl, false);//DEPRECATED
+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!
+SET_BOOL_PROP(BoxMPNC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
}
diff --git a/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh b/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
index b6acbd0d82..68a7f86b49 100644
--- a/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
+++ b/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
@@ -70,17 +70,17 @@ public:
MPNCVtkWriterCommon(const Problem &problem)
: ParentType(problem)
{
- porosityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddPorosity);
- boundaryTypesOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddBoundaryTypes);
- saturationOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddSaturations);
- pressureOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddPressures);
- velocityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddVelocities);
- densityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddDensities);
- mobilityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddMobilities);
- averageMolarMassOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddAverageMolarMass);
- massFracOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddMassFractions);
- moleFracOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddMoleFractions);
- molarityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, MPNC, VtkAddMolarities);
+ porosityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddPorosity);
+ boundaryTypesOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddBoundaryTypes);
+ saturationOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddSaturations);
+ pressureOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddPressures);
+ velocityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddVelocities);
+ densityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddDensities);
+ mobilityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddMobilities);
+ averageMolarMassOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddAverageMolarMass);
+ massFracOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddMassFractions);
+ moleFracOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddMoleFractions);
+ molarityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddMolarities);
}
/*!
diff --git a/dumux/boxmodels/richards/richardslocalresidual.hh b/dumux/boxmodels/richards/richardslocalresidual.hh
index 0ee5ac2551..f2359cfa3c 100644
--- a/dumux/boxmodels/richards/richardslocalresidual.hh
+++ b/dumux/boxmodels/richards/richardslocalresidual.hh
@@ -67,7 +67,7 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- massUpwindWeight_ = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
+ massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
};
/*!
diff --git a/dumux/boxmodels/richards/richardsnewtoncontroller.hh b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
index 5bf5ed5467..f16ad33486 100644
--- a/dumux/boxmodels/richards/richardsnewtoncontroller.hh
+++ b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
@@ -83,7 +83,7 @@ public:
{
ParentType::newtonUpdate(uCurrentIter, uLastIter, deltaU);
- if (!GET_PARAM(TypeTag, bool, NewtonUseLineSearch))
+ if (!GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, UseLineSearch))
{
// do not clamp anything after 5 iterations
if (this->numSteps_ > 4)
diff --git a/dumux/boxmodels/richards/richardsproperties.hh b/dumux/boxmodels/richards/richardsproperties.hh
index 3fcd99389b..130c52dd5e 100644
--- a/dumux/boxmodels/richards/richardsproperties.hh
+++ b/dumux/boxmodels/richards/richardsproperties.hh
@@ -61,8 +61,10 @@ NEW_PROP_TAG(MaterialLawParams); //!< The type of the parameter object for the m
NEW_PROP_TAG(FluidSystem); //!< The fluid system to be used for the Richards model
NEW_PROP_TAG(WettingPhase); //!< Fluid which represents the wetting phase
NEW_PROP_TAG(NonwettingPhase); //!< Fluid which represents the non-wetting phase
-NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(MassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations
+NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
+NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations
+NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED The value of the weight of the upwind direction in the mass conservation equations
// \}
}
diff --git a/dumux/boxmodels/richards/richardspropertydefaults.hh b/dumux/boxmodels/richards/richardspropertydefaults.hh
index cfd35a0e94..d74afad16b 100644
--- a/dumux/boxmodels/richards/richardspropertydefaults.hh
+++ b/dumux/boxmodels/richards/richardspropertydefaults.hh
@@ -73,6 +73,7 @@ SET_TYPE_PROP(BoxRichards, FluxVariables, BoxDarcyFluxVariables<TypeTag>);
SET_TYPE_PROP(BoxRichards, NewtonController, RichardsNewtonController<TypeTag>);
//! The upwind weight for the mass conservation equations
+SET_SCALAR_PROP(BoxRichards, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight));
SET_SCALAR_PROP(BoxRichards, MassUpwindWeight, 1.0);
//! weight for the upwind mobility in the velocity calculation
@@ -154,6 +155,9 @@ public:
NonwettingPhase> type;
};
+//Has to be removed if DEPRECATED EnableGravity is removed!
+SET_BOOL_PROP(BoxRichards, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
+
// \}
}
diff --git a/dumux/common/basicproperties.hh b/dumux/common/basicproperties.hh
index 3342ac6779..a24b7140fa 100644
--- a/dumux/common/basicproperties.hh
+++ b/dumux/common/basicproperties.hh
@@ -77,6 +77,9 @@ NEW_PROP_TAG(ModelParameterGroup);
//! Property which provides a GridCreator (manages grids)
NEW_PROP_TAG(GridCreator);
+//! Property to define the output level
+NEW_PROP_TAG(VtkOutputLevel);
+
///////////////////////////////////
// Default values for properties:
//
@@ -109,6 +112,18 @@ SET_PROP(NumericModel, ParameterTree)
static Dune::ParameterTree obj_;
return obj_;
};
+
+ static Dune::ParameterTree &deprecatedRunTimeParams()
+ {
+ static Dune::ParameterTree obj_;
+ return obj_;
+ };
+
+ static Dune::ParameterTree &unusedNewRunTimeParams()
+ {
+ static Dune::ParameterTree obj_;
+ return obj_;
+ };
};
//! use the global group as default for the model's parameter group
@@ -117,6 +132,9 @@ SET_STRING_PROP(NumericModel, ModelParameterGroup, "");
//! Use the DgfGridCreator by default
SET_TYPE_PROP(NumericModel, GridCreator, Dumux::DgfGridCreator<TypeTag>);
+//! Set default output level to 0 -> only primary variables are added to output
+SET_INT_PROP(NumericModel, VtkOutputLevel, 0);
+
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/common/cubegridcreator.hh b/dumux/common/cubegridcreator.hh
index 3ee6b074dc..93c5dd6cfd 100644
--- a/dumux/common/cubegridcreator.hh
+++ b/dumux/common/cubegridcreator.hh
@@ -75,19 +75,19 @@ public:
Dune::FieldVector<Scalar, dim> lowerLeft;
lowerLeft[0] = 0.0;
- upperRight[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightX);
- cellRes[0] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsX);
+ upperRight[0] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, UpperRightX);
+ cellRes[0] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, NumberOfCellsX);
if (dim > 1)
{
lowerLeft[1] = 0.0;
- upperRight[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightY);
- cellRes[1] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsY);
+ upperRight[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, UpperRightY);
+ cellRes[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, NumberOfCellsY);
}
if (dim > 2)
{
lowerLeft[2] = 0.0;
- upperRight[2] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightZ);
- cellRes[2] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsZ);
+ upperRight[2] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, UpperRightZ);
+ cellRes[2] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, NumberOfCellsZ);
}
cubeGrid_ = Dune::StructuredGridFactory<Grid>::createCubeGrid(lowerLeft, upperRight, cellRes);
diff --git a/dumux/common/dgfgridcreator.hh b/dumux/common/dgfgridcreator.hh
index 4b679d121a..5e24883573 100644
--- a/dumux/common/dgfgridcreator.hh
+++ b/dumux/common/dgfgridcreator.hh
@@ -54,7 +54,7 @@ public:
*/
static void makeGrid()
{
- const std::string dgfFileName = GET_RUNTIME_PARAM(TypeTag, std::string, gridFile);
+ const std::string dgfFileName = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Grid, File);
gridPtr_ = GridPointer(dgfFileName.c_str(), Dune::MPIHelper::getCommunicator());
};
diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh
index 3cbfc1e096..028288c995 100644
--- a/dumux/common/parameters.hh
+++ b/dumux/common/parameters.hh
@@ -121,6 +121,7 @@ void findUnusedKeys_(std::list<std::string> &unusedParams,
{
typedef typename GET_PROP(TypeTag, ParameterTree) Params;
const Dune::ParameterTree &rt = Params::runTimeParams();
+ const Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
// loop over all keys of the current tree
const Dune::ParameterTree::KeyVector &keys =
@@ -131,6 +132,8 @@ void findUnusedKeys_(std::list<std::string> &unusedParams,
// check whether the key was accessed
if (rt.hasKey(canonicalName))
continue;
+ else if (drt.hasKey(canonicalName))
+ continue;
unusedParams.push_back(canonicalName);
}
@@ -147,6 +150,25 @@ void findUnusedKeys_(std::list<std::string> &unusedParams,
}
+template <class TypeTag>
+bool hasDeprecatedKeys_(const Dune::ParameterTree &tree)
+{
+ typedef typename GET_PROP(TypeTag, ParameterTree) Params;
+ const Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
+
+ // loop over all keys of the current tree
+ const Dune::ParameterTree::KeyVector &keys =
+ tree.getValueKeys();
+ for (unsigned int i = 0; i < keys.size(); ++i) {
+ std::string canonicalName = keys[i];
+
+ // check whether the key was accessed
+ if (drt.hasKey(canonicalName))
+ return true;
+ }
+ return false;
+}
+
/*!
* \ingroup Parameter
* \brief Print the run- and compile-time parameters.
@@ -159,11 +181,24 @@ void print(std::ostream &os = std::cout)
const Dune::ParameterTree &tree = Params::tree();
const Dune::ParameterTree &rt = Params::runTimeParams();
const Dune::ParameterTree &ct = Params::compileTimeParams();
+ const Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
+ const Dune::ParameterTree &unrt = Params::unusedNewRunTimeParams();
os << "###############################\n";
os << "# Run-time specified parameters:\n";
os << "###############################\n";
rt.report(os);
+
+ if (hasDeprecatedKeys_<TypeTag>(tree))
+ {
+ os << "###############################\n";
+ os << "# DEPRECATED Run-time specified parameters:\n";
+ os << "###############################\n";
+ drt.report(os);
+ os << "# Replace by:\n";
+ unrt.report(os);
+ }
+
os << "###############################\n";
os << "# Compile-time specified parameters:\n";
os << "###############################\n";
@@ -342,17 +377,31 @@ private:
canonicalName.insert(0, modelParamGroup);
}
+ static ParamType value;
// retrieve actual parameter from the parameter tree
ParamType defaultValue = GET_PROP_VALUE_(TypeTag, PropTag);
- static ParamType value = Params::tree().template get<ParamType>(canonicalName, defaultValue);
+ if (!Params::tree().hasKey(canonicalName) && Params::tree().hasKey(paramName))//functionality to catch deprecated params
+ {
+ value = Params::tree().template get<ParamType>(paramName, defaultValue);
+// std::cout<<"\nWarning: Using the parameter: "<<paramName<<" without group name: "<<groupName<<" is deprecated!"<<"\n\n";
+ }
+ else
+ value = Params::tree().template get<ParamType>(canonicalName, defaultValue);
// remember whether the parameter was taken from the parameter
// tree or the default from the property system was taken.
Dune::ParameterTree &rt = Params::runTimeParams();
Dune::ParameterTree &ct = Params::compileTimeParams();
+ Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
+ Dune::ParameterTree &unrt = Params::unusedNewRunTimeParams();
if (Params::tree().hasKey(canonicalName)) {
rt[canonicalName] = Params::tree()[canonicalName];
}
+ else if (Params::tree().hasKey(paramName))//functionality to catch deprecated params
+ {
+ drt[paramName] = Params::tree()[paramName];
+ unrt[canonicalName] = Params::tree()[paramName];
+ }
else {
std::string s;
std::ostringstream oss(s);
@@ -409,27 +458,49 @@ private:
// cache parameters using a hash_map (Dune::Parameter tree is slow!)
typedef std::tr1::unordered_map<std::string, ParamType> ParamCache;
static ParamCache paramCache;
- const typename ParamCache::iterator &it = paramCache.find(canonicalName);
+ typename ParamCache::iterator it = paramCache.find(canonicalName);
if (it != paramCache.end())
return it->second;
+ it = paramCache.find(paramName);
+ if (it != paramCache.end())
+ return it->second;
+
// retrieve actual parameter from the parameter tree
- if (!Params::tree().hasKey(canonicalName)) {
+ if (!Params::tree().hasKey(canonicalName) && !Params::tree().hasKey(paramName)) {
DUNE_THROW(Dumux::ParameterException,
"Mandatory parameter '" << canonicalName
<< "' was not specified");
}
// update the cache
- ParamType value = Params::tree().template get<ParamType>(canonicalName);
- paramCache[canonicalName] = value;
+ ParamType value;
+ if (!Params::tree().hasKey(canonicalName) && Params::tree().hasKey(paramName))//functionality to catch deprecated params
+ {
+ value = Params::tree().template get<ParamType>(paramName);
+ paramCache[paramName] = value;
- // remember whether the parameter was taken from the parameter
- // tree or the default from the property system was taken.
- Dune::ParameterTree &rt = Params::runTimeParams();
- rt[canonicalName] = Params::tree()[canonicalName];
+ // remember whether the parameter was taken from the parameter
+ // tree or the default from the property system was taken.
+ Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
+ Dune::ParameterTree &unrt = Params::unusedNewRunTimeParams();
- return paramCache[canonicalName];
+ drt[paramName] = Params::tree()[paramName];
+ unrt[canonicalName] = Params::tree()[paramName];
+ return paramCache[paramName];
+ }
+ else
+ {
+ value = Params::tree().template get<ParamType>(canonicalName);
+ paramCache[canonicalName] = value;
+
+ // remember whether the parameter was taken from the parameter
+ // tree or the default from the property system was taken.
+ Dune::ParameterTree &rt = Params::runTimeParams();
+
+ rt[canonicalName] = Params::tree()[canonicalName];
+ return paramCache[canonicalName];
+ }
}
};
diff --git a/dumux/common/simplexgridcreator.hh b/dumux/common/simplexgridcreator.hh
index 7490a6d705..36d8e76a44 100644
--- a/dumux/common/simplexgridcreator.hh
+++ b/dumux/common/simplexgridcreator.hh
@@ -66,19 +66,19 @@ public:
Dune::FieldVector<Scalar, dim> lowerLeft;
lowerLeft[0] = 0.0;
- upperRight[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightX);
- cellRes[0] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsX);
+ upperRight[0] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, UpperRightX);
+ cellRes[0] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, NumberOfCellsX);
if (dim > 1)
{
lowerLeft[1] = 0.0;
- upperRight[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightY);
- cellRes[1] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsY);
+ upperRight[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, UpperRightY);
+ cellRes[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, NumberOfCellsY);
}
if (dim > 2)
{
lowerLeft[2] = 0.0;
- upperRight[2] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightZ);
- cellRes[2] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsZ);
+ upperRight[2] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, UpperRightZ);
+ cellRes[2] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, NumberOfCellsZ);
}
simplexGrid_ = Dune::StructuredGridFactory<Grid>::createSimplexGrid(lowerLeft, upperRight, cellRes);
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index cca52857b2..c6338044ce 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -185,11 +185,11 @@ std::string readOptions_(int argc, char **argv, Dune::ParameterTree ¶mTree)
std::string usageTextBlock()
{
return "Options have to be specified with this syntax: \n"
- "\t-tEnd ENDTIME The time of the end of the simulation [s]\n"
+ "\t-TEnd ENDTIME The time of the end of the simulation [s]\n"
"Alternativ supported syntax:\n"
- "\t--t-end=ENDTIME The time of the end of the simulation [s]\n"
+ "\t--T-end=ENDTIME The time of the end of the simulation [s]\n"
"\n"
- "If -parameterFile is specified parameters can also be defined there. In this case,\n"
+ "If -ParameterFile is specified parameters can also be defined there. In this case,\n"
"camel case is used for the parameters (e.g.: tEnd=100). \n"
"\n"
"Parameters specified on the command line have priority over those in the parameter file.\n"
@@ -200,8 +200,8 @@ std::string usageTextBlock()
"\t the simulation [default: true]\n"
"\t-PrintProperties [true|false] Print the compile-time parameters _before_ \n"
"\t the simulation [default: false]\n"
- "\t-parameterFile FILENAME File with parameter definitions\n"
- "\t-restart RESTARTTIME Restart simulation from a restart file\n"
+ "\t-ParameterFile FILENAME File with parameter definitions\n"
+ "\t-Restart RESTARTTIME Restart simulation from a restart file\n"
"\n"
"For the case of no arguments given, the input parameter file is expected to be named './<programname>.input' \n"
"\n";
@@ -290,7 +290,7 @@ int start_(int argc,
inputFileName += ".input";
}
else
- inputFileName = GET_RUNTIME_PARAM(TypeTag, std::string, parameterFile); // otherwise we read from the command line
+ inputFileName = GET_RUNTIME_PARAM(TypeTag, std::string, ParameterFile); // otherwise we read from the command line
std::ifstream parameterFile;
@@ -312,7 +312,7 @@ int start_(int argc,
bool printProps = false;
if (ParameterTree::tree().hasKey("PrintProperties"))
- printProps = GET_RUNTIME_PARAM(TypeTag, bool, PrintProperties);
+ printProps = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, TimeManager, PrintProperties);
if (printProps && mpiHelper.rank() == 0) {
Dumux::Properties::print<TypeTag>();
@@ -323,13 +323,13 @@ int start_(int argc,
Scalar restartTime = 0;
if (ParameterTree::tree().hasKey("restart")) {
restart = true;
- restartTime = GET_RUNTIME_PARAM(TypeTag, Scalar, restart);
+ restartTime = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, Restart);
}
// read the PrintParams parameter
bool printParams = true;
if (ParameterTree::tree().hasKey("PrintParameters"))
- printParams = GET_RUNTIME_PARAM(TypeTag, bool, PrintParameters);
+ printParams = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, TimeManager, PrintParameters);
// try to create a grid (from the given grid file)
try { GridCreator::makeGrid(); }
@@ -345,17 +345,17 @@ int start_(int argc,
double tEnd;
double dt;
- try { tEnd = GET_RUNTIME_PARAM(TypeTag, Scalar, tEnd); }
+ try { tEnd = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, TEnd); }
catch (...) {
- std::string usageMessage = "\n\t -> Mandatory parameter '--t-end' not specified! <- \n\n\n\n";
+ std::string usageMessage = "\n\t -> Mandatory parameter '--T-end' not specified! <- \n\n\n\n";
usageMessage += usageTextBlock();
usage(argv[0], usageMessage);
throw;
}
- try { dt = GET_RUNTIME_PARAM(TypeTag, Scalar, dtInitial); }
+ try { dt = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, DtInitial); }
catch (...) {
- std::string usageMessage = "\n\t -> Mandatory parameter '--dt-initial' not specified! <- \n\n\n\n";
+ std::string usageMessage = "\n\t -> Mandatory parameter '--Dt-initial' not specified! <- \n\n\n\n";
usageMessage += usageTextBlock();
usage(argv[0], usageMessage);
throw;
diff --git a/dumux/decoupled/1p/1pproperties.hh b/dumux/decoupled/1p/1pproperties.hh
index 5b95ee51ce..384ab6c358 100644
--- a/dumux/decoupled/1p/1pproperties.hh
+++ b/dumux/decoupled/1p/1pproperties.hh
@@ -64,7 +64,8 @@ NEW_TYPE_TAG(DecoupledOneP, INHERITS_FROM(DecoupledModel));
NEW_PROP_TAG( SpatialParameters ); //!< The type of the spatial parameters object
NEW_PROP_TAG( SpatialParams ); //!< The type of the spatial parameters object
-NEW_PROP_TAG( EnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG( ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG( EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
NEW_PROP_TAG( Fluid ); //!< The fluid for one-phase models
NEW_PROP_TAG( Indices ); //!< Set of indices for the one-phase model
NEW_PROP_TAG( CellData ); //!< The cell data storage class
@@ -104,6 +105,9 @@ SET_TYPE_PROP(DecoupledOneP, CellData, CellData1P<TypeTag>);
//! DEPRECATED SpatialParameters property
SET_TYPE_PROP(DecoupledOneP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
+
+//Has to be removed if DEPRECATED EnableGravity is removed!
+SET_BOOL_PROP(DecoupledOneP, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
}
}
#endif
diff --git a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
index 213be28f98..55d470d098 100644
--- a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
+++ b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
@@ -85,7 +85,7 @@ public:
spatialParams_ = new SpatialParams(gridView);
newSpatialParams_ = true;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
}
/*!
@@ -100,7 +100,7 @@ public:
{
newSpatialParams_ = false;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
}
/*!
@@ -114,7 +114,7 @@ public:
spatialParams_ = new SpatialParams(gridView);
newSpatialParams_ = true;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
}
/*!
@@ -128,7 +128,7 @@ public:
{
newSpatialParams_ = false;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
}
diff --git a/dumux/decoupled/2p/2pproperties.hh b/dumux/decoupled/2p/2pproperties.hh
index edfe064a2b..b2e9916779 100644
--- a/dumux/decoupled/2p/2pproperties.hh
+++ b/dumux/decoupled/2p/2pproperties.hh
@@ -66,7 +66,8 @@ NEW_PROP_TAG( SpatialParams ); //!< The type of the spatial parameters object
NEW_PROP_TAG( SpatialParameters ); //!< DEPRECATED The old type of the spatial parameters object
NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatial parameters)
NEW_PROP_TAG(MaterialLawParams); //!< The material law parameters (extracted from the spatial parameters)
-NEW_PROP_TAG( EnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG( ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG( EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
NEW_PROP_TAG( Formulation); //!< The formulation of the model
NEW_PROP_TAG( PressureFormulation); //!< The formulation of the pressure model
NEW_PROP_TAG( SaturationFormulation); //!< The formulation of the saturation model
@@ -82,9 +83,14 @@ NEW_PROP_TAG( FluidState );//!< Defines the fluid state
NEW_PROP_TAG( TwoPIndices );
//! \endcond
-NEW_PROP_TAG( ErrorTermFactor ); //!< Scaling factor for the error term (term to damp unphysical saturation overshoots via pressure correction)
-NEW_PROP_TAG( ErrorTermLowerBound );//!< Lower threshold used for the error term evaluation (term to damp unphysical saturation overshoots via pressure correction)
-NEW_PROP_TAG( ErrorTermUpperBound );//!< Upper threshold used for the error term evaluation (term to damp unphysical saturation overshoots via pressure correction)
+NEW_PROP_TAG( ImpetErrorTermFactor ); //!< Scaling factor for the error term (term to damp unphysical saturation overshoots via pressure correction)
+NEW_PROP_TAG( ErrorTermFactor ); //!< DEPRECATED Scaling factor for the error term (term to damp unphysical saturation overshoots via pressure correction)
+
+NEW_PROP_TAG( ImpetErrorTermLowerBound );//!< Lower threshold used for the error term evaluation (term to damp unphysical saturation overshoots via pressure correction)
+NEW_PROP_TAG( ErrorTermLowerBound );//!< DEPRECATED Lower threshold used for the error term evaluation (term to damp unphysical saturation overshoots via pressure correction)
+
+NEW_PROP_TAG( ImpetErrorTermUpperBound );//!< Upper threshold used for the error term evaluation (term to damp unphysical saturation overshoots via pressure correction)
+NEW_PROP_TAG( ErrorTermUpperBound );//!< DEPRECATED Upper threshold used for the error term evaluation (term to damp unphysical saturation overshoots via pressure correction)
}
}
@@ -179,12 +185,17 @@ public:
};
//! Default error term factor
-SET_SCALAR_PROP(DecoupledTwoP, ErrorTermFactor, 0.5);
+SET_SCALAR_PROP(DecoupledTwoP, ImpetErrorTermFactor, GET_PROP_VALUE(TypeTag, ErrorTermFactor));
+SET_SCALAR_PROP(DecoupledTwoP, ErrorTermFactor, 0.5);//DEPRECATED
//! Default lower threshold for evaluation of an error term
-SET_SCALAR_PROP(DecoupledTwoP, ErrorTermLowerBound, 0.1);
+SET_SCALAR_PROP(DecoupledTwoP, ImpetErrorTermLowerBound, GET_PROP_VALUE(TypeTag, ErrorTermLowerBound));
+SET_SCALAR_PROP(DecoupledTwoP, ErrorTermLowerBound, 0.1);//DEPRECATED
//! Default upper threshold for evaluation of an error term
-SET_SCALAR_PROP(DecoupledTwoP, ErrorTermUpperBound, 0.9);
+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!
+SET_BOOL_PROP(DecoupledTwoP, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
// \}
}
diff --git a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
index 37f3b85972..3ea5d7a4c6 100644
--- a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
+++ b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
@@ -85,7 +85,7 @@ public:
spatialParams_ = new SpatialParams(gridView);
newSpatialParams_ = true;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
}
/*!
@@ -100,7 +100,7 @@ public:
{
newSpatialParams_ = false;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
}
@@ -115,7 +115,7 @@ public:
spatialParams_ = new SpatialParams(gridView);
newSpatialParams_ = true;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
}
/*!
@@ -129,7 +129,7 @@ public:
{
newSpatialParams_ = false;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
}
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
index 09bee3c3f5..3feaa84025 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
@@ -397,9 +397,9 @@ public:
DUNE_THROW(Dune::NotImplemented, "Saturation type not supported!");
}
- ErrorTermFactor_ = GET_PARAM(TypeTag, Scalar, ErrorTermFactor);
- ErrorTermLowerBound_ = GET_PARAM(TypeTag, Scalar, ErrorTermLowerBound);
- ErrorTermUpperBound_ = GET_PARAM(TypeTag, Scalar, ErrorTermUpperBound);
+ ErrorTermFactor_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, ErrorTermFactor);
+ ErrorTermLowerBound_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, ErrorTermLowerBound);
+ ErrorTermUpperBound_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, ErrorTermUpperBound);
if (!compressibility_)
{
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
index fc96588f68..0d0a313742 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
@@ -193,8 +193,8 @@ public:
GridAdaptionIndicator2P (Problem& problem):
problem_(problem)
{
- refinetol_ = GET_PARAM(TypeTag, Scalar, RefineTolerance);
- coarsentol_ = GET_PARAM(TypeTag, Scalar, CoarsenTolerance);
+ refinetol_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, GridAdapt, RefineTolerance);
+ coarsentol_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, GridAdapt, CoarsenTolerance);
}
private:
diff --git a/dumux/decoupled/2p/impes/impesproblem2p.hh b/dumux/decoupled/2p/impes/impesproblem2p.hh
index 5b2f7f02bb..9aa8e46e49 100644
--- a/dumux/decoupled/2p/impes/impesproblem2p.hh
+++ b/dumux/decoupled/2p/impes/impesproblem2p.hh
@@ -89,7 +89,7 @@ public:
spatialParams_ = new SpatialParams(gridView);
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = - 9.81;
}
/*!
@@ -105,7 +105,7 @@ public:
{
newSpatialParams_ = false;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = - 9.81;
}
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index b9b12e949c..985caf365c 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -348,7 +348,7 @@ public:
* \param problem A problem class object
*/
FVSaturation2P(Problem& problem) :
- ParentType(problem), problem_(problem), threshold_(1e-6), switchNormals_(GET_PARAM(TypeTag, bool, SwitchNormals))
+ ParentType(problem), problem_(problem), threshold_(1e-6), switchNormals_(GET_PARAM_FROM_GROUP(TypeTag, bool, Impet, SwitchNormals))
{
if (compressibility_ && velocityType_ == vt)
{
diff --git a/dumux/decoupled/2p/transport/transportproblem2p.hh b/dumux/decoupled/2p/transport/transportproblem2p.hh
index 9294b24113..acc2172327 100644
--- a/dumux/decoupled/2p/transport/transportproblem2p.hh
+++ b/dumux/decoupled/2p/transport/transportproblem2p.hh
@@ -101,13 +101,13 @@ public:
: ParentType(timeManager, gridView),
gravity_(0)
{
- cFLFactor_ = GET_PARAM(TypeTag, Scalar, CFLFactor);
+ cFLFactor_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, CFLFactor);
newSpatialParams_ = true;
spatialParams_ = new SpatialParams(gridView);
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = - 9.81;
}
@@ -122,12 +122,12 @@ public:
: ParentType(timeManager, gridView),
gravity_(0),spatialParams_(spatialParams)
{
- cFLFactor_ = GET_PARAM(TypeTag, Scalar, CFLFactor);
+ cFLFactor_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, CFLFactor);
newSpatialParams_ = false;
gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = - 9.81;
}
diff --git a/dumux/decoupled/2p2c/2p2cproperties.hh b/dumux/decoupled/2p2c/2p2cproperties.hh
index 1914812c37..14dcd5e3a2 100644
--- a/dumux/decoupled/2p2c/2p2cproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cproperties.hh
@@ -69,20 +69,26 @@ NEW_TYPE_TAG(DecoupledTwoPTwoC, INHERITS_FROM(Pressure, Transport, IMPET));
NEW_PROP_TAG( Indices );
NEW_PROP_TAG( SpatialParams ); //!< The type of the soil properties object
NEW_PROP_TAG( SpatialParameters ); //!< DEPRECATED The old type of the soil properties object
-NEW_PROP_TAG( EnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG( ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG( EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
NEW_PROP_TAG( PressureFormulation); //!< The formulation of the model
NEW_PROP_TAG( SaturationFormulation); //!< The formulation of the model
NEW_PROP_TAG( VelocityFormulation); //!< The formulation of the model
NEW_PROP_TAG( EnableCompressibility); //!< Returns whether compressibility is allowed
NEW_PROP_TAG( EnableCapillarity); //!< Returns whether capillarity is regarded
NEW_PROP_TAG( BoundaryMobility ); //!< Returns whether mobility or saturation is used for Dirichlet B.C.
-NEW_PROP_TAG( RestrictFluxInTransport ); //!< Restrict flux if direction reverses after pressure equation
-NEW_PROP_TAG( ErrorTermFactor ); //!< Damping factor \f$ \alpha \f$ in pressure equation
-NEW_PROP_TAG( ErrorTermLowerBound ); //!< Upper bound for regularized error damping
-NEW_PROP_TAG( ErrorTermUpperBound ); //!< Lower bound where error is not corrected
+NEW_PROP_TAG( ImpetRestrictFluxInTransport ); //!< Restrict flux if direction reverses after pressure equation
+NEW_PROP_TAG( RestrictFluxInTransport ); //!< DEPRECATED Restrict flux if direction reverses after pressure equation
+NEW_PROP_TAG( ImpetErrorTermFactor ); //!< Damping factor \f$ \alpha \f$ in pressure equation
+NEW_PROP_TAG( ErrorTermFactor ); //!< DEPRECATED Damping factor \f$ \alpha \f$ in pressure equation
+NEW_PROP_TAG( ImpetErrorTermLowerBound ); //!< Upper bound for regularized error damping
+NEW_PROP_TAG( ErrorTermLowerBound ); //!< DEPRECATED Upper bound for regularized error damping
+NEW_PROP_TAG( ImpetErrorTermUpperBound ); //!< Lower bound where error is not corrected
+NEW_PROP_TAG( ErrorTermUpperBound ); //!< DEPRECATED Lower bound where error is not corrected
NEW_PROP_TAG( FluidSystem ); //!< The fluid system
NEW_PROP_TAG( FluidState ); //!< The fluid state
-NEW_PROP_TAG( EnableVolumeIntegral ); //!< Enables volume integral in the pressure equation (volume balance formulation)
+NEW_PROP_TAG( ImpetEnableVolumeIntegral ); //!< Enables volume integral in the pressure equation (volume balance formulation)
+NEW_PROP_TAG( EnableVolumeIntegral ); //!< DEPRECATED Enables volume integral in the pressure equation (volume balance formulation)
NEW_PROP_TAG( EnableMultiPointFluxApproximationOnAdaptiveGrids ); //!< Two-point flux approximation (false) or mpfa (true)
NEW_PROP_TAG( EnableSecondHalfEdge ); //!< Uses second interaction volume for second half-edge in 2D
@@ -149,7 +155,8 @@ SET_PROP(DecoupledTwoPTwoC, TransportSolutionType)
SET_BOOL_PROP(DecoupledTwoPTwoC, EnableCompressibility, true); //!< Compositional models are very likely compressible
SET_BOOL_PROP(DecoupledTwoPTwoC, VisitFacesOnlyOnce, false); //!< Faces are regarded from both sides
SET_BOOL_PROP(DecoupledTwoPTwoC, EnableCapillarity, false); //!< Capillarity is enabled
-SET_BOOL_PROP(DecoupledTwoPTwoC, RestrictFluxInTransport, false); //!< Restrict (no upwind) flux in transport step if direction reverses after pressure equation
+SET_BOOL_PROP(DecoupledTwoPTwoC, ImpetRestrictFluxInTransport, GET_PROP_VALUE(TypeTag, RestrictFluxInTransport)); //!< Restrict (no upwind) flux in transport step if direction reverses after pressure equation
+SET_BOOL_PROP(DecoupledTwoPTwoC, RestrictFluxInTransport, false); //!< DEPRECATED Restrict (no upwind) flux in transport step if direction reverses after pressure equation
SET_PROP(DecoupledTwoPTwoC, BoundaryMobility) //!< Saturation scales flux on Dirichlet B.C.
{ static const int value = DecoupledTwoPTwoCIndices<TypeTag>::satDependent;};
@@ -162,11 +169,18 @@ SET_TYPE_PROP(DecoupledTwoPTwoC, FluidState, TwoPTwoCFluidState<TypeTag>);
SET_TYPE_PROP(DecoupledTwoPTwoC, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));//!< DEPRECATED SpatialParameters property
SET_BOOL_PROP(DecoupledTwoPTwoC, EnableMultiPointFluxApproximationOnAdaptiveGrids, false); //!< MPFA disabled on adaptive grids
-SET_BOOL_PROP(DecoupledTwoPTwoC, EnableVolumeIntegral, true); //!< Regard volume integral in pressure equation
+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
+SET_SCALAR_PROP(DecoupledTwoPTwoC, ImpetErrorTermFactor, GET_PROP_VALUE(TypeTag, ErrorTermFactor)); //!< Damping factor \f$ \alpha \f$ in pressure equation
SET_SCALAR_PROP(DecoupledTwoPTwoC, ErrorTermFactor, 0.5); //!< Damping factor \f$ \alpha \f$ in pressure equation
+SET_SCALAR_PROP(DecoupledTwoPTwoC, ImpetErrorTermLowerBound, GET_PROP_VALUE(TypeTag, ErrorTermLowerBound)); //!< Lower bound where error is not corrected
SET_SCALAR_PROP(DecoupledTwoPTwoC, ErrorTermLowerBound, 0.2); //!< Lower bound where error is not corrected
+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!
+SET_BOOL_PROP(DecoupledTwoPTwoC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
}
/*!
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index 42dc6cc27f..954bb72e15 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -169,11 +169,11 @@ public:
FVPressure2P2C(Problem& problem) : FVPressureCompositional<TypeTag>(problem),
problem_(problem)
{
- ErrorTermFactor_ = GET_PARAM(TypeTag, Scalar, ErrorTermFactor);
- ErrorTermLowerBound_ = GET_PARAM(TypeTag, Scalar, ErrorTermLowerBound);
- ErrorTermUpperBound_ = GET_PARAM(TypeTag, Scalar, ErrorTermUpperBound);
+ ErrorTermFactor_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, ErrorTermFactor);
+ ErrorTermLowerBound_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, ErrorTermLowerBound);
+ ErrorTermUpperBound_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, ErrorTermUpperBound);
- enableVolumeIntegral = GET_PARAM(TypeTag,bool, EnableVolumeIntegral);
+ enableVolumeIntegral = GET_PARAM_FROM_GROUP(TypeTag,bool, Impet, EnableVolumeIntegral);
maxError_=0.;
if (pressureType != pw && pressureType != pn)
diff --git a/dumux/decoupled/2p2c/fvpressurecompositional.hh b/dumux/decoupled/2p2c/fvpressurecompositional.hh
index cb6e65b0a7..4f24b9cea6 100644
--- a/dumux/decoupled/2p2c/fvpressurecompositional.hh
+++ b/dumux/decoupled/2p2c/fvpressurecompositional.hh
@@ -137,7 +137,7 @@ public:
// estimate then the size of the last time step
if(problem_.timeManager().time() == problem_.timeManager().episodeStartTime()
&& problem_.timeManager().episodeIndex() > 0)
- problem_.timeManager().setTimeStepSize(dt_estimate*GET_PARAM(TypeTag, Scalar, CFLFactor));
+ problem_.timeManager().setTimeStepSize(dt_estimate*GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, CFLFactor));
updateEstimate_ *= problem_.timeManager().timeStepSize();
@@ -301,9 +301,9 @@ public:
for (int i=0; i<GET_PROP_VALUE(TypeTag, NumPhases); i++)
updateEstimate_[i].resize(problem.gridView().size(0));
- ErrorTermFactor_ = GET_PARAM(TypeTag, Scalar, ErrorTermFactor);
- ErrorTermLowerBound_ = GET_PARAM(TypeTag, Scalar, ErrorTermLowerBound);
- ErrorTermUpperBound_ = GET_PARAM(TypeTag, Scalar, ErrorTermUpperBound);
+ ErrorTermFactor_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, ErrorTermFactor);
+ ErrorTermLowerBound_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, ErrorTermLowerBound);
+ ErrorTermUpperBound_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, ErrorTermUpperBound);
if (pressureType != pw && pressureType != pn)
{
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index 82f104f171..4d330c821a 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -195,7 +195,7 @@ public:
totalConcentration_[wCompIdx].resize(problem.gridView().size(0));
totalConcentration_[nCompIdx].resize(problem.gridView().size(0));
- restrictFluxInTransport_ = GET_PARAM(TypeTag,bool, RestrictFluxInTransport);
+ restrictFluxInTransport_ = GET_PARAM_FROM_GROUP(TypeTag,bool, Impet, RestrictFluxInTransport);
}
virtual ~FVTransport2P2C()
@@ -302,7 +302,7 @@ void FVTransport2P2C<TypeTag>::update(const Scalar t, Scalar& dt,
}
} // end grid traversal
if(impet)
- Dune::dinfo << "Timestep restricted by CellIdx " << restrictingCell << " leads to dt = "<<dt * GET_PARAM(TypeTag, Scalar, CFLFactor)<< std::endl;
+ Dune::dinfo << "Timestep restricted by CellIdx " << restrictingCell << " leads to dt = "<<dt * GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, CFLFactor)<< std::endl;
return;
}
/* Updates the transported quantity once an update is calculated.
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index 8defef74c5..51c7818a8a 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -203,7 +203,7 @@ void FVTransport2P2CMultiPhysics<TypeTag>::update(const Scalar t, Scalar& dt, Tr
}
} // end grid traversal
if(impet)
- Dune::dinfo << "Timestep restricted by CellIdx " << restrictingCell << " leads to dt = "<<dt * GET_PARAM(TypeTag, Scalar, CFLFactor)<< std::endl;
+ Dune::dinfo << "Timestep restricted by CellIdx " << restrictingCell << " leads to dt = "<<dt * GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, CFLFactor)<< std::endl;
return;
}
}
diff --git a/dumux/decoupled/common/fv/fvtransport.hh b/dumux/decoupled/common/fv/fvtransport.hh
index e316e4a217..80e5fffb09 100644
--- a/dumux/decoupled/common/fv/fvtransport.hh
+++ b/dumux/decoupled/common/fv/fvtransport.hh
@@ -178,7 +178,7 @@ public:
* \param problem A problem class object
*/
FVTransport(Problem& problem) :
- problem_(problem), switchNormals_(GET_PARAM(TypeTag, bool, SwitchNormals))
+ problem_(problem), switchNormals_(GET_PARAM_FROM_GROUP(TypeTag, bool, Impet, SwitchNormals))
{
evalCflFluxFunction_ = new EvalCflFluxFunction(problem);
}
diff --git a/dumux/decoupled/common/gridadapt.hh b/dumux/decoupled/common/gridadapt.hh
index 879e0b255e..2f45f9f531 100644
--- a/dumux/decoupled/common/gridadapt.hh
+++ b/dumux/decoupled/common/gridadapt.hh
@@ -69,9 +69,9 @@ public:
GridAdapt (Problem& problem)
: problem_(problem), adaptionIndicator_(problem), marked_(0), coarsened_(0)
{
- levelMin_ = GET_PARAM(TypeTag, int, MinLevel);
- levelMax_ = GET_PARAM(TypeTag, int, MaxLevel);
- adaptationInterval_ = GET_PARAM(TypeTag, int, AdaptionInterval);
+ levelMin_ = GET_PARAM_FROM_GROUP(TypeTag, int, GridAdapt, MinLevel);
+ levelMax_ = GET_PARAM_FROM_GROUP(TypeTag, int, GridAdapt, MaxLevel);
+ adaptationInterval_ = GET_PARAM_FROM_GROUP(TypeTag, int, GridAdapt, AdaptionInterval);
if (levelMin_ < 0)
Dune::dgrave << __FILE__<< ":" <<__LINE__
@@ -82,7 +82,7 @@ public:
{
adaptionIndicator_.init();
- if (!GET_PARAM(TypeTag, bool, EnableInitializationIndicator))
+ if (!GET_PARAM_FROM_GROUP(TypeTag, bool, GridAdapt, EnableInitializationIndicator))
return;
AdaptionInitializationIndicator adaptionInitIndicator(problem_, adaptionIndicator_);
diff --git a/dumux/decoupled/common/gridadaptinitializationindicator.hh b/dumux/decoupled/common/gridadaptinitializationindicator.hh
index 2e628575c1..d1c3f620a7 100644
--- a/dumux/decoupled/common/gridadaptinitializationindicator.hh
+++ b/dumux/decoupled/common/gridadaptinitializationindicator.hh
@@ -246,12 +246,12 @@ public:
GridAdaptInitializationIndicator(Problem& problem, AdaptionIndicator& adaptionIndicator):
problem_(problem), adaptionIndicator_(adaptionIndicator), maxLevel_(0)
{
- minAllowedLevel_ = GET_PARAM(TypeTag, int, MinLevel);
- maxAllowedLevel_ = GET_PARAM(TypeTag, int, MaxLevel);
- enableInitializationIndicator_ = GET_PARAM(TypeTag, bool, EnableInitializationIndicator);
- refineAtDirichletBC_ = GET_PARAM(TypeTag, bool, RefineAtDirichletBC);
- refineAtFluxBC_ = GET_PARAM(TypeTag, bool, RefineAtFluxBC);
- refineAtSource_ = GET_PARAM(TypeTag, bool, RefineAtSource);
+ minAllowedLevel_ = GET_PARAM_FROM_GROUP(TypeTag, int, GridAdapt, MinLevel);
+ maxAllowedLevel_ = GET_PARAM_FROM_GROUP(TypeTag, int, GridAdapt, MaxLevel);
+ enableInitializationIndicator_ = GET_PARAM_FROM_GROUP(TypeTag, bool, GridAdapt, EnableInitializationIndicator);
+ refineAtDirichletBC_ = GET_PARAM_FROM_GROUP(TypeTag, bool, GridAdapt, RefineAtDirichletBC);
+ refineAtFluxBC_ = GET_PARAM_FROM_GROUP(TypeTag, bool, GridAdapt, RefineAtFluxBC);
+ refineAtSource_ = GET_PARAM_FROM_GROUP(TypeTag, bool, GridAdapt, RefineAtSource);
}
private:
diff --git a/dumux/decoupled/common/gridadaptinitializationindicatordefault.hh b/dumux/decoupled/common/gridadaptinitializationindicatordefault.hh
index d71ee59eec..3bf4f4efc5 100644
--- a/dumux/decoupled/common/gridadaptinitializationindicatordefault.hh
+++ b/dumux/decoupled/common/gridadaptinitializationindicatordefault.hh
@@ -101,7 +101,7 @@ public:
*/
GridAdaptInitializationIndicatorDefault(Problem& problem, AdaptionIndicator& adaptionIndicator)
{
- maxLevel_ = GET_PARAM(TypeTag, int, MaxLevel);
+ maxLevel_ = GET_PARAM_FROM_GROUP(TypeTag, int, GridAdapt, MaxLevel);
}
private:
diff --git a/dumux/decoupled/common/gridadaptproperties.hh b/dumux/decoupled/common/gridadaptproperties.hh
index 5be556798b..43e6e51a28 100644
--- a/dumux/decoupled/common/gridadaptproperties.hh
+++ b/dumux/decoupled/common/gridadaptproperties.hh
@@ -49,56 +49,78 @@ NEW_PROP_TAG(AdaptionIndicator);
NEW_PROP_TAG(AdaptionInitializationIndicator);
//! Switch the use of initial grid adaption on/of
-NEW_PROP_TAG(EnableInitializationIndicator);
+NEW_PROP_TAG(GridAdaptEnableInitializationIndicator);
+NEW_PROP_TAG(EnableInitializationIndicator);//DEPRECATED
//! Mimimum allowed level
-NEW_PROP_TAG(MinLevel);
+NEW_PROP_TAG(GridAdaptMinLevel);
+NEW_PROP_TAG(MinLevel);//DEPRECATED
//! Maximum allowed level
-NEW_PROP_TAG(MaxLevel);
+NEW_PROP_TAG(GridAdaptMaxLevel);
+NEW_PROP_TAG(MaxLevel);//DEPRECATED
//! Tolerance for refinement
-NEW_PROP_TAG(RefineTolerance);
+NEW_PROP_TAG(GridAdaptRefineTolerance);
+NEW_PROP_TAG(RefineTolerance);//DEPRECATED
//! Tolerance for coarsening
-NEW_PROP_TAG(CoarsenTolerance);
+NEW_PROP_TAG(GridAdaptCoarsenTolerance);
+NEW_PROP_TAG(CoarsenTolerance);//DEPRECATED
//! Tolerance for refinement
-NEW_PROP_TAG(RefineThreshold);
+NEW_PROP_TAG(GridAdaptRefineThreshold);
+NEW_PROP_TAG(RefineThreshold);//DEPRECATED
//! Tolerance for coarsening
-NEW_PROP_TAG(CoarsenThreshold);
+NEW_PROP_TAG(GridAdaptCoarsenThreshold);
+NEW_PROP_TAG(CoarsenThreshold);//DEPRECATED
//! Time step interval for adaption
-NEW_PROP_TAG(AdaptionInterval);
+NEW_PROP_TAG(GridAdaptAdaptionInterval);
+NEW_PROP_TAG(AdaptionInterval);//DEPRECATED
//! Switch for refinement at dirichlet BC's -> not used by all indicators!
-NEW_PROP_TAG(RefineAtDirichletBC);
+NEW_PROP_TAG(GridAdaptRefineAtDirichletBC);
+NEW_PROP_TAG(RefineAtDirichletBC);//DEPRECATED
//! Switch for refinement at neumann BC's -> not used by all indicators!
-NEW_PROP_TAG(RefineAtFluxBC);
+NEW_PROP_TAG(GridAdaptRefineAtFluxBC);
+NEW_PROP_TAG(RefineAtFluxBC);//DEPRECATED
//! Switch for refinement at sources -> not used by all indicators!
-NEW_PROP_TAG(RefineAtSource);
+NEW_PROP_TAG(GridAdaptRefineAtSource);
+NEW_PROP_TAG(RefineAtSource);//DEPRECATED
//no adaptive grid
SET_BOOL_PROP(GridAdaptTypeTag, AdaptiveGrid, false);
//standard setting
-SET_INT_PROP(GridAdaptTypeTag, MinLevel, 0);
-SET_INT_PROP(GridAdaptTypeTag, MaxLevel, 1);
-SET_SCALAR_PROP(GridAdaptTypeTag, RefineTolerance, 0.05);
-SET_SCALAR_PROP(GridAdaptTypeTag, CoarsenTolerance, 0.001);
-SET_SCALAR_PROP(GridAdaptTypeTag, RefineThreshold, 0.0);
-SET_SCALAR_PROP(GridAdaptTypeTag, CoarsenThreshold, 0.0);
-SET_INT_PROP(GridAdaptTypeTag, AdaptionInterval, 1);
+SET_INT_PROP(GridAdaptTypeTag, GridAdaptMinLevel, GET_PROP_VALUE(TypeTag, MinLevel));
+SET_INT_PROP(GridAdaptTypeTag, MinLevel, 0);//DEPRECATED
+SET_INT_PROP(GridAdaptTypeTag, GridAdaptMaxLevel, GET_PROP_VALUE(TypeTag, MaxLevel));
+SET_INT_PROP(GridAdaptTypeTag, MaxLevel, 1);//DEPRECATED
+SET_SCALAR_PROP(GridAdaptTypeTag, GridAdaptRefineTolerance, GET_PROP_VALUE(TypeTag, RefineTolerance));
+SET_SCALAR_PROP(GridAdaptTypeTag, RefineTolerance, 0.05);//DEPRECATED
+SET_SCALAR_PROP(GridAdaptTypeTag, GridAdaptCoarsenTolerance, GET_PROP_VALUE(TypeTag, CoarsenTolerance));
+SET_SCALAR_PROP(GridAdaptTypeTag, CoarsenTolerance, 0.001);//DEPRECATED
+SET_SCALAR_PROP(GridAdaptTypeTag, GridAdaptRefineThreshold, GET_PROP_VALUE(TypeTag, RefineThreshold));
+SET_SCALAR_PROP(GridAdaptTypeTag, RefineThreshold, 0.0);//DEPRECATED
+SET_SCALAR_PROP(GridAdaptTypeTag, GridAdaptCoarsenThreshold, GET_PROP_VALUE(TypeTag, CoarsenThreshold));
+SET_SCALAR_PROP(GridAdaptTypeTag, CoarsenThreshold, 0.0);//DEPRECATED
+SET_INT_PROP(GridAdaptTypeTag, GridAdaptAdaptionInterval, GET_PROP_VALUE(TypeTag, AdaptionInterval));
+SET_INT_PROP(GridAdaptTypeTag, AdaptionInterval, 1);//DEPRECATED
//Switch initial grid adaption off per default
-SET_BOOL_PROP(GridAdaptTypeTag, EnableInitializationIndicator, false);
+SET_BOOL_PROP(GridAdaptTypeTag, GridAdaptEnableInitializationIndicator, GET_PROP_VALUE(TypeTag, EnableInitializationIndicator));
+SET_BOOL_PROP(GridAdaptTypeTag, EnableInitializationIndicator, false);//DEPRECATED
// Switch of extra refinement strategy at boundaries/sources
-SET_BOOL_PROP(GridAdaptTypeTag, RefineAtDirichletBC, false);
-SET_BOOL_PROP(GridAdaptTypeTag, RefineAtFluxBC, false);
-SET_BOOL_PROP(GridAdaptTypeTag, RefineAtSource, false);
+SET_BOOL_PROP(GridAdaptTypeTag, GridAdaptRefineAtDirichletBC, GET_PROP_VALUE(TypeTag, RefineAtDirichletBC));
+SET_BOOL_PROP(GridAdaptTypeTag, RefineAtDirichletBC, false);//DEPRECATED
+SET_BOOL_PROP(GridAdaptTypeTag, GridAdaptRefineAtFluxBC, GET_PROP_VALUE(TypeTag, RefineAtFluxBC));
+SET_BOOL_PROP(GridAdaptTypeTag, RefineAtFluxBC, false);//DEPRECATED
+SET_BOOL_PROP(GridAdaptTypeTag, GridAdaptRefineAtSource, GET_PROP_VALUE(TypeTag, RefineAtSource));
+SET_BOOL_PROP(GridAdaptTypeTag, RefineAtSource, false);//DEPRECATED
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/decoupled/common/impet.hh b/dumux/decoupled/common/impet.hh
index 94b2eed613..f8510ab46c 100644
--- a/dumux/decoupled/common/impet.hh
+++ b/dumux/decoupled/common/impet.hh
@@ -199,11 +199,11 @@ public:
IMPET(Problem& prob) :
problem_(prob)
{
- cFLFactor_ = GET_PARAM(TypeTag, Scalar, CFLFactor);
- iterFlag_ = GET_PARAM(TypeTag, int, IterationFlag);
- nIter_ = GET_PARAM(TypeTag, int, IterationNumber);
- maxDefect_ = GET_PARAM(TypeTag, Scalar, MaximumDefect);
- omega_ = GET_PARAM(TypeTag, Scalar, RelaxationFactor);
+ cFLFactor_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, CFLFactor);
+ iterFlag_ = GET_PARAM_FROM_GROUP(TypeTag, int, Impet, IterationFlag);
+ nIter_ = GET_PARAM_FROM_GROUP(TypeTag, int, Impet, IterationNumber);
+ maxDefect_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, MaximumDefect);
+ omega_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, RelaxationFactor);
}
private:
diff --git a/dumux/decoupled/common/impetproperties.hh b/dumux/decoupled/common/impetproperties.hh
index 9c56ae2e1b..5850f26016 100644
--- a/dumux/decoupled/common/impetproperties.hh
+++ b/dumux/decoupled/common/impetproperties.hh
@@ -60,11 +60,16 @@ NEW_TYPE_TAG(IMPET, INHERITS_FROM(DecoupledModel));
// Property tags
//////////////////////////////////////////////////////////////////
-NEW_PROP_TAG(CFLFactor); //!< Scalar factor for additional scaling of the time step
-NEW_PROP_TAG(IterationFlag); //!< Flag to switch the iteration type of the IMPET scheme
-NEW_PROP_TAG(IterationNumber); //!< Number of iterations if IMPET iterations are enabled by the IterationFlags
-NEW_PROP_TAG(MaximumDefect); //!< Maximum Defect if IMPET iterations are enabled by the IterationFlags
-NEW_PROP_TAG(RelaxationFactor); //!< Used for IMPET iterations
+NEW_PROP_TAG(ImpetCFLFactor); //!< Scalar factor for additional scaling of the time step
+NEW_PROP_TAG(CFLFactor); //!< DEPRECATED Scalar factor for additional scaling of the time step
+NEW_PROP_TAG(ImpetIterationFlag); //!< Flag to switch the iteration type of the IMPET scheme
+NEW_PROP_TAG(IterationFlag); //!< DEPRECATED Flag to switch the iteration type of the IMPET scheme
+NEW_PROP_TAG(ImpetIterationNumber); //!< Number of iterations if IMPET iterations are enabled by the IterationFlags
+NEW_PROP_TAG(IterationNumber); //!< DEPRECATED Number of iterations if IMPET iterations are enabled by the IterationFlags
+NEW_PROP_TAG(ImpetMaximumDefect); //!< Maximum Defect if IMPET iterations are enabled by the IterationFlags
+NEW_PROP_TAG(MaximumDefect); //!< DEPRECATED Maximum Defect if IMPET iterations are enabled by the IterationFlags
+NEW_PROP_TAG(ImpetRelaxationFactor); //!< Used for IMPET iterations
+NEW_PROP_TAG(RelaxationFactor); //!< DEPRECATED Used for IMPET iterations
//forward declaration!
NEW_PROP_TAG( Model );//! The model of the specific problem
@@ -81,10 +86,15 @@ namespace Properties
SET_TYPE_PROP(IMPET, Model, IMPET<TypeTag>);
//Set defaults
+SET_SCALAR_PROP(IMPET, ImpetCFLFactor, GET_PROP_VALUE(TypeTag, CFLFactor));
SET_SCALAR_PROP(IMPET, CFLFactor, 1.0);
+SET_INT_PROP(IMPET, ImpetIterationFlag, GET_PROP_VALUE(TypeTag, IterationFlag)); //!< 0 = no iterations, 1 = iterate IterationNumber iterations, 2 = iterate until converged or IterationNumber is reached
SET_INT_PROP(IMPET, IterationFlag, 0); //!< 0 = no iterations, 1 = iterate IterationNumber iterations, 2 = iterate until converged or IterationNumber is reached
+SET_INT_PROP(IMPET, ImpetIterationNumber, GET_PROP_VALUE(TypeTag, IterationNumber));
SET_INT_PROP(IMPET, IterationNumber, 2);
+SET_SCALAR_PROP(IMPET, ImpetMaximumDefect, GET_PROP_VALUE(TypeTag, MaximumDefect));
SET_SCALAR_PROP(IMPET, MaximumDefect, 1e-5);
+SET_SCALAR_PROP(IMPET, ImpetRelaxationFactor, GET_PROP_VALUE(TypeTag, RelaxationFactor));//!< 1 = new solution is new solution, 0 = old solution is new solution
SET_SCALAR_PROP(IMPET, RelaxationFactor, 1.0);//!< 1 = new solution is new solution, 0 = old solution is new solution
}
}
diff --git a/dumux/decoupled/common/transportproperties.hh b/dumux/decoupled/common/transportproperties.hh
index eca6349902..720b0ff7e2 100644
--- a/dumux/decoupled/common/transportproperties.hh
+++ b/dumux/decoupled/common/transportproperties.hh
@@ -51,11 +51,16 @@ NEW_TYPE_TAG(Transport, INHERITS_FROM(DecoupledModel));
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG( TransportSolutionType);
NEW_PROP_TAG( EvalCflFluxFunction ); //!< Type of the evaluation of the CFL-condition
-NEW_PROP_TAG( CFLFactor );
-NEW_PROP_TAG( SwitchNormals );
+NEW_PROP_TAG( ImpetCFLFactor );
+NEW_PROP_TAG( CFLFactor );//DEPRECATED
+NEW_PROP_TAG( ImpetSwitchNormals );
+NEW_PROP_TAG( SwitchNormals );//DEPRECATED
-SET_SCALAR_PROP(Transport, CFLFactor, 1.0);
-SET_BOOL_PROP(Transport, SwitchNormals, false);
+SET_SCALAR_PROP(Transport, ImpetCFLFactor, GET_PROP_VALUE(TypeTag, CFLFactor));
+SET_SCALAR_PROP(Transport, CFLFactor, 1.0);//DEPRECATED
+
+SET_BOOL_PROP(Transport, ImpetSwitchNormals, GET_PROP_VALUE(TypeTag, SwitchNormals));
+SET_BOOL_PROP(Transport, SwitchNormals, false);//DEPRECATED
/*!
* \brief Default implementation for the Vector of the transportet quantity
diff --git a/dumux/freeflow/stokes/stokeslocalresidual.hh b/dumux/freeflow/stokes/stokeslocalresidual.hh
index 79929fa8e7..6ba142f8e3 100644
--- a/dumux/freeflow/stokes/stokeslocalresidual.hh
+++ b/dumux/freeflow/stokes/stokeslocalresidual.hh
@@ -102,9 +102,9 @@ protected:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- massUpwindWeight_ = GET_PARAM(TypeTag, Scalar, MassUpwindWeight);
- stabilizationAlpha_ = GET_PARAM(TypeTag, Scalar, StabilizationAlpha);
- stabilizationBeta_ = GET_PARAM(TypeTag, Scalar, StabilizationBeta);
+ massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
+ stabilizationAlpha_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Stokes, StabilizationAlpha);
+ stabilizationBeta_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Stokes, StabilizationBeta);
};
/*!
diff --git a/dumux/freeflow/stokes/stokesproblem.hh b/dumux/freeflow/stokes/stokesproblem.hh
index 312f2bd488..5730ea2de5 100644
--- a/dumux/freeflow/stokes/stokesproblem.hh
+++ b/dumux/freeflow/stokes/stokesproblem.hh
@@ -67,7 +67,7 @@ public:
: ParentType(timeManager, gridView),
gravity_(0)
{
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim-1] = -9.81;
}
diff --git a/dumux/freeflow/stokes/stokesproperties.hh b/dumux/freeflow/stokes/stokesproperties.hh
index 0e327aca5b..dcc0824bfa 100644
--- a/dumux/freeflow/stokes/stokesproperties.hh
+++ b/dumux/freeflow/stokes/stokesproperties.hh
@@ -51,15 +51,19 @@ NEW_TYPE_TAG(BoxStokes, INHERITS_FROM(BoxModel));
// Property tags
//////////////////////////////////////////////////////////////////
-NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(MassUpwindWeight); //!< The value of the upwind parameter for the mobility
+NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
+NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
+NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind parameter for the mobility
+NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED The value of the upwind parameter for the mobility
NEW_PROP_TAG(StokesIndices); //!< DEPRECATED Enumerations for the Stokes models
NEW_PROP_TAG(Indices); //!< Enumerations for the model
NEW_PROP_TAG(Fluid);
NEW_PROP_TAG(FluidSystem); //!< The employed fluid system
NEW_PROP_TAG(FluidState);
-NEW_PROP_TAG(StabilizationAlpha); //!< The parameter for the stabilization
-NEW_PROP_TAG(StabilizationBeta); //!< The parameter for the stabilization at boundaries
+NEW_PROP_TAG(StokesStabilizationAlpha); //!< The parameter for the stabilization
+NEW_PROP_TAG(StabilizationAlpha); //!< DEPRECATED The parameter for the stabilization
+NEW_PROP_TAG(StokesStabilizationBeta); //!< The parameter for the stabilization at boundaries
+NEW_PROP_TAG(StabilizationBeta); //!< DEPRECATED The parameter for the stabilization at boundaries
NEW_PROP_TAG(EnableNavierStokes); //!< Returns whether Navier-Stokes should be solved instead of plain Stokes
NEW_PROP_TAG(PhaseIndex); //!< DEPRECATED A phase index in case that a two-phase fluidsystem is used
diff --git a/dumux/freeflow/stokes/stokespropertydefaults.hh b/dumux/freeflow/stokes/stokespropertydefaults.hh
index b572a0828f..0234a28b7c 100644
--- a/dumux/freeflow/stokes/stokespropertydefaults.hh
+++ b/dumux/freeflow/stokes/stokespropertydefaults.hh
@@ -99,6 +99,7 @@ SET_TYPE_PROP(BoxStokes, VolumeVariables, StokesVolumeVariables<TypeTag>);
SET_TYPE_PROP(BoxStokes, FluxVariables, StokesFluxVariables<TypeTag>);
//! the upwind factor.
+SET_SCALAR_PROP(BoxStokes, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight));
SET_SCALAR_PROP(BoxStokes, MassUpwindWeight, 1.0);
//! The fluid system to use by default
@@ -144,10 +145,15 @@ SET_INT_PROP(BoxStokes, PhaseIdx, 0);
SET_BOOL_PROP(BoxStokes, EnableNavierStokes, false);
//! A stabilization factor. Set negative for stabilization and to zero for no stabilization
-SET_SCALAR_PROP(BoxStokes, StabilizationAlpha, 0.0);
+SET_SCALAR_PROP(BoxStokes, StokesStabilizationAlpha, GET_PROP_VALUE(TypeTag, StabilizationAlpha));
+SET_SCALAR_PROP(BoxStokes, StabilizationAlpha, 0.0);//DEPRECATED
//! Stabilization factor for the boundaries
-SET_SCALAR_PROP(BoxStokes, StabilizationBeta, 0.0);
+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!
+SET_BOOL_PROP(BoxStokes, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
}
diff --git a/dumux/linear/boxlinearsolver.hh b/dumux/linear/boxlinearsolver.hh
index c04d1a8be3..17f3264c7e 100644
--- a/dumux/linear/boxlinearsolver.hh
+++ b/dumux/linear/boxlinearsolver.hh
@@ -198,7 +198,7 @@ public:
template <class Matrix>
PrecNoIterBackend(Matrix& A)
- : imp_(A, GET_PARAM(TypeTag, double, PreconditionerRelaxation))
+ : imp_(A, GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation))
{}
Imp& imp()
@@ -219,8 +219,8 @@ public:
template <class Matrix>
PrecIterBackend(Matrix& A)
: imp_(A,
- GET_PARAM(TypeTag, int, PreconditionerIterations),
- GET_PARAM(TypeTag, double, PreconditionerRelaxation))
+ GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, PreconditionerIterations),
+ GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation))
{}
Imp& imp()
diff --git a/dumux/linear/impetbicgstabilu0solver.hh b/dumux/linear/impetbicgstabilu0solver.hh
index de31d2b43f..4e26728ec4 100644
--- a/dumux/linear/impetbicgstabilu0solver.hh
+++ b/dumux/linear/impetbicgstabilu0solver.hh
@@ -121,7 +121,7 @@ public:
int verbosityLevel = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, Verbosity);
const int maxIter = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, MaxIterations);
const double residReduction = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, ResidualReduction);
- const double relaxation = GET_PARAM(TypeTag, double, PreconditionerRelaxation);
+ const double relaxation = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation);
if (!overlapMatrix_) {
// make sure that the overlapping matrix and block vectors
diff --git a/dumux/linear/linearsolverproperties.hh b/dumux/linear/linearsolverproperties.hh
index 89615ea093..24c170cc19 100644
--- a/dumux/linear/linearsolverproperties.hh
+++ b/dumux/linear/linearsolverproperties.hh
@@ -58,13 +58,16 @@ NEW_PROP_TAG(LinearSolverResidualReduction);
NEW_PROP_TAG(LinearSolverMaxIterations);
//! relaxation parameter for the preconditioner
-NEW_PROP_TAG(PreconditionerRelaxation);
+NEW_PROP_TAG(LinearSolverPreconditionerRelaxation);
+NEW_PROP_TAG(PreconditionerRelaxation);//DEPRECATED
//! number of preconditioner iterations per solver iteration
-NEW_PROP_TAG(PreconditionerIterations);
+NEW_PROP_TAG(LinearSolverPreconditionerIterations);
+NEW_PROP_TAG(PreconditionerIterations);//DEPRECATED
//! restart parameter for GMRes
-NEW_PROP_TAG(GMResRestart);
+NEW_PROP_TAG(LinearSolverGMResRestart);
+NEW_PROP_TAG(GMResRestart);//DEPRECATED
//! Size of the matrix/vector blocks
/*!
@@ -78,13 +81,16 @@ NEW_PROP_TAG(LinearSolverBlockSize);
SET_INT_PROP(LinearSolverTypeTag, LinearSolverVerbosity, 0);
//! set the preconditioner relaxation parameter to 1.0 by default
-SET_SCALAR_PROP(LinearSolverTypeTag, PreconditionerRelaxation, 1.0);
+SET_SCALAR_PROP(LinearSolverTypeTag, LinearSolverPreconditionerRelaxation, GET_PROP_VALUE(TypeTag, PreconditionerRelaxation));
+SET_SCALAR_PROP(LinearSolverTypeTag, PreconditionerRelaxation, 1.0);//DEPRECATED
//! set the preconditioner iterations to 1 by default
-SET_INT_PROP(LinearSolverTypeTag, PreconditionerIterations, 1);
+SET_INT_PROP(LinearSolverTypeTag, LinearSolverPreconditionerIterations, GET_PROP_VALUE(TypeTag, PreconditionerIterations));
+SET_INT_PROP(LinearSolverTypeTag, PreconditionerIterations, 1);//DEPRECATED
//! set the GMRes restart parameter to 10 by default
-SET_INT_PROP(LinearSolverTypeTag, GMResRestart, 10);
+SET_INT_PROP(LinearSolverTypeTag, LinearSolverGMResRestart, GET_PROP_VALUE(TypeTag, GMResRestart));
+SET_INT_PROP(LinearSolverTypeTag, GMResRestart, 10);//DEPRECATED
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index 276a78f46b..6390c92fa8 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -60,8 +60,8 @@ public:
Vector bTmp(b);
- const double relaxation = GET_PARAM(TypeTag, double, PreconditionerRelaxation);
- const int precondIter = GET_PARAM(TypeTag, int, PreconditionerIterations);
+ const double relaxation = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation);
+ const int precondIter = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, PreconditionerIterations);
Preconditioner precond(A, precondIter, relaxation);
@@ -85,8 +85,8 @@ public:
Vector bTmp(b);
- const double relaxation = GET_PARAM(TypeTag, double, PreconditionerRelaxation);
- const int precondIter = GET_PARAM(TypeTag, int, PreconditionerIterations);
+ const double relaxation = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation);
+ const int precondIter = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, PreconditionerIterations);
Preconditioner precond(A, precondIter, relaxation);
@@ -368,7 +368,7 @@ public:
{
typedef Dune::SeqSSOR<Matrix, Vector, Vector> Preconditioner;
typedef Dune::RestartedGMResSolver<Vector> Solver;
- const int restart = GET_PARAM(TypeTag, int, GMResRestart);
+ const int restart = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, GMResRestart);
return ParentType::template solve<Preconditioner, Solver>(A, x, b, restart);
}
@@ -395,7 +395,7 @@ public:
Vector bTmp(b);
- const double relaxation = GET_PARAM(TypeTag, double, PreconditionerRelaxation);
+ const double relaxation = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation);
Preconditioner precond(A, relaxation);
@@ -419,7 +419,7 @@ public:
Vector bTmp(b);
- const double relaxation = GET_PARAM(TypeTag, double, PreconditionerRelaxation);
+ const double relaxation = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation);
Preconditioner precond(A, relaxation);
@@ -509,7 +509,7 @@ public:
{
typedef Dune::SeqILU0<Matrix, Vector, Vector> Preconditioner;
typedef Dune::RestartedGMResSolver<Vector> Solver;
- const int restart = GET_PARAM(TypeTag, int, GMResRestart);
+ const int restart = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, GMResRestart);
return ParentType::template solve<Preconditioner, Solver>(A, x, b, restart);
}
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index 6fe66a00a8..84846d73d9 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -75,7 +75,8 @@ NEW_PROP_TAG(NewtonWriteConvergence);
//! Specifies whether the Jacobian matrix should only be reassembled
//! if the current solution deviates too much from the evaluation point
-NEW_PROP_TAG(EnablePartialReassemble);
+NEW_PROP_TAG(ImplicitEnablePartialReassemble);
+NEW_PROP_TAG(EnablePartialReassemble);//DEPRECATED
/*!
* \brief Specifies whether the update should be done using the line search
@@ -172,8 +173,8 @@ public:
, convergenceWriter_(asImp_())
, linearSolver_(problem)
{
- enablePartialReassemble_ = GET_PARAM(TypeTag, bool, EnablePartialReassemble);
- enableJacobianRecycling_ = GET_PARAM(TypeTag, bool, EnableJacobianRecycling);
+ enablePartialReassemble_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, EnablePartialReassemble);
+ enableJacobianRecycling_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, EnableJacobianRecycling);
useLineSearch_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, UseLineSearch);
enableRelativeCriterion_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, EnableRelativeCriterion);
diff --git a/test/boxmodels/1p/test_1p.input b/test/boxmodels/1p/test_1p.input
index aa51622832..8eb7b0dc1f 100644
--- a/test/boxmodels/1p/test_1p.input
+++ b/test/boxmodels/1p/test_1p.input
@@ -8,9 +8,9 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 1 # seconds
-tEnd = 1 # seconds
-gridFile = ./grids/test_1p_2d.dgf
+TimeManager.DtInitial = 1 # seconds
+TimeManager.TEnd = 1 # seconds
+Grid.File = ./grids/test_1p_2d.dgf
#########################################################################
# Simulation restart
@@ -21,7 +21,7 @@ gridFile = ./grids/test_1p_2d.dgf
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
#########################################################################
-# restart = ...
+# Restart = ...
####################################################################
# SpatialParams
diff --git a/test/boxmodels/1p2c/test_1p2c.input b/test/boxmodels/1p2c/test_1p2c.input
index d1241d81c4..0fc1bd54da 100644
--- a/test/boxmodels/1p2c/test_1p2c.input
+++ b/test/boxmodels/1p2c/test_1p2c.input
@@ -8,9 +8,9 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 1 # seconds
-tEnd = 100 # seconds
-gridFile = ./grids/test_1p2c.dgf
+TimeManager.DtInitial = 1 # seconds
+TimeManager.TEnd = 100 # seconds
+Grid.File = ./grids/test_1p2c.dgf
#########################################################################
# Simulation restart
diff --git a/test/boxmodels/2p/test_2p.input b/test/boxmodels/2p/test_2p.input
index 07c8359130..5a2f32aa54 100644
--- a/test/boxmodels/2p/test_2p.input
+++ b/test/boxmodels/2p/test_2p.input
@@ -8,9 +8,9 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 250# [s]
-tEnd = 1000# [s]
-gridFile = ./grids/test_2p.dgf
+TimeManager.DtInitial = 250# [s]
+TimeManager.TEnd = 1000# [s]
+Grid.File = ./grids/test_2p.dgf
[SpatialParams]
lensLowerLeftX = 1.0 # [m] dimension of the lens (different properties therin)
@@ -27,4 +27,4 @@ lensUpperRightY = 3.0 # [m] dimension of the lens (different properties therin)
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
####################################################################
-# restart = ...
\ No newline at end of file
+# restart = ...
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index 0df7795f42..b1f2f76d11 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -72,7 +72,7 @@ SET_PROP(InjectionProblem, FluidSystem)
SET_BOOL_PROP(InjectionProblem, EnableGravity, true);
SET_BOOL_PROP(InjectionProblem, EnableJacobianRecycling, true);
-SET_BOOL_PROP(InjectionProblem, EnableVelocityOutput, false);
+SET_BOOL_PROP(InjectionProblem, VtkAddVelocity, false);
}
diff --git a/test/boxmodels/2p2c/test_2p2c.input b/test/boxmodels/2p2c/test_2p2c.input
index bed1d9bac6..802147de81 100644
--- a/test/boxmodels/2p2c/test_2p2c.input
+++ b/test/boxmodels/2p2c/test_2p2c.input
@@ -8,9 +8,9 @@
####################################################################
# Mandatory arguments
####################################################################
-dtInitial = 250# [s]
-tEnd = 1e4# [s]
-gridFile = ./grids/test_2p2c.dgf # relative path to the grid file
+TimeManager.DtInitial = 250# [s]
+TimeManager.TEnd = 1e4# [s]
+Grid.File = ./grids/test_2p2c.dgf # relative path to the grid file
[FluidSystem]
nTemperature = 3# [-] number of tabularization entries
diff --git a/test/boxmodels/2p2cni/test_2p2cni.input b/test/boxmodels/2p2cni/test_2p2cni.input
index aa79d33be1..4e3d1a6521 100644
--- a/test/boxmodels/2p2cni/test_2p2cni.input
+++ b/test/boxmodels/2p2cni/test_2p2cni.input
@@ -8,9 +8,9 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 250 # seconds
-tEnd = 1e4 # seconds
-gridFile = ./grids/test_2p2cni.dgf
+TimeManager.DtInitial = 250 # seconds
+TimeManager.TEnd = 1e4 # seconds
+Grid.File = ./grids/test_2p2cni.dgf
####################################################################
# Simulation restart
diff --git a/test/boxmodels/2pni/test_2pni.input b/test/boxmodels/2pni/test_2pni.input
index 8fa114a9d0..c2eb1a6cbc 100644
--- a/test/boxmodels/2pni/test_2pni.input
+++ b/test/boxmodels/2pni/test_2pni.input
@@ -8,15 +8,15 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 250# [s]
-tEnd = 1e4# [s]
+TimeManager.DtInitial = 250# [s]
+TimeManager.TEnd = 1e4# [s]
[Grid]
-numberOfCellsX = 24# [-] resolution in x-direction
-numberOfCellsY = 16# [-] resolution in y-direction
+NumberOfCellsX = 24# [-] resolution in x-direction
+NumberOfCellsY = 16# [-] resolution in y-direction
-upperRightX = 60# [m] dimension of the grid
-upperRightY = 40# [m] dimension of the grid
+UpperRightX = 60# [m] dimension of the grid
+UpperRightY = 40# [m] dimension of the grid
####################################################################
# Simulation restart
#
diff --git a/test/boxmodels/3p3c/test_3p3c.input b/test/boxmodels/3p3c/test_3p3c.input
index 204751e7e4..e6054f3c98 100644
--- a/test/boxmodels/3p3c/test_3p3c.input
+++ b/test/boxmodels/3p3c/test_3p3c.input
@@ -8,9 +8,9 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 60# [s]
-tEnd = 864000# [s]
-gridFile = ./grids/test_3p3c.dgf
+TimeManager.DtInitial = 60# [s]
+TimeManager.TEnd = 864000# [s]
+Grid.File = ./grids/test_3p3c.dgf
####################################################################
# Simulation restart
diff --git a/test/boxmodels/3p3cni/test_3p3cni.input b/test/boxmodels/3p3cni/test_3p3cni.input
index 5ce16d009f..bd052dfcf7 100644
--- a/test/boxmodels/3p3cni/test_3p3cni.input
+++ b/test/boxmodels/3p3cni/test_3p3cni.input
@@ -8,9 +8,9 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 1# [s]
-tEnd = 1800# [s]
-gridFile = ./grids/kuev_2p2cni.dgf
+TimeManager.DtInitial = 1# [s]
+TimeManager.TEnd = 1800# [s]
+Grid.File = ./grids/kuev_2p2cni.dgf
####################################################################
# Simulation restart
diff --git a/test/boxmodels/mpnc/test_mpnc.input b/test/boxmodels/mpnc/test_mpnc.input
index 3d01030cb1..14325d5c09 100644
--- a/test/boxmodels/mpnc/test_mpnc.input
+++ b/test/boxmodels/mpnc/test_mpnc.input
@@ -8,9 +8,9 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 250 # seconds
-tEnd = 1e4 # seconds
-gridFile = ./grids/obstacle_24x16.dgf
+TimeManager.DtInitial = 250 # seconds
+TimeManager.TEnd = 1e4 # seconds
+Grid.File = ./grids/obstacle_24x16.dgf
[ LinearSolver ]
ResidualReduction = 1e-12
diff --git a/test/boxmodels/richards/test_richards.input b/test/boxmodels/richards/test_richards.input
index 24edc54f48..d53d81c899 100644
--- a/test/boxmodels/richards/test_richards.input
+++ b/test/boxmodels/richards/test_richards.input
@@ -8,9 +8,9 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 100 # seconds
-tEnd = 3000 # seconds
-gridFile = ./grids/richardslens-24x16.dgf
+TimeManager.DtInitial = 100 # seconds
+TimeManager.TEnd = 3000 # seconds
+Grid.File = ./grids/richardslens-24x16.dgf
####################################################################
# Simulation restart
diff --git a/test/decoupled/1p/test_1p.input b/test/decoupled/1p/test_1p.input
index 4c99f49743..9207641e2c 100644
--- a/test/decoupled/1p/test_1p.input
+++ b/test/decoupled/1p/test_1p.input
@@ -8,18 +8,21 @@
############################################################
# Mandatory arguments
############################################################
-numRefine = 3 # refinement level of the created grid
-dtInitial = 0# [s]
-tEnd = 0# [s]
+[TimeManager]
+DtInitial = 0# [s]
+TEnd = 0# [s]
-# delta = 1e-6 # [-] if this is commented in, it is used
+[Problem]
+Delta = 1e-6 # [-] if this is commented in, it is used
[Grid]
-numberOfCellsX = 1# [-] resolution in x-direction
-numberOfCellsY = 1# [-] resolution in y-direction
+NumberOfCellsX = 1# [-] resolution in x-direction
+NumberOfCellsY = 1# [-] resolution in y-direction
-upperRightX = 1# [m] dimension of the grid
-upperRightY = 1# [m] dimension of the grid
+UpperRightX = 1# [m] dimension of the grid
+UpperRightY = 1# [m] dimension of the grid
+
+NumRefine = 3 # refinement level of the created grid
####################################################################
# Simulation restart
#
@@ -29,5 +32,5 @@ upperRightY = 1# [m] dimension of the grid
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
####################################################################
-# restart = ...
+# Restart = ...
diff --git a/test/decoupled/1p/test_1pproblem.hh b/test/decoupled/1p/test_1pproblem.hh
index aed5f386e8..483b97b2ce 100644
--- a/test/decoupled/1p/test_1pproblem.hh
+++ b/test/decoupled/1p/test_1pproblem.hh
@@ -131,9 +131,9 @@ public:
try
{
if (ParameterTree::tree().hasKey("delta"))
- delta_ = GET_RUNTIME_PARAM(TypeTag, Scalar, delta_);
+ delta_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, Delta_);
int numRefine;
- numRefine = GET_RUNTIME_PARAM(TypeTag, int, numRefine);
+ numRefine = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, NumRefine);
GridCreator::grid().globalRefine(numRefine);
}
catch (Dumux::ParameterException &e) {
diff --git a/test/decoupled/2p/test_impes.input b/test/decoupled/2p/test_impes.input
index 11de30fdfc..ccaaf6e190 100644
--- a/test/decoupled/2p/test_impes.input
+++ b/test/decoupled/2p/test_impes.input
@@ -8,15 +8,16 @@
############################################################
# Mandatory arguments
############################################################
-tEnd = 1e7# [s]
-dtInitial = 0#[s]
+[TimeManager]
+TEnd = 1e7# [s]
+DtInitial = 0#[s]
[Grid]
-numberOfCellsX = 30# [-] resolution in x-direction
-numberOfCellsY = 6# [-] resolution in y-direction
+NumberOfCellsX = 30# [-] resolution in x-direction
+NumberOfCellsY = 6# [-] resolution in y-direction
-upperRightX = 300# [m] dimension of the grid
-upperRightY = 60# [m] dimension of the grid
+UpperRightX = 300# [m] dimension of the grid
+UpperRightY = 60# [m] dimension of the grid
####################################################################
# Simulation restart
#
@@ -26,5 +27,5 @@ upperRightY = 60# [m] dimension of the grid
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
####################################################################
-# restart = ...
+# Restart = ...
diff --git a/test/decoupled/2p/test_impesproblem.hh b/test/decoupled/2p/test_impesproblem.hh
index ded216f054..493b98f37b 100644
--- a/test/decoupled/2p/test_impesproblem.hh
+++ b/test/decoupled/2p/test_impesproblem.hh
@@ -263,7 +263,7 @@ void dirichletAtPos(PrimaryVariables &values, const GlobalPosition& globalPos) c
values = 0;
if (globalPos[0] < eps_)
{
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
{
Scalar pRef = referencePressureAtPos(globalPos);
Scalar temp = temperatureAtPos(globalPos);
diff --git a/test/decoupled/2p/test_transport.input b/test/decoupled/2p/test_transport.input
index fb0dc77ac3..c462b37540 100644
--- a/test/decoupled/2p/test_transport.input
+++ b/test/decoupled/2p/test_transport.input
@@ -8,9 +8,12 @@
############################################################
# Mandatory arguments
############################################################
-tEnd = 1e4# [s]
-dtInitial = 0# [s]
-gridFile = ./grids/test_transport.dgf
+[TimeManager]
+TEnd = 1e4# [s]
+DtInitial = 0# [s]
+
+[Grid]
+File = ./grids/test_transport.dgf
####################################################################
# Simulation restart
@@ -21,5 +24,5 @@ gridFile = ./grids/test_transport.dgf
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
####################################################################
-# restart = ...
+# Restart = ...
diff --git a/test/decoupled/2p2c/test_dec2p2c.input b/test/decoupled/2p2c/test_dec2p2c.input
index 626175b3b7..910f8588e2 100644
--- a/test/decoupled/2p2c/test_dec2p2c.input
+++ b/test/decoupled/2p2c/test_dec2p2c.input
@@ -8,17 +8,18 @@
############################################################
# Mandatory arguments
############################################################
-tEnd = 3e3# [s]
-dtInitial = 200#[s]
+[TimeManager]
+TEnd = 3e3# [s]
+DtInitial = 200#[s]
[Grid]
-numberOfCellsX = 10# [-] resolution in x-direction
-numberOfCellsY = 10# [-] resolution in y-direction
-numberOfCellsZ = 10# [-] resolution in y-direction
+NumberOfCellsX = 10# [-] resolution in x-direction
+NumberOfCellsY = 10# [-] resolution in y-direction
+NumberOfCellsZ = 10# [-] resolution in y-direction
-upperRightX = 10# [m] dimension of the grid
-upperRightY = 10# [m] dimension of the grid
-upperRightZ = 10# [m] dimension of the grid
+UpperRightX = 10# [m] dimension of the grid
+UpperRightY = 10# [m] dimension of the grid
+UpperRightZ = 10# [m] dimension of the grid
####################################################################
# Simulation restart
#
@@ -28,5 +29,5 @@ upperRightZ = 10# [m] dimension of the grid
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
####################################################################
-# restart = ...
+# Restart = ...
diff --git a/test/decoupled/2padaptive/test_impesadaptive.input b/test/decoupled/2padaptive/test_impesadaptive.input
index 43574c488f..f6364395d5 100644
--- a/test/decoupled/2padaptive/test_impesadaptive.input
+++ b/test/decoupled/2padaptive/test_impesadaptive.input
@@ -8,20 +8,21 @@
############################################################
# Mandatory arguments
############################################################
-tEnd = 2e7# [s]
-dtInitial = 0# [s]
+[TimeManager]
+TEnd = 2e7# [s]
+DtInitial = 0# [s]
[Grid]
-numberOfCellsX = 2# [-] level 0 resolution in x-direction
-numberOfCellsY = 1# [-] level 0 resolution in y-direction
+NumberOfCellsX = 2# [-] level 0 resolution in x-direction
+NumberOfCellsY = 1# [-] level 0 resolution in y-direction
-upperRightX = 300# [m] dimension of the grid
-upperRightY = 100# [m] dimension of the grid
+UpperRightX = 300# [m] dimension of the grid
+UpperRightY = 100# [m] dimension of the grid
############################################################
#parameters for grid adaption
############################################################
-[]
+[GridAdapt]
MinLevel = 0# [-] minimum level of refinement
MaxLevel = 5# [-] maximum level of refinement
RefineTolerance = 0.05 # threshold for refinement criterion
@@ -36,4 +37,4 @@ CoarsenTolerance = 0.001 # threshold for coarsening criterion
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
########################################################################
-# restart = ...
+# Restart = ...
diff --git a/test/decoupled/2padaptive/test_impesadaptiveproblem.hh b/test/decoupled/2padaptive/test_impesadaptiveproblem.hh
index 7800ef5183..9def620088 100644
--- a/test/decoupled/2padaptive/test_impesadaptiveproblem.hh
+++ b/test/decoupled/2padaptive/test_impesadaptiveproblem.hh
@@ -160,7 +160,7 @@ public:
ParentType(timeManager, gridView), eps_(1e-6)
{
GridCreator::grid().setClosureType(Grid::ClosureType::NONE);
- GridCreator::grid().globalRefine(GET_PARAM(TypeTag, int, MaxLevel));
+ GridCreator::grid().globalRefine(GET_PARAM_FROM_GROUP(TypeTag, int, GridAdapt, MaxLevel));
this->setGrid(GridCreator::grid());
this->setOutputInterval(10);
@@ -239,7 +239,7 @@ public:
values = 0;
if (globalPos[0] < eps_)
{
- if (GET_PARAM(TypeTag, bool, EnableGravity))
+ if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
{
Scalar pRef = referencePressureAtPos(globalPos);
Scalar temp = temperatureAtPos(globalPos);
diff --git a/test/freeflow/navierstokes/test_navierstokes.input b/test/freeflow/navierstokes/test_navierstokes.input
index f0ba5cb20d..e976552d3f 100644
--- a/test/freeflow/navierstokes/test_navierstokes.input
+++ b/test/freeflow/navierstokes/test_navierstokes.input
@@ -8,10 +8,13 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 1.0 # seconds
+[TimeManager]
+DtInitial = 1.0 # seconds
MaxTimeStepSize = 10.0 # seconds
-tEnd = 30.0 # seconds
-gridFile = ./grids/test_navierstokes.dgf
+TEnd = 30.0 # seconds
+
+[Grid]
+File = ./grids/test_navierstokes.dgf
#########################################################################
# Simulation restart
@@ -22,4 +25,4 @@ gridFile = ./grids/test_navierstokes.dgf
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
#########################################################################
-# restart = ...
+# Restart = ...
diff --git a/test/freeflow/stokes/test_stokes.input b/test/freeflow/stokes/test_stokes.input
index 270f4f863f..f130d190d7 100644
--- a/test/freeflow/stokes/test_stokes.input
+++ b/test/freeflow/stokes/test_stokes.input
@@ -8,9 +8,12 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 10 # seconds
-tEnd = 6e3 # seconds
-gridFile = ./grids/test_stokes.dgf
+[TimeManager]
+DtInitial = 10 # seconds
+TEnd = 6e3 # seconds
+
+[Grid]
+File = ./grids/test_stokes.dgf
#########################################################################
# Simulation restart
@@ -21,4 +24,4 @@ gridFile = ./grids/test_stokes.dgf
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
#########################################################################
-# restart = ...
+# Restart = ...
diff --git a/test/freeflow/stokes2c/test_stokes2c.input b/test/freeflow/stokes2c/test_stokes2c.input
index 4c5c37e8cb..1219abd8c8 100644
--- a/test/freeflow/stokes2c/test_stokes2c.input
+++ b/test/freeflow/stokes2c/test_stokes2c.input
@@ -8,9 +8,12 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 0.1 # seconds
-tEnd = 2 # seconds
-gridFile = ./grids/test_stokes2c.dgf
+[TimeManager]
+DtInitial = 0.1 # seconds
+TEnd = 2 # seconds
+
+[Grid]
+File = ./grids/test_stokes2c.dgf
#########################################################################
# Simulation restart
@@ -21,4 +24,4 @@ gridFile = ./grids/test_stokes2c.dgf
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
#########################################################################
-# restart = ...
+# Restart = ...
diff --git a/test/freeflow/stokes2cni/test_stokes2cni.input b/test/freeflow/stokes2cni/test_stokes2cni.input
index d6517de6fd..c988b87d8f 100644
--- a/test/freeflow/stokes2cni/test_stokes2cni.input
+++ b/test/freeflow/stokes2cni/test_stokes2cni.input
@@ -8,9 +8,11 @@
############################################################
# Mandatory arguments
############################################################
-dtInitial = 0.1 # seconds
-tEnd = 3 # seconds
-gridFile = ./grids/test_stokes2cni.dgf
+[TimeManager]
+DtInitial = 0.1 # seconds
+TEnd = 3 # seconds
+[Grid]
+File = ./grids/test_stokes2cni.dgf
#########################################################################
# Simulation restart
@@ -21,4 +23,4 @@ gridFile = ./grids/test_stokes2cni.dgf
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
#########################################################################
-# restart = ...
+# Restart = ...
--
GitLab