Skip to content
Snippets Groups Projects
Commit c75bb77e authored by Dennis Gläser's avatar Dennis Gläser
Browse files

Merge branch 'cleanup/old-properties' into 'master'

Cleanup/old properties

See merge request !2786
parents 40c60bfa a103b1ab
No related branches found
No related tags found
Loading
Pipeline #7589 passed
Pipeline: dumux-lecture

#7595

    Pipeline: dumux

    #7593

      Pipeline: dumux

      #7592

        +2
        ...@@ -87,11 +87,6 @@ ...@@ -87,11 +87,6 @@
        keywordstyle=\color{dumuxBlue}\ttfamily\let\textcolor\textcolordummy, keywordstyle=\color{dumuxBlue}\ttfamily\let\textcolor\textcolordummy,
        stringstyle=\color{BrickRed}\ttfamily\let\textcolor\textcolordummy, stringstyle=\color{BrickRed}\ttfamily\let\textcolor\textcolordummy,
        commentstyle=\color[gray]{0.35}\ttfamily\itshape\let\textcolor\textcolordummy, commentstyle=\color[gray]{0.35}\ttfamily\itshape\let\textcolor\textcolordummy,
        emph={NEW_TYPE_TAG, NEW_PROP_TAG, UNSET_PROP, TTAG, PTAG,
        SET_PROP, GET_PROP, GET_PROP_VALUE, GET_PROP_TYPE,
        SET_BOOL_PROP, SET_STRING_PROP, SET_SCALAR_PROP, SET_TYPE_PROP, SET_INT_PROP,
        GET_BOOL_PROP, GET_STRING_PROP, GET_SCALAR_PROP, GET_TYPE_PROP, GET_INT_PROP,
        GET_PARAM, GET_PARAM_FROM_GROUP, GET_RUNTIME_PARAM, GET_RUNTIME_PARAM_FROM_GROUP},
        emphstyle=\color{OliveGreen}\let\textcolor\textcolordummy, emphstyle=\color{OliveGreen}\let\textcolor\textcolordummy,
        directivestyle=\color{Brown}\ttfamily\let\textcolor\textcolordummy, directivestyle=\color{Brown}\ttfamily\let\textcolor\textcolordummy,
        } }
        ......
        ...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
        namespace Dumux { namespace Dumux {
        namespace Properties { namespace Properties {
        // create some Properties (equivalent to old macro NEW_PROP_TAG(...)) // create some properties:
        // the first type tag is the actual TypeTag for which the property will be obtained // the first type tag is the actual TypeTag for which the property will be obtained
        // (can be used to make properties depend on other properties), // (can be used to make properties depend on other properties),
        // the second type tag is for parital specialization (equivalent to old macro SET_PROP(...), see below) // the second type tag is for partial specialization
        // the default property should be always undefined to produce a good error message // the default property should be always undefined to produce a good error message
        // if the user attempt to get an unset property // if the user attempt to get an unset property
        template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
        ...@@ -50,7 +50,7 @@ template<class TypeTag, class MyTypeTag> ...@@ -50,7 +50,7 @@ template<class TypeTag, class MyTypeTag>
        struct UseTpfaFlux { using type = UndefinedProperty; }; struct UseTpfaFlux { using type = UndefinedProperty; };
        namespace TTag { namespace TTag {
        // create some TypeTags (equivalent to old macro NEW_TYPE_TAG(..., INHERITS_FROM(...))) // create some type tags:
        // the tuple is sorted by precedence, the first one overwriting the following // the tuple is sorted by precedence, the first one overwriting the following
        struct Base { }; struct Base { };
        struct Grid { }; struct Grid { };
        ...@@ -61,7 +61,7 @@ struct OnePTest { using InheritsFrom = std::tuple<OnePModel, BoxDisc>; }; ...@@ -61,7 +61,7 @@ struct OnePTest { using InheritsFrom = std::tuple<OnePModel, BoxDisc>; };
        } // end namespace TTag } // end namespace TTag
        // set and overwrite some properties (equivalent to old macro SET_PROP(...){};) // set and overwrite some properties
        template<class TypeTag> template<class TypeTag>
        struct Scalar<TypeTag, TTag::Base> { using type = float; }; struct Scalar<TypeTag, TTag::Base> { using type = float; };
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment