Commit 4d7bca52 authored by Klaus Mosthaf's avatar Klaus Mosthaf
Browse files

Implemented Commit #8065 for the Stokes models:

The model specific property names for the indices like StokesIndices have
been renamed to Indices for all Stokes box models. This implements FS 128. 
The old names have been kept for compatibility. They cannot be marked deprecated, 
only a // DEPRECATED comment has been made at the appropriate places.

Reviewed by Melanie.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8076 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent fa7e945a
......@@ -51,12 +51,12 @@ NEW_TYPE_TAG(BoxStokes, INHERITS_FROM(BoxModel));
// Property tags
//////////////////////////////////////////////////////////////////
//NEW_PROP_TAG(Soil); //!< The type of the soil properties object
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(StokesIndices); //!< Enumerations for the Stokes models
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);
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
......
......@@ -110,7 +110,7 @@ public:
typedef FluidSystems::OneP<Scalar, Fluid> type;
};
//! The fluid that is used in the single-phase fluidsystem.
//! The fluid that is used in the single-phase fluidsystem
SET_PROP(BoxStokes, Fluid)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
......@@ -118,7 +118,11 @@ public:
typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
};
SET_TYPE_PROP(BoxStokes, StokesIndices, StokesCommonIndices<TypeTag>);
//! Set the indices used by the Stokes model
SET_TYPE_PROP(BoxStokes, Indices, StokesCommonIndices<TypeTag>);
//! DEPRECATED Set the indices used by the Stokes model
SET_TYPE_PROP(BoxStokes, StokesIndices, typename GET_PROP_TYPE(TypeTag, Indices));
//! Choose the type of the employed fluid state.
SET_PROP(BoxStokes, FluidState)
......
......@@ -52,7 +52,7 @@ class StokesVolumeVariables : public BoxVolumeVariables<TypeTag>
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, StokesIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
dim = GridView::dimension,
......
......@@ -50,7 +50,7 @@ NEW_TYPE_TAG(BoxStokes2c, INHERITS_FROM(BoxStokes));
// Property tags
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG(Stokes2cIndices); //!< Enumerations for the compositional stokes models
NEW_PROP_TAG(Stokes2cIndices); //!< DEPRECATED Enumerations for the compositional stokes models
NEW_PROP_TAG(NumComponents); //!< Number of components
}
......
......@@ -72,10 +72,11 @@ SET_TYPE_PROP(BoxStokes2c, VolumeVariables, Stokes2cVolumeVariables<TypeTag>);
//! the FluxVariables property
SET_TYPE_PROP(BoxStokes2c, FluxVariables, Stokes2cFluxVariables<TypeTag>);
//! the Indices for the Stokes2c model
SET_TYPE_PROP(BoxStokes2c,
Stokes2cIndices,
Stokes2cCommonIndices<TypeTag>);
//! Set the Indices for the Stokes2c model.
SET_TYPE_PROP(BoxStokes2c, Indices, Stokes2cCommonIndices<TypeTag>);
//! DEPRECATED Set the Indices for the Stokes2c model.
SET_TYPE_PROP(BoxStokes2c, Stokes2cIndices, typename GET_PROP_TYPE(TypeTag, Indices));
//! Set the number of components to 2
SET_INT_PROP(BoxStokes2c, NumComponents, 2);
......
......@@ -54,7 +54,7 @@ class Stokes2cVolumeVariables : public StokesVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
lCompIdx = Indices::lCompIdx,
......
......@@ -49,7 +49,7 @@ NEW_TYPE_TAG(BoxStokes2cni, INHERITS_FROM(BoxStokes2c));
// Property tags
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG(Stokes2cniIndices); //!< Enumerations for the compositional Stokes models
NEW_PROP_TAG(Stokes2cniIndices); //!< DEPRECATED Enumerations for the compositional Stokes models
NEW_PROP_TAG(NumComponents); //!< Number of components
}
......
......@@ -70,10 +70,11 @@ SET_TYPE_PROP(BoxStokes2cni, VolumeVariables, Stokes2cniVolumeVariables<TypeTag>
//! the FluxVariables property
SET_TYPE_PROP(BoxStokes2cni, FluxVariables, Stokes2cniFluxVariables<TypeTag>);
// the indices for the Stokes2cni model
SET_TYPE_PROP(BoxStokes2cni,
Stokes2cniIndices,
Stokes2cniCommonIndices<TypeTag>);
// Set the indices for the Stokes2cni model
SET_TYPE_PROP(BoxStokes2cni, Indices, Stokes2cniCommonIndices<TypeTag>);
// DEPRECATED Set the indices for the Stokes2cni model
SET_TYPE_PROP(BoxStokes2cni, Stokes2cniIndices, typename GET_PROP_TYPE(TypeTag, Indices));
}
}
#endif
......@@ -53,7 +53,7 @@ class Stokes2cniVolumeVariables : public Stokes2cVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
enum { energyIdx = Indices::energyIdx };
......
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