Commit 8282eb99 authored by Martin Schneider's avatar Martin Schneider
Browse files

[macros] Replace further macros

parent c760558c
...@@ -55,9 +55,15 @@ template<class TypeTag> ...@@ -55,9 +55,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::Injection2p2c> { using type = Injection2p2cProblem<TypeTag>; }; struct Problem<TypeTag, TTag::Injection2p2c> { using type = Injection2p2cProblem<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(Injection2p2c, SpatialParams, template<class TypeTag>
InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::Injection2p2c>
GetPropType<TypeTag, Properties::Scalar>>); {
private:
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration // Set fluid configuration
template<class TypeTag> template<class TypeTag>
......
...@@ -61,9 +61,15 @@ template<class TypeTag> ...@@ -61,9 +61,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::Injection2pNITypeTag> { using type = InjectionProblem2PNI<TypeTag>; }; struct Problem<TypeTag, TTag::Injection2pNITypeTag> { using type = InjectionProblem2PNI<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(Injection2pNITypeTag, SpatialParams, template<class TypeTag>
InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::Injection2pNITypeTag>
GetPropType<TypeTag, Properties::Scalar>>); {
private:
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration // Set fluid configuration
template<class TypeTag> template<class TypeTag>
......
...@@ -57,9 +57,15 @@ template<class TypeTag> ...@@ -57,9 +57,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; }; struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(Injection2p, SpatialParams, template<class TypeTag>
InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::Injection2p>
GetPropType<TypeTag, Properties::Scalar>>); {
private:
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration // Set fluid configuration
template<class TypeTag> template<class TypeTag>
......
...@@ -70,9 +70,9 @@ template<class TypeTag> ...@@ -70,9 +70,9 @@ template<class TypeTag>
struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePNC> { static constexpr int value = 3; }; struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePNC> { static constexpr int value = 3; };
//! Use a model with constant tortuosity for the effective diffusivity //! Use a model with constant tortuosity for the effective diffusivity
SET_TYPE_PROP(DarcyOnePNC, EffectiveDiffusivityModel, template<class TypeTag>
DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>); struct EffectiveDiffusivityModel<TypeTag, DarcyOnePNC>
{ using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
// Set the grid type // Set the grid type
template<class TypeTag> template<class TypeTag>
struct Grid<TypeTag, TTag::DarcyOnePNC> { using type = Dune::YaspGrid<2>; }; struct Grid<TypeTag, TTag::DarcyOnePNC> { using type = Dune::YaspGrid<2>; };
......
...@@ -58,9 +58,15 @@ template<class TypeTag> ...@@ -58,9 +58,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = ExerciseFluidsystemProblemTwoPTwoC<TypeTag>; }; struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = ExerciseFluidsystemProblemTwoPTwoC<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams, template<class TypeTag>
ExerciseFluidsystemSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC>
GetPropType<TypeTag, Properties::Scalar>>); {
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 // Set grid and the grid creator to be used
template<class TypeTag> template<class TypeTag>
......
...@@ -72,9 +72,15 @@ template<class TypeTag> ...@@ -72,9 +72,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = ExerciseFluidsystemProblemTwoP<TypeTag>; }; struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = ExerciseFluidsystemProblemTwoP<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams, template<class TypeTag>
ExerciseFluidsystemSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::ExerciseFluidsystemTwoP>
GetPropType<TypeTag, Properties::Scalar>>); {
private:
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = ExerciseFluidsystemSpatialParams<FVGridGeometry, Scalar>;
};
// Set grid to be used // Set grid to be used
template<class TypeTag> template<class TypeTag>
......
...@@ -60,9 +60,15 @@ template<class TypeTag> ...@@ -60,9 +60,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; }; struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(Injection2p, SpatialParams, template<class TypeTag>
InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::Injection2p>
GetPropType<TypeTag, Properties::Scalar>>); {
private:
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration // Set fluid configuration
template<class TypeTag> template<class TypeTag>
......
...@@ -57,9 +57,15 @@ template<class TypeTag> ...@@ -57,9 +57,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; }; struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(Injection2p, SpatialParams, template<class TypeTag>
InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::Injection2p>
GetPropType<TypeTag, Properties::Scalar>>); {
private:
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration // Set fluid configuration
template<class TypeTag> template<class TypeTag>
......
...@@ -56,13 +56,29 @@ template<class TypeTag> ...@@ -56,13 +56,29 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::Injection2pNITypeTag> { using type = InjectionProblem2PNI<TypeTag>; }; struct Problem<TypeTag, TTag::Injection2pNITypeTag> { using type = InjectionProblem2PNI<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(Injection2pNITypeTag, SpatialParams, template<class TypeTag>
InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::Injection2pNITypeTag>
GetPropType<TypeTag, Properties::Scalar>>); {
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 fluid configuration
SET_TYPE_PROP(Injection2pNITypeTag, FluidSystem, template<class TypeTag>
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
/*! /*!
......
...@@ -83,9 +83,9 @@ template<class TypeTag> ...@@ -83,9 +83,9 @@ template<class TypeTag>
struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePNC> { static constexpr int value = 3; }; struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePNC> { static constexpr int value = 3; };
//! Use a model with constant tortuosity for the effective diffusivity //! Use a model with constant tortuosity for the effective diffusivity
SET_TYPE_PROP(DarcyOnePNC, EffectiveDiffusivityModel, template<class TypeTag>
DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>); struct EffectiveDiffusivityModel<TypeTag, TTag::DarcyOnePNC>
{ using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
// Set the grid type // Set the grid type
template<class TypeTag> template<class TypeTag>
struct Grid<TypeTag, TTag::DarcyOnePNC> { using type = Dune::YaspGrid<2>; }; struct Grid<TypeTag, TTag::DarcyOnePNC> { using type = Dune::YaspGrid<2>; };
......
...@@ -58,9 +58,15 @@ template<class TypeTag> ...@@ -58,9 +58,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = ExerciseFluidsystemProblemTwoPTwoC<TypeTag>; }; struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = ExerciseFluidsystemProblemTwoPTwoC<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams, template<class TypeTag>
ExerciseFluidsystemSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC>
GetPropType<TypeTag, Properties::Scalar>>); {
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 // Set grid and the grid creator to be used
template<class TypeTag> template<class TypeTag>
......
...@@ -72,9 +72,15 @@ template<class TypeTag> ...@@ -72,9 +72,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = ExerciseFluidsystemProblemTwoP<TypeTag>; }; struct Problem<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = ExerciseFluidsystemProblemTwoP<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams, template<class TypeTag>
ExerciseFluidsystemSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::ExerciseFluidsystemTwoP>
GetPropType<TypeTag, Properties::Scalar>>); {
private:
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = ExerciseFluidsystemSpatialParams<FVGridGeometry, Scalar>;
};
// Set grid to be used // Set grid to be used
template<class TypeTag> template<class TypeTag>
......
...@@ -68,9 +68,15 @@ template<class TypeTag> ...@@ -68,9 +68,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; }; struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(Injection2p, SpatialParams, template<class TypeTag>
InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::Injection2p>
GetPropType<TypeTag, Properties::Scalar>>); {
private:
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration // Set fluid configuration
template<class TypeTag> template<class TypeTag>
......
...@@ -57,9 +57,15 @@ template<class TypeTag> ...@@ -57,9 +57,15 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; }; struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
// Set the spatial parameters // Set the spatial parameters
SET_TYPE_PROP(Injection2p, SpatialParams, template<class TypeTag>
InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>, struct SpatialParams<TypeTag, TTag::Injection2p>
GetPropType<TypeTag, Properties::Scalar>>); {
private:
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
};
// Set fluid configuration // Set fluid configuration
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