[macros] Replace further macros

exercises/exercise-basic/injection2p2cproblem.hh

@@ -55,9 +55,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::Injection2p2c> { using type = Injection2p2cProblem<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2p2c, SpatialParams,
-              InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                     GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::Injection2p2c>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set fluid configuration
 template<class TypeTag>

exercises/exercise-basic/injection2pniproblem.hh

@@ -61,9 +61,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::Injection2pNITypeTag> { using type = InjectionProblem2PNI<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2pNITypeTag, SpatialParams,
-              InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                     GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::Injection2pNITypeTag>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set fluid configuration
 template<class TypeTag>

exercises/exercise-basic/injection2pproblem.hh

@@ -57,9 +57,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2p, SpatialParams,
-              InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                     GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::Injection2p>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set fluid configuration
 template<class TypeTag>

exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh

@@ -70,9 +70,9 @@ template<class TypeTag>
 struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePNC> { static constexpr int value = 3; };
 
 //! Use a model with constant tortuosity for the effective diffusivity
-SET_TYPE_PROP(DarcyOnePNC, EffectiveDiffusivityModel,
-              DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>);
-
+template<class TypeTag>
+struct EffectiveDiffusivityModel<TypeTag, DarcyOnePNC>
+{ using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
 // Set the grid type
 template<class TypeTag>
 struct Grid<TypeTag, TTag::DarcyOnePNC> { using type = Dune::YaspGrid<2>; };

exercises/exercise-fluidsystem/2p2cproblem.hh

@@ -58,9 +58,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = ExerciseFluidsystemProblemTwoPTwoC<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams,
-              ExerciseFluidsystemSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                         GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = ExerciseFluidsystemSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set grid and the grid creator to be used
 template<class TypeTag>

exercises/exercise-fluidsystem/2pproblem.hh

@@ -72,9 +72,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = ExerciseFluidsystemProblemTwoP<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams,
-              ExerciseFluidsystemSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                         GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::ExerciseFluidsystemTwoP>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = ExerciseFluidsystemSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set grid to be used
 template<class TypeTag>

exercises/exercise-grids/injection2pproblem.hh

@@ -60,9 +60,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2p, SpatialParams,
-              InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                     GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::Injection2p>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set fluid configuration
 template<class TypeTag>

exercises/exercise-runtimeparams/injection2pproblem.hh

@@ -57,9 +57,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2p, SpatialParams,
-              InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                     GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::Injection2p>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set fluid configuration
 template<class TypeTag>

exercises/solution/exercise-basic/injection2pniproblem.hh

@@ -56,13 +56,29 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::Injection2pNITypeTag> { using type = InjectionProblem2PNI<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2pNITypeTag, SpatialParams,
-              InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                     GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::Injection2pNITypeTag>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
+};
+
+// the fluid system for incompressible tests
+template<class TypeTag>
+struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag>
+{
+private:
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = FluidSystems::OnePLiquid<Scalar, Components::SimpleH2O<Scalar> >;
+};
 
 // Set fluid configuration
-SET_TYPE_PROP(Injection2pNITypeTag, FluidSystem,
-    FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>, FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>);
+template<class TypeTag>
+struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag> { using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>, FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>; };
 } // end namespace Properties
 
 /*!

exercises/solution/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh

@@ -83,9 +83,9 @@ template<class TypeTag>
 struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePNC> { static constexpr int value = 3; };
 
 //! Use a model with constant tortuosity for the effective diffusivity
-SET_TYPE_PROP(DarcyOnePNC, EffectiveDiffusivityModel,
-              DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>);
-
+template<class TypeTag>
+struct EffectiveDiffusivityModel<TypeTag, TTag::DarcyOnePNC>
+{ using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
 // Set the grid type
 template<class TypeTag>
 struct Grid<TypeTag, TTag::DarcyOnePNC> { using type = Dune::YaspGrid<2>; };

exercises/solution/exercise-fluidsystem/2p2cproblem.hh

@@ -58,9 +58,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = ExerciseFluidsystemProblemTwoPTwoC<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams,
-              ExerciseFluidsystemSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                         GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = ExerciseFluidsystemSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set grid and the grid creator to be used
 template<class TypeTag>

exercises/solution/exercise-fluidsystem/2pproblem.hh

@@ -72,9 +72,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = ExerciseFluidsystemProblemTwoP<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams,
-              ExerciseFluidsystemSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                         GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::ExerciseFluidsystemTwoP>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = ExerciseFluidsystemSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set grid to be used
 template<class TypeTag>

exercises/solution/exercise-grids/injection2pproblem.hh

@@ -68,9 +68,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2p, SpatialParams,
-              InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                     GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::Injection2p>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set fluid configuration
 template<class TypeTag>

exercises/solution/exercise-runtimeparams/injection2pproblem.hh

@@ -57,9 +57,15 @@ template<class TypeTag>
 struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2p, SpatialParams,
-              InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
-                                     GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct SpatialParams<TypeTag, TTag::Injection2p>
+{
+private:
+    using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
+public:
+    using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
+};
 
 // Set fluid configuration
 template<class TypeTag>