Commit 1a7a6ce1 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

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

stokes 2c: 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@9323 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 837c5b19
...@@ -59,7 +59,7 @@ class Stokes2cFluxVariables : public StokesFluxVariables<TypeTag> ...@@ -59,7 +59,7 @@ class Stokes2cFluxVariables : public StokesFluxVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem; typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables; typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry; typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices; typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum { dim = GridView::dimension }; enum { dim = GridView::dimension };
enum { phaseIdx = Indices::phaseIdx }; enum { phaseIdx = Indices::phaseIdx };
...@@ -86,13 +86,6 @@ public: ...@@ -86,13 +86,6 @@ public:
const Scalar massFraction() const const Scalar massFraction() const
{ return massFraction_; } { return massFraction_; }
/*!
* \brief Return the mass fraction at the integration point.
*/
DUNE_DEPRECATED_MSG("use massFraction() instead")
Scalar massFractionAtIP() const
{ return massFraction(); }
/*! /*!
* \brief Return the molar diffusion coefficient at the integration point. * \brief Return the molar diffusion coefficient at the integration point.
*/ */
...@@ -105,26 +98,12 @@ public: ...@@ -105,26 +98,12 @@ public:
const Scalar eddyDiffusivity() const const Scalar eddyDiffusivity() const
{ return 0; } { return 0; }
/*!
* \brief Return the molar diffusion coefficient at the integration point.
*/
DUNE_DEPRECATED_MSG("use diffusionCoeff() instead")
Scalar diffusionCoeffAtIP() const
{ return diffusionCoeff(); }
/*! /*!
* \brief Return the gradient of the mole fraction at the integration point. * \brief Return the gradient of the mole fraction at the integration point.
*/ */
const DimVector &moleFractionGrad() const const DimVector &moleFractionGrad() const
{ return moleFractionGrad_; } { return moleFractionGrad_; }
/*!
* \brief Return the gradient of the mole fraction at the integration point.
*/
DUNE_DEPRECATED_MSG("use moleFractionGrad() instead")
const DimVector &moleFractionGradAtIP() const
{ return moleFractionGrad(); }
protected: protected:
void calculateValues_(const Problem &problem, void calculateValues_(const Problem &problem,
......
...@@ -46,7 +46,7 @@ class Stokes2cLocalResidual : public StokesLocalResidual<TypeTag> ...@@ -46,7 +46,7 @@ class Stokes2cLocalResidual : public StokesLocalResidual<TypeTag>
typedef StokesLocalResidual<TypeTag> ParentType; typedef StokesLocalResidual<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices; typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum { dim = GridView::dimension }; enum { dim = GridView::dimension };
enum { transportEqIdx = Indices::transportEqIdx }; //!< Index of the transport equation enum { transportEqIdx = Indices::transportEqIdx }; //!< Index of the transport equation
......
...@@ -68,7 +68,7 @@ class Stokes2cModel : public StokesModel<TypeTag> ...@@ -68,7 +68,7 @@ class Stokes2cModel : public StokesModel<TypeTag>
{ {
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices; typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum { dim = GridView::dimension }; enum { dim = GridView::dimension };
enum { transportCompIdx = Indices::transportCompIdx }; enum { transportCompIdx = Indices::transportCompIdx };
......
...@@ -47,7 +47,6 @@ NEW_TYPE_TAG(BoxStokes2c, INHERITS_FROM(BoxStokes)); ...@@ -47,7 +47,6 @@ NEW_TYPE_TAG(BoxStokes2c, INHERITS_FROM(BoxStokes));
// Property tags // Property tags
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
NEW_PROP_TAG(Stokes2cIndices); //!< DEPRECATED Enumerations for the compositional stokes models
NEW_PROP_TAG(NumComponents); //!< Number of components NEW_PROP_TAG(NumComponents); //!< Number of components
} }
......
...@@ -70,8 +70,7 @@ SET_TYPE_PROP(BoxStokes2c, VolumeVariables, Stokes2cVolumeVariables<TypeTag>); ...@@ -70,8 +70,7 @@ SET_TYPE_PROP(BoxStokes2c, VolumeVariables, Stokes2cVolumeVariables<TypeTag>);
SET_TYPE_PROP(BoxStokes2c, FluxVariables, Stokes2cFluxVariables<TypeTag>); SET_TYPE_PROP(BoxStokes2c, FluxVariables, Stokes2cFluxVariables<TypeTag>);
//! Set the Indices for the Stokes2c model. //! Set the Indices for the Stokes2c model.
SET_TYPE_PROP(BoxStokes2c, Indices, typename GET_PROP_TYPE(TypeTag, Stokes2cIndices)); SET_TYPE_PROP(BoxStokes2c, Indices, Stokes2cCommonIndices<TypeTag>);
SET_TYPE_PROP(BoxStokes2c, Stokes2cIndices, Stokes2cCommonIndices<TypeTag>);//DEPRECATED
//! Set the number of components to 2 //! Set the number of components to 2
SET_INT_PROP(BoxStokes2c, NumComponents, 2); SET_INT_PROP(BoxStokes2c, NumComponents, 2);
...@@ -85,14 +84,6 @@ public: ...@@ -85,14 +84,6 @@ public:
typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type; typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
}; };
//! DEPRECATED Choose the considered phase (single-phase system); the gas phase is used
SET_PROP(BoxStokes2c, PhaseIndex)
{
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
static constexpr int value = FluidSystem::nPhaseIdx;
};
//! Choose the considered phase (single-phase system); the gas phase is used //! Choose the considered phase (single-phase system); the gas phase is used
SET_PROP(BoxStokes2c, PhaseIdx) SET_PROP(BoxStokes2c, PhaseIdx)
{ {
......
...@@ -94,7 +94,7 @@ class Stokes2cTestProblem : public StokesProblem<TypeTag> ...@@ -94,7 +94,7 @@ class Stokes2cTestProblem : public StokesProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager; typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices; typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
// Number of equations and grid dimension // 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