Commit 93db40e7 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

stokes 2cni: remove everything deprecated during 2.2-svn. This mainly includes...

stokes 2cni: remove everything deprecated during 2.2-svn. This mainly includes property, parameter and member function names. Reviewed by Christoph

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9324 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 1a7a6ce1
......@@ -48,7 +48,7 @@ class Stokes2cniLocalResidual : public Stokes2cLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum { dim = GridView::dimension };
enum { energyEqIdx = Indices::energyEqIdx }; //!< Index of the transport equation
......
......@@ -78,12 +78,11 @@ class Stokes2cniModel : public Stokes2cModel<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum { dim = GridView::dimension };
enum { transportCompIdx = Indices::transportCompIdx };
enum { lCompIdx = transportCompIdx } DUNE_DEPRECATED_MSG("use transportCompIdx instead");
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx) };
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
......
......@@ -42,12 +42,6 @@ namespace Properties
//! The type tag for the non-isothermal compositional Stokes problems
NEW_TYPE_TAG(BoxStokes2cni, INHERITS_FROM(BoxStokes2c));
//////////////////////////////////////////////////////////////////
// Property tags
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG(Stokes2cniIndices); //!< DEPRECATED Enumerations for the compositional Stokes models
NEW_PROP_TAG(NumComponents); //!< Number of components
}
}
......
......@@ -68,8 +68,7 @@ SET_TYPE_PROP(BoxStokes2cni, VolumeVariables, Stokes2cniVolumeVariables<TypeTag>
SET_TYPE_PROP(BoxStokes2cni, FluxVariables, Stokes2cniFluxVariables<TypeTag>);
// Set the indices for the Stokes2cni model
SET_TYPE_PROP(BoxStokes2cni, Indices, typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices));
SET_TYPE_PROP(BoxStokes2cni, Stokes2cniIndices, Stokes2cniCommonIndices<TypeTag>);
SET_TYPE_PROP(BoxStokes2cni, Indices, Stokes2cniCommonIndices<TypeTag>);
}
}
#endif
......@@ -93,7 +93,7 @@ class Stokes2cniTestProblem : public StokesProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum { // Number of equations and grid dimension
......
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