Commit 0205fb96 authored by hanchuan's avatar hanchuan Committed by Timo Koch
Browse files

[numeqvector] Deprecate NumEqVector property. To be replaces by Dumux::NumEqVector trait

parent cf015263
...@@ -48,7 +48,7 @@ struct Grid { using type = UndefinedProperty; }; //!< The DUNE ...@@ -48,7 +48,7 @@ struct Grid { using type = UndefinedProperty; }; //!< The DUNE
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct PrimaryVariables { using type = UndefinedProperty; }; //!< A vector of primary variables struct PrimaryVariables { using type = UndefinedProperty; }; //!< A vector of primary variables
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct NumEqVector { using type = UndefinedProperty; }; //!< A vector of size number equations that can be used for Neumann fluxes, sources, residuals, ... struct [[deprecated("NumEqVector will be removed after 3.4. Implemented in dumux/common/numeqvector.hh instead.")]] NumEqVector { using type = UndefinedProperty; }; //!< A vector of size number equations that can be used for Neumann fluxes, sources, residuals, ...
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct ModelTraits { using type = UndefinedProperty; }; //!< Traits class encapsulating model specifications struct ModelTraits { using type = UndefinedProperty; }; //!< Traits class encapsulating model specifications
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
......
...@@ -45,13 +45,18 @@ struct ModelProperties {}; ...@@ -45,13 +45,18 @@ struct ModelProperties {};
template<class TypeTag> template<class TypeTag>
struct Scalar<TypeTag, TTag::ModelProperties> { using type = double; }; struct Scalar<TypeTag, TTag::ModelProperties> { using type = double; };
DUNE_NO_DEPRECATED_BEGIN
//! Set the default vector with size number of equations to a field vector //! Set the default vector with size number of equations to a field vector
template<class TypeTag> template<class TypeTag>
struct NumEqVector<TypeTag, TTag::ModelProperties> { using type = Dune::FieldVector<GetPropType<TypeTag, Properties::Scalar>, GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; }; struct NumEqVector<TypeTag, TTag::ModelProperties> { using type = Dune::FieldVector<GetPropType<TypeTag, Properties::Scalar>, GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; };
DUNE_NO_DEPRECATED_END
DUNE_NO_DEPRECATED_BEGIN
//! Set the default primary variable vector to a vector of size of number of equations //! Set the default primary variable vector to a vector of size of number of equations
//! TODO: this needs to be adapted after release 3.4 when Properties::NumEqVector is removed.
template<class TypeTag> template<class TypeTag>
struct PrimaryVariables<TypeTag, TTag::ModelProperties> { using type = GetPropType<TypeTag, Properties::NumEqVector>; }; struct PrimaryVariables<TypeTag, TTag::ModelProperties> { using type = GetPropType<TypeTag, Properties::NumEqVector>; };
DUNE_NO_DEPRECATED_END
//! do not specific any model-specific default parameters here //! do not specific any model-specific default parameters here
template<class TypeTag> template<class TypeTag>
......
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