diff --git a/dumux/boxmodels/richards/richardsmodel.hh b/dumux/boxmodels/richards/richardsmodel.hh index e2acd601abad5a5d3e511f2e39fcffd99103d08d..ff71be4f6f4650369cc860b576874639e0c697ec 100644 --- a/dumux/boxmodels/richards/richardsmodel.hh +++ b/dumux/boxmodels/richards/richardsmodel.hh @@ -120,17 +120,6 @@ class RichardsModel : public GET_PROP_TYPE(TypeTag, BaseModel) enum { dim = GridView::dimension }; public: - /*! - * \copydoc Dumux::BoxModel::primaryVarWeight - */ - DUNE_DEPRECATED - Scalar primaryVarWeight(const int vertIdx, const int pvIdx) const - { - if (Indices::pwIdx == pvIdx) - return 1e-6; - return 1; - } - /*! * \brief All relevant primary and secondary of a given * solution to an ouput writer. diff --git a/dumux/boxmodels/richards/richardsproperties.hh b/dumux/boxmodels/richards/richardsproperties.hh index 34f0aacbc171a4be44133211af859ebb29d14269..b03636dd63a9d38bff4ce59afe571bc2362f4905 100644 --- a/dumux/boxmodels/richards/richardsproperties.hh +++ b/dumux/boxmodels/richards/richardsproperties.hh @@ -50,21 +50,16 @@ NEW_TYPE_TAG(BoxRichards, INHERITS_FROM(BoxModel)); ////////////////////////////////////////////////////////////////// NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system -NEW_PROP_TAG(RichardsIndices); //!< DEPRECATED Enumerations used by the Richards models NEW_PROP_TAG(Indices); //!< Enumerations used by the model NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters -NEW_PROP_TAG(SpatialParameters); //!< DEPRECATED The type of the spatial parameters NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (by default extracted from the spatial parameters) NEW_PROP_TAG(MaterialLawParams); //!< The type of the parameter object for the material law (by default extracted from the spatial parameters) NEW_PROP_TAG(FluidSystem); //!< The fluid system to be used for the Richards model NEW_PROP_TAG(WettingPhase); //!< Fluid which represents the wetting phase NEW_PROP_TAG(NonwettingPhase); //!< Fluid which represents the non-wetting phase 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 weight of the upwind direction in the mass conservation equations -NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED The value of the weight of the upwind direction in the mass conservation equations NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< The value of the weight for the upwind mobility in the velocity calculation -NEW_PROP_TAG(MobilityUpwindWeight); //!< DEPRECATED The value of the weight for the upwind mobility in the velocity calculation // \} } diff --git a/dumux/boxmodels/richards/richardspropertydefaults.hh b/dumux/boxmodels/richards/richardspropertydefaults.hh index 1b8b6213f3aa5e4ad77b6bb1dcd3080a5edf8c5f..58b35bcf94b84736a4544f4fb384e8176bcd4879 100644 --- a/dumux/boxmodels/richards/richardspropertydefaults.hh +++ b/dumux/boxmodels/richards/richardspropertydefaults.hh @@ -71,21 +71,17 @@ SET_TYPE_PROP(BoxRichards, FluxVariables, BoxDarcyFluxVariables<TypeTag>); SET_TYPE_PROP(BoxRichards, NewtonController, RichardsNewtonController<TypeTag>); //! The upwind weight for the mass conservation equations -SET_SCALAR_PROP(BoxRichards, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight)); -SET_SCALAR_PROP(BoxRichards, MassUpwindWeight, 1.0);// DEPRECATED +SET_SCALAR_PROP(BoxRichards, ImplicitMassUpwindWeight, 1.0); //! weight for the upwind mobility in the velocity calculation -SET_SCALAR_PROP(BoxRichards, ImplicitMobilityUpwindWeight, GET_PROP_VALUE(TypeTag, MobilityUpwindWeight)); -SET_SCALAR_PROP(BoxRichards, MobilityUpwindWeight, 1.0);// DEPRECATED +SET_SCALAR_PROP(BoxRichards, ImplicitMobilityUpwindWeight, 1.0); //! The class with all index definitions for the model -SET_TYPE_PROP(BoxRichards, Indices, typename GET_PROP_TYPE(TypeTag, RichardsIndices)); -SET_TYPE_PROP(BoxRichards, RichardsIndices, RichardsIndices<TypeTag>);//DEPRECATED +SET_TYPE_PROP(BoxRichards, Indices, RichardsIndices<TypeTag>); //! The spatial parameters to be employed. //! Use BoxSpatialParams by default. -SET_TYPE_PROP(BoxRichards, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters)); -SET_TYPE_PROP(BoxRichards, SpatialParameters, BoxSpatialParams<TypeTag>);//DEPRECATED +SET_TYPE_PROP(BoxRichards, SpatialParams, BoxSpatialParams<TypeTag>); /*! * \brief Set type of the parameter objects for the material law @@ -155,8 +151,7 @@ public: }; // enable gravity by default -SET_BOOL_PROP(BoxRichards, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity)); -SET_BOOL_PROP(BoxRichards, EnableGravity, true);//DEPRECATED +SET_BOOL_PROP(BoxRichards, ProblemEnableGravity, true); // \} }