diff --git a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh index cdc28a1917f2aa66e68d60f0643e42f8bef6fad2..08dcb826198e3b1516d68a0899ae98a37f12841d 100644 --- a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh +++ b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh @@ -68,6 +68,8 @@ class Stokes2cFluxVariables : public StokesFluxVariables<TypeTag> typedef Dune::FieldVector<Scalar, dim> DimVector; public: + /* Use Stokes n-component Model freeflow/stokesnc.The 2c model gets replaced by the more general nc model. Adaption to the new model is straight forward. Please not that several functions in the fluxvariables now need an input argument compIdx. Associated variables are of size number of components. The nc model uses mole fraction formulations of the transport equations as default. Mass fractions can be employed via the poperty UseMoles.*/ + DUNE_DEPRECATED_MSG("Use stokesnc model") Stokes2cFluxVariables(const Problem &problem, const Element &element, const FVElementGeometry &fvGeometry, diff --git a/dumux/freeflow/stokes2c/stokes2clocalresidual.hh b/dumux/freeflow/stokes2c/stokes2clocalresidual.hh index 65c2f7dbbce3afd7c60121b69535bbced066f2cf..2dea4dcb23fd29b222d2529803e577153641b8b9 100644 --- a/dumux/freeflow/stokes2c/stokes2clocalresidual.hh +++ b/dumux/freeflow/stokes2c/stokes2clocalresidual.hh @@ -63,6 +63,10 @@ class Stokes2cLocalResidual : public StokesLocalResidual<TypeTag> typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; public: + /* Use Stokes n-component Model freeflow/stokesnc.The 2c model gets replaced by the more general nc model. Adaption to the new model is straight forward. Please not that several functions in the fluxvariables now need an input argument compIdx. Associated variables are of size number of components. The nc model uses mole fraction formulations of the transport equations as default. Mass fractions can be employed via the poperty UseMoles.*/ + DUNE_DEPRECATED_MSG("Use stokesnc model") + Stokes2cLocalResidual(){} + /*! * \brief Evaluate the stored amount of quantities additional to the Stokes model * (transport equation). diff --git a/dumux/freeflow/stokes2c/stokes2cmodel.hh b/dumux/freeflow/stokes2c/stokes2cmodel.hh index bfba16d402037d0a22309305998a33cab8a4f711..ad143a53bd95bb532078253dc60c184ea239a821 100644 --- a/dumux/freeflow/stokes2c/stokes2cmodel.hh +++ b/dumux/freeflow/stokes2c/stokes2cmodel.hh @@ -65,7 +65,7 @@ namespace Dumux { */ template<class TypeTag> -class Stokes2cModel : public StokesModel<TypeTag> + class Stokes2cModel : public StokesModel<TypeTag> { typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; @@ -85,6 +85,10 @@ class Stokes2cModel : public StokesModel<TypeTag> typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables; public: + /* Use Stokes n-component Model freeflow/stokesnc.The 2c model gets replaced by the more general nc model. Adaption to the new model is straight forward. Please not that several functions in the fluxvariables now need an input argument compIdx. Associated variables are of size number of components. The nc model uses mole fraction formulations of the transport equations as default. Mass fractions can be employed via the poperty UseMoles.*/ + DUNE_DEPRECATED_MSG("Use stokesnc model") + Stokes2cModel(){} + //! \copydoc ImplicitModel::addOutputVtkFields template <class MultiWriter> void addOutputVtkFields(const SolutionVector &sol, @@ -151,7 +155,6 @@ public: writer.attachVertexData(velocity, "v", dim); } }; - } #include "stokes2cpropertydefaults.hh" diff --git a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh index 333e66568f1b725b9a01472bd44d931a8da80993..e99249e6214798c7d4f970dbd324d53fcd78b67a 100644 --- a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh +++ b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh @@ -63,6 +63,10 @@ class Stokes2cVolumeVariables : public StokesVolumeVariables<TypeTag> enum { massOrMoleFracIdx = Indices::massOrMoleFracIdx }; public: + /* Use Stokes n-component Model freeflow/stokesnc.The 2c model gets replaced by the more general nc model. Adaption to the new model is straight forward. Please not that several functions in the fluxvariables now need an input argument compIdx. Associated variables are of size number of components. The nc model uses mole fraction formulations of the transport equations as default. Mass fractions can be employed via the poperty UseMoles.*/ + DUNE_DEPRECATED_MSG("Use stokesnc model") + Stokes2cVolumeVariables(){} + /*! * \copydoc ImplicitVolumeVariables::update() */