diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh index 4d058fc124dab76d0aff1936726175807b234201..7974745b5afe63ee63d57eb2d91d3fadffb37161 100644 --- a/dumux/common/properties.hh +++ b/dumux/common/properties.hh @@ -113,8 +113,6 @@ NEW_PROP_TAG(PrimaryVariableSwitch); //!< The primary variable swi NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computation of the effective diffusivity NEW_PROP_TAG(ThermalConductivityModel); //!< Model to be used for the calculation of the effective conductivity NEW_PROP_TAG(VelocityOutput); //!< specifies the velocity calculation module to be used - -NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatial parameters) NEW_PROP_TAG(Formulation); //!< The formulation of the model // TODO: is this useful? -> everything is a constraint solver just a different type NEW_PROP_TAG(UseConstraintSolver); //!< Whether to use a contraint solver for computing the secondary variables diff --git a/dumux/material/spatialparams/sequentialfv.hh b/dumux/material/spatialparams/sequentialfv.hh index efea0982b08b66b479d55fe9b908a74c3b00b566..29977ed52f85ab17ff85046b561c8e4cd70e1e91 100644 --- a/dumux/material/spatialparams/sequentialfv.hh +++ b/dumux/material/spatialparams/sequentialfv.hh @@ -28,8 +28,10 @@ #include <dumux/common/properties.hh> #include "sequentialfv1p.hh" -namespace Dumux -{ +namespace Dumux { +namespace Properties +{ NEW_PROP_TAG( MaterialLaw ); } + /*! * \ingroup SpatialParameters * \brief The base class for spatial parameters of a multi-phase problem using the diff --git a/dumux/porousmediumflow/2p2c/sequential/properties.hh b/dumux/porousmediumflow/2p2c/sequential/properties.hh index f6a2cb3c66a38a3c7bee0eeae5c4ce512ab7470b..74bce37e1bdbe748c76456a648cdc20869bc0791 100644 --- a/dumux/porousmediumflow/2p2c/sequential/properties.hh +++ b/dumux/porousmediumflow/2p2c/sequential/properties.hh @@ -66,6 +66,7 @@ NEW_TYPE_TAG(SequentialTwoPTwoC, INHERITS_FROM(Pressure, Transport, IMPET)); ////////////////////////////////////////////////////////////////// NEW_PROP_TAG( Indices ); NEW_PROP_TAG( SpatialParams ); //!< The type of the soil properties object +NEW_PROP_TAG( MaterialLaw ); //!< The type of the material law 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