Commit b615b025 authored by Timo Koch's avatar Timo Koch
Browse files

Remove property MaterialLawParams, use MaterialLaw::Params

parent 6bdfb87a
......@@ -132,7 +132,6 @@ NEW_PROP_TAG(ThermalConductivityModel); //! Model to be used for the
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(MaterialLawParams); //! The context material law (extracted from the spatial parameters)
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(Formulation); //! The formulation of the model
......
......@@ -24,19 +24,12 @@
#ifndef DUMUX_PLOT_FLUID_MATRIX_LAW_HH
#define DUMUX_PLOT_FLUID_MATRIX_LAW_HH
#include <dumux/common/basicproperties.hh>
#include <dumux/common/properties.hh>
#include <dumux/io/gnuplotinterface.hh>
namespace Dumux
{
namespace Properties
{
NEW_PROP_TAG(MaterialLaw);
NEW_PROP_TAG(MaterialLawParams);
NEW_PROP_TAG(Scalar);
}
/*!
*\brief Interface for plotting the two-phase fluid-matrix-interaction laws
*/
......@@ -44,7 +37,7 @@ template<class TypeTag>
class PlotMaterialLaw
{
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
......
......@@ -24,19 +24,11 @@
#ifndef DUMUX_PLOT_FLUID_MATRIX_LAW_HH
#define DUMUX_PLOT_FLUID_MATRIX_LAW_HH
#include <dumux/common/basicproperties.hh>
#include <dumux/common/properties.hh>
#include <dumux/io/gnuplotinterface.hh>
namespace Dumux
{
namespace Properties
{
NEW_PROP_TAG(MaterialLaw);
NEW_PROP_TAG(MaterialLawParams);
NEW_PROP_TAG(Scalar);
}
/*!
*\brief Interface for plotting the three-phase fluid-matrix-interaction laws
*
......@@ -46,7 +38,7 @@ template<class TypeTag>
class PlotMaterialLaw
{
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
......
......@@ -26,14 +26,10 @@
#ifndef DUMUX_IMPLICIT_SPATIAL_PARAMS_HH
#define DUMUX_IMPLICIT_SPATIAL_PARAMS_HH
#include <dune/common/properties.hh>
#include "implicit1p.hh"
namespace Dumux {
// forward declaration of property tags
namespace Properties {
NEW_PROP_TAG(MaterialLaw);
NEW_PROP_TAG(MaterialLawParams);
}
/*!
* \ingroup SpatialParameters
......@@ -52,7 +48,7 @@ class ImplicitSpatialParams: public ImplicitSpatialParamsOneP<TypeTag>
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLawParams);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params;
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using CoordScalar = typename GridView::ctype;
......
......@@ -60,7 +60,6 @@ NEW_TYPE_TAG(SequentialTwoP, INHERITS_FROM(SequentialModel));
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG( SpatialParams ); //!< The 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( ProblemEnableGravity); //!< 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
......@@ -153,19 +152,6 @@ public:
//! The spatial parameters to be employed. Use FVSpatialParams by default.
SET_TYPE_PROP(SequentialTwoP, SpatialParams, FVSpatialParams<TypeTag>);
/*!
* \brief Set the property for the material parameters by extracting
* it from the material law.
*/
SET_PROP(SequentialTwoP, MaterialLawParams)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
public:
typedef typename MaterialLaw::Params type;
};
//! Default error term factor
SET_SCALAR_PROP(SequentialTwoP, ImpetErrorTermFactor, 0.5);
//! Default lower threshold for evaluation of an error term
......
......@@ -55,7 +55,6 @@ NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
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(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
......
......@@ -53,7 +53,7 @@ class TwoPOneCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
......
......@@ -65,7 +65,6 @@ NEW_PROP_TAG(FluidSystem); //!< The type of the multi-component relations
NEW_PROP_TAG(FluidState); //!< The type of the 2p2c fluid state
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(EffectiveDiffusivityModel); //!< The employed model for the computation of the effective diffusivity
NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
......
......@@ -112,16 +112,6 @@ SET_INT_PROP(TwoPTwoC,
//! Set as default that no component mass balance is replaced by the total mass balance
SET_INT_PROP(TwoPTwoC, ReplaceCompEqIdx, 2);
//! Set the property for the material parameters by extracting it from the material law.
SET_PROP(TwoPTwoC, MaterialLawParams)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
public:
typedef typename MaterialLaw::Params type;
};
//! Use the 2p2c local residual operator
SET_TYPE_PROP(TwoPTwoC, LocalResidual, CompositionalLocalResidual<TypeTag>);
......
......@@ -115,16 +115,6 @@ public:
using type = CompositionalFluidState<Scalar, FluidSystem>;
};
//! Set the property for the material parameters by extracting it from the material law.
SET_PROP(TwoPNC, MaterialLawParams)
{
private:
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw));
public:
using type = typename MaterialLaw::Params;
};
/////////////////////////////////////////////////
// Properties for the non-isothermal 2pnc model
/////////////////////////////////////////////////
......
......@@ -63,7 +63,7 @@ class TwoPNCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLawParams);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params;
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum
......
......@@ -61,7 +61,7 @@ class TwoPNCMinVolumeVariables : public TwoPNCVolumeVariables<TypeTag>
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLawParams);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params;
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum
......
......@@ -55,7 +55,7 @@ class ThreePThreeCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLawParams);
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params;
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
// constraint solvers
......
......@@ -56,7 +56,6 @@ NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
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(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
......
......@@ -62,7 +62,7 @@ class ThreePWaterOilVolumeVariables : public ImplicitVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams;
// constraint solvers
typedef Dumux::MiscibleMultiPhaseComposition<Scalar, FluidSystem> MiscibleMultiPhaseComposition;
......
......@@ -50,7 +50,7 @@ class CO2VolumeVariables: public TwoPTwoCVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
......
......@@ -91,7 +91,6 @@ NEW_PROP_TAG(VtkAddInterfacialArea);
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatialParams)
NEW_PROP_TAG(MaterialLawParams); //!< The context material law (extracted from the spatialParams)
//! The compositional twophase system of fluids which is considered
NEW_PROP_TAG(FluidSystem);
......
......@@ -90,19 +90,6 @@ public:
static const unsigned int value = Indices::numPrimaryVars;
};
/*!
* \brief Set the property for the material parameters by extracting
* it from the material law.
*/
SET_PROP(MPNC, MaterialLawParams)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
public:
typedef typename MaterialLaw::Params type;
};
/*!
* \brief Set the thermodynamic constraint solver which calculates the
* composition of any phase given all component fugacities.
......
......@@ -60,7 +60,7 @@ class MPNCVolumeVariables
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename FluidSystem::ParameterCache ParameterCache;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
......
......@@ -54,7 +54,7 @@ class MPNCVolumeVariablesIA<TypeTag, enableKinetic, /*numEnergyEqs=*/3>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams;
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
......@@ -499,7 +499,7 @@ class MPNCVolumeVariablesIA<TypeTag, /*enableKinetic=*/true, /*numEnergyEqs=*/0>
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { sherwoodFormulation = GET_PROP_VALUE(TypeTag, SherwoodFormulation)} ;
typedef Dune::FieldVector<Scalar,dimWorld> GlobalPosition;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams;
public:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment