Commit 97ae6f0f authored by Martin Schneider's avatar Martin Schneider
Browse files

[InheritsFrom] Consistent ordering

parent 8282eb99
...@@ -73,7 +73,11 @@ public: ...@@ -73,7 +73,11 @@ public:
// Set fluid configuration // Set fluid configuration
template<class TypeTag> 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 } // end namespace Properties
/*! /*!
......
...@@ -50,7 +50,7 @@ namespace Properties { ...@@ -50,7 +50,7 @@ namespace Properties {
// Create a new type tag for the problem // Create a new type tag for the problem
// Create new type tags // Create new type tags
namespace TTag { namespace TTag {
struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<BoxModel, TwoPTwoC>; }; struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<TwoPTwoC, BoxModel>; };
} // end namespace TTag } // end namespace TTag
// Set the "Problem" property // Set the "Problem" property
......
...@@ -64,7 +64,7 @@ namespace Properties { ...@@ -64,7 +64,7 @@ namespace Properties {
// Create a new type tag for the problem // Create a new type tag for the problem
// Create new type tags // Create new type tags
namespace TTag { namespace TTag {
struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<BoxModel, TwoP>; }; struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<TwoP, BoxModel>; };
} // end namespace TTag } // end namespace TTag
// Set the "Problem" property // Set the "Problem" property
......
...@@ -41,7 +41,7 @@ the `TwoP` _TypeTag_ (immiscible two-phase model properties) and the `BoxModel` ...@@ -41,7 +41,7 @@ the `TwoP` _TypeTag_ (immiscible two-phase model properties) and the `BoxModel`
```c++ ```c++
// Create new type tags // Create new type tags
namespace TTag { namespace TTag {
struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<BoxModel, TwoP>; }; struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<TwoP, BoxModel>; };
} // end namespace TTag } // end namespace TTag
``` ```
...@@ -185,7 +185,7 @@ two-component model properties: ...@@ -185,7 +185,7 @@ two-component model properties:
```c++ ```c++
// Create a new type tag for the problem // 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 } // end namespace TTag
``` ```
......
...@@ -51,7 +51,7 @@ namespace Properties { ...@@ -51,7 +51,7 @@ namespace Properties {
// Create new type tag node // Create new type tag node
namespace TTag { namespace TTag {
struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; }; struct FractureProblem { using InheritsFrom = std::tuple<TwoP, CCTpfaModel>; };
} // end namespace TTag } // end namespace TTag
// Set the grid type // Set the grid type
......
...@@ -66,19 +66,13 @@ public: ...@@ -66,19 +66,13 @@ public:
using type = InjectionSpatialParams<FVGridGeometry, Scalar>; using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
}; };
// the fluid system for incompressible tests // Set fluid configuration
template<class TypeTag> template<class TypeTag>
struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag> struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag>
{ {
private: using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>,
using Scalar = GetPropType<TypeTag, Properties::Scalar>; FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true>>;
public:
using type = FluidSystems::OnePLiquid<Scalar, Components::SimpleH2O<Scalar> >;
}; };
// 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 } // end namespace Properties
/*! /*!
......
...@@ -50,7 +50,7 @@ namespace Properties { ...@@ -50,7 +50,7 @@ namespace Properties {
// Create a new type tag for the problem // Create a new type tag for the problem
// Create new type tags // Create new type tags
namespace TTag { namespace TTag {
struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<BoxModel, TwoPTwoC>; }; struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<TwoPTwoC, BoxModel>; };
} // end namespace TTag } // end namespace TTag
// Set the "Problem" property // Set the "Problem" property
......
...@@ -64,7 +64,7 @@ namespace Properties { ...@@ -64,7 +64,7 @@ namespace Properties {
// Create a new type tag for the problem // Create a new type tag for the problem
// Create new type tags // Create new type tags
namespace TTag { namespace TTag {
struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<BoxModel, TwoP>; }; struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<TwoP, BoxModel>; };
} // end namespace TTag } // end namespace TTag
// Set the "Problem" property // Set the "Problem" property
......
...@@ -51,7 +51,7 @@ namespace Properties { ...@@ -51,7 +51,7 @@ namespace Properties {
// Create new type tag node // Create new type tag node
namespace TTag { namespace TTag {
struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; }; struct FractureProblem { using InheritsFrom = std::tuple<TwoP, CCTpfaModel>; };
} // end namespace TTag } // end namespace TTag
// Set the grid type // Set the grid type
......
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