From 84b462d45a38e042f1236ad45b2aba1e8b51c4c6 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 26 Apr 2018 11:47:34 +0200
Subject: [PATCH] [cleanup] Remove property MaterialLaw (extract from
SpatialParams)
---
dumux/common/properties.hh | 2 --
dumux/material/spatialparams/sequentialfv.hh | 6 ++++--
dumux/porousmediumflow/2p2c/sequential/properties.hh | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index 4d058fc124..7974745b5a 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 efea0982b0..29977ed52f 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 f6a2cb3c66..74bce37e1b 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
--
GitLab