diff --git a/dumux/freeflow/stokes/stokesfluxvariables.hh b/dumux/freeflow/stokes/stokesfluxvariables.hh
index d2facdfb76cfdb1dd75b2438d42716e5cc65f649..0420fb04a2dcc1ddbe3fbdf081459d4681962111 100644
--- a/dumux/freeflow/stokes/stokesfluxvariables.hh
+++ b/dumux/freeflow/stokes/stokesfluxvariables.hh
@@ -186,14 +186,6 @@ public:
Scalar pressure() const
{ return pressure_; }
- /*!
- * \brief Return the pressure \f$\mathrm{[Pa]}\f$ at the integration
- * point.
- */
- DUNE_DEPRECATED_MSG("use pressure() instead")
- Scalar pressureAtIP() const
- { return pressure(); }
-
/*!
* \brief Return the mass density \f$ \mathrm{[kg/m^3]} \f$ at the integration
* point.
@@ -201,27 +193,12 @@ public:
Scalar density() const
{ return density_; }
- /*!
- * \brief Return the mass density \f$ \mathrm{[kg/m^3]} \f$ at the integration
- * point.
- */
- DUNE_DEPRECATED_MSG("use density() instead")
- Scalar densityAtIP() const
- { return density(); }
-
/*!
* \brief Return the molar density \f$ \mathrm{[mol/m^3]} \f$ at the integration point.
*/
const Scalar molarDensity() const
{ return molarDensity_; }
- /*!
- * \brief Return the molar density \f$ \mathrm{[mol/m^3]} \f$ at the integration point.
- */
- DUNE_DEPRECATED_MSG("use molarDensity() instead")
- const Scalar molarDensityAtIP() const
- { return molarDensity(); }
-
/*!
* \brief Return the dynamic viscosity \f$ \mathrm{[Pa\cdot s]} \f$ at the integration
* point.
@@ -229,14 +206,6 @@ public:
Scalar viscosity() const
{ return viscosity_; }
- /*!
- * \brief Return the dynamic viscosity \f$ \mathrm{[Pa\cdot s]} \f$ at the integration
- * point.
- */
- DUNE_DEPRECATED_MSG("use viscosity() instead")
- Scalar viscosityAtIP() const
- { return viscosity(); }
-
/*!
* \brief Return the velocity \f$ \mathrm{[m/s]} \f$ at the integration
* point multiplied by the normal and the area.
@@ -244,40 +213,18 @@ public:
Scalar normalVelocity() const
{ return normalvelocity_; }
- /*!
- * \brief Return the velocity \f$ \mathrm{[m/s]} \f$ at the integration
- * point multiplied by the normal and the area.
- */
- DUNE_DEPRECATED_MSG("use normalVelocity() instead")
- Scalar normalVelocityAtIP() const
- { return normalVelocity(); }
-
/*!
* \brief Return the pressure gradient at the integration point.
*/
const DimVector &pressureGrad() const
{ return pressureGrad_; }
- /*!
- * \brief Return the pressure gradient at the integration point.
- */
- DUNE_DEPRECATED_MSG("use pressureGrad() instead")
- const DimVector &pressureGradAtIP() const
- { return pressureGrad(); }
-
/*!
* \brief Return the velocity vector at the integration point.
*/
const DimVector &velocity() const
{ return velocity_; }
- /*!
- * \brief Return the velocity vector at the integration point.
- */
- DUNE_DEPRECATED_MSG("use velocity() instead")
- const DimVector &velocityAtIP() const
- { return velocity(); }
-
/*!
* \brief Return the velocity gradient at the integration
* point of a face.
@@ -285,14 +232,6 @@ public:
const DimMatrix &velocityGrad() const
{ return velocityGrad_; }
- /*!
- * \brief Return the velocity gradient at the integration
- * point of a face.
- */
- DUNE_DEPRECATED_MSG("use velocityGrad() instead")
- const DimMatrix &velocityGradAtIP() const
- { return velocityGrad(); }
-
/*!
* \brief Return the dynamic eddy viscosity
* \f$\mathrm{[Pa\cdot s]} = \mathrm{[N\cdot s/m^2]}\f$ (if implemented).
diff --git a/dumux/freeflow/stokes/stokeslocalresidual.hh b/dumux/freeflow/stokes/stokeslocalresidual.hh
index 10c565e82140dc4b461c48331a896023e9386e59..1808f67911d8e556c5070b730f8851edcc8e4710 100644
--- a/dumux/freeflow/stokes/stokeslocalresidual.hh
+++ b/dumux/freeflow/stokes/stokeslocalresidual.hh
@@ -57,7 +57,7 @@ protected:
typedef typename GET_PROP_TYPE(TypeTag, BaseLocalResidual) ParentType;
typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, StokesIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/dumux/freeflow/stokes/stokesproperties.hh b/dumux/freeflow/stokes/stokesproperties.hh
index ddddb97b18aac6222d85cee82855ba376de11a29..1413fd7159c95b090757f4d52ebcb130122c8775 100644
--- a/dumux/freeflow/stokes/stokesproperties.hh
+++ b/dumux/freeflow/stokes/stokesproperties.hh
@@ -48,23 +48,16 @@ NEW_TYPE_TAG(BoxStokes, INHERITS_FROM(BoxModel));
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind parameter for the mobility
-NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED The value of the upwind parameter for the mobility
-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); //!< The employed fluid system
NEW_PROP_TAG(FluidState);
NEW_PROP_TAG(StokesStabilizationAlpha); //!< The parameter for the stabilization
-NEW_PROP_TAG(StabilizationAlpha); //!< DEPRECATED The parameter for the stabilization
NEW_PROP_TAG(StokesStabilizationBeta); //!< The parameter for the stabilization at boundaries
-NEW_PROP_TAG(StabilizationBeta); //!< DEPRECATED The parameter for the stabilization at boundaries
NEW_PROP_TAG(EnableNavierStokes); //!< Returns whether Navier-Stokes should be solved instead of plain Stokes
-NEW_PROP_TAG(PhaseIndex); //!< DEPRECATED A phase index in case that a two-phase fluidsystem is used
NEW_PROP_TAG(PhaseIdx); //!< A phase index in case that a two-phase fluidsystem is used
-NEW_PROP_TAG(SpatialParameters); //!< DEPRECATED The type of the spatial parameters
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
NEW_PROP_TAG(Scaling); //!Defines Scaling of the model
}
diff --git a/dumux/freeflow/stokes/stokespropertydefaults.hh b/dumux/freeflow/stokes/stokespropertydefaults.hh
index 55727f48c1d8ee59c52ae53fef54df437cde3139..b6bc9855bbf552bff4d5d6c4e38feacd4c3c2eca 100644
--- a/dumux/freeflow/stokes/stokespropertydefaults.hh
+++ b/dumux/freeflow/stokes/stokespropertydefaults.hh
@@ -95,8 +95,7 @@ SET_TYPE_PROP(BoxStokes, VolumeVariables, StokesVolumeVariables<TypeTag>);
SET_TYPE_PROP(BoxStokes, FluxVariables, StokesFluxVariables<TypeTag>);
//! the upwind factor.
-SET_SCALAR_PROP(BoxStokes, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight));
-SET_SCALAR_PROP(BoxStokes, MassUpwindWeight, 1.0);
+SET_SCALAR_PROP(BoxStokes, ImplicitMassUpwindWeight, 1.0);
//! The fluid system to use by default
SET_PROP(BoxStokes, FluidSystem)
@@ -116,8 +115,7 @@ public:
};
//! Set the indices used by the Stokes model
-SET_TYPE_PROP(BoxStokes, Indices, typename GET_PROP_TYPE(TypeTag, StokesIndices));
-SET_TYPE_PROP(BoxStokes, StokesIndices, StokesCommonIndices<TypeTag>);//DEPRECATED
+SET_TYPE_PROP(BoxStokes, Indices, StokesCommonIndices<TypeTag>);
//! Choose the type of the employed fluid state.
SET_PROP(BoxStokes, FluidState)
@@ -133,9 +131,6 @@ public:
// Used for the computation of the pressure gradients
SET_BOOL_PROP(BoxStokes, EvalGradientsAtSCVCenter, true);
-//! DEPRECATED Set the phaseIndex per default to zero (important for two-phase fluidsystems).
-SET_INT_PROP(BoxStokes, PhaseIndex, 0);
-
//! Set the phaseIndex per default to zero (important for two-phase fluidsystems).
SET_INT_PROP(BoxStokes, PhaseIdx, 0);
@@ -143,16 +138,13 @@ SET_INT_PROP(BoxStokes, PhaseIdx, 0);
SET_BOOL_PROP(BoxStokes, EnableNavierStokes, false);
//! A stabilization factor. Set negative for stabilization and to zero for no stabilization
-SET_SCALAR_PROP(BoxStokes, StokesStabilizationAlpha, GET_PROP_VALUE(TypeTag, StabilizationAlpha));
-SET_SCALAR_PROP(BoxStokes, StabilizationAlpha, 0.0);//DEPRECATED
+SET_SCALAR_PROP(BoxStokes, StokesStabilizationAlpha, 0.0);
//! Stabilization factor for the boundaries
-SET_SCALAR_PROP(BoxStokes, StokesStabilizationBeta, GET_PROP_VALUE(TypeTag, StabilizationBeta));
-SET_SCALAR_PROP(BoxStokes, StabilizationBeta, 0.0);//DEPRECATED
+SET_SCALAR_PROP(BoxStokes, StokesStabilizationBeta, 0.0);
// enable gravity by default
-SET_BOOL_PROP(BoxStokes, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
-SET_BOOL_PROP(BoxStokes, EnableGravity, true);//DEPRECATED
+SET_BOOL_PROP(BoxStokes, ProblemEnableGravity, true);
}
diff --git a/test/freeflow/stokes/stokestestproblem.hh b/test/freeflow/stokes/stokestestproblem.hh
index f34157687fcf9fe35224d2d31ebb3f2aa27ab508..5b5bfe4f0a20ef4964ee291c1f374f13d779e13d 100644
--- a/test/freeflow/stokes/stokestestproblem.hh
+++ b/test/freeflow/stokes/stokestestproblem.hh
@@ -94,7 +94,7 @@ class StokesTestProblem : 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, StokesIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
// Number of equations and grid dimension