[InheritsFrom] Consistent ordering

exercises/exercise-basic/injection2pniproblem.hh

@@ -73,7 +73,11 @@ public:
 
 // Set fluid configuration
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag> { using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>, FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>; };
+struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag>
+{
+    using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>,
+                                     FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true>>;
+};
 } // end namespace Properties
 
 /*!

exercises/exercise-fluidsystem/2p2cproblem.hh

@@ -50,7 +50,7 @@ namespace Properties {
 // Create a new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<BoxModel, TwoPTwoC>; };
+struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<TwoPTwoC, BoxModel>; };
 } // end namespace TTag
 
 // Set the "Problem" property

exercises/exercise-fluidsystem/2pproblem.hh

@@ -64,7 +64,7 @@ namespace Properties {
 // Create a new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<BoxModel, TwoP>; };
+struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<TwoP, BoxModel>; };
 } // end namespace TTag
 
 // Set the "Problem" property

exercises/exercise-fluidsystem/README.md

@@ -41,7 +41,7 @@ the `TwoP` _TypeTag_ (immiscible two-phase model properties) and the `BoxModel`
 ```c++
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<BoxModel, TwoP>; };
+struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<TwoP, BoxModel>; };
 } // end namespace TTag
 ```
 
@@ -185,7 +185,7 @@ two-component model properties:
 
 ```c++
 // Create a new type tag for the problem
-struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<BoxModel, TwoPTwoC>; };
+struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<TwoPTwoC, BoxModel>; };
 } // end namespace TTag
 ```
 

exercises/exercise-fractures/fractureproblem.hh

@@ -51,7 +51,7 @@ namespace Properties {
 
 // Create new type tag node
 namespace TTag {
-struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
+struct FractureProblem { using InheritsFrom = std::tuple<TwoP, CCTpfaModel>; };
 } // end namespace TTag
 
 // Set the grid type

exercises/solution/exercise-basic/injection2pniproblem.hh

@@ -66,19 +66,13 @@ public:
     using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
 };
 
-// the fluid system for incompressible tests
+// Set fluid configuration
 template<class TypeTag>
 struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag>
 {
-private:
-    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-public:
-    using type = FluidSystems::OnePLiquid<Scalar, Components::SimpleH2O<Scalar> >;
+    using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>,
+                                     FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true>>;
 };
-
-// Set fluid configuration
-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-fluidsystem/2p2cproblem.hh

@@ -50,7 +50,7 @@ namespace Properties {
 // Create a new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<BoxModel, TwoPTwoC>; };
+struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<TwoPTwoC, BoxModel>; };
 } // end namespace TTag
 
 // Set the "Problem" property

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

@@ -64,7 +64,7 @@ namespace Properties {
 // Create a new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<BoxModel, TwoP>; };
+struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<TwoP, BoxModel>; };
 } // end namespace TTag
 
 // Set the "Problem" property

exercises/solution/exercise-fractures/fractureproblem.hh

@@ -51,7 +51,7 @@ namespace Properties {
 
 // Create new type tag node
 namespace TTag {
-struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
+struct FractureProblem { using InheritsFrom = std::tuple<TwoP, CCTpfaModel>; };
 } // end namespace TTag
 
 // Set the grid type