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

[ex-fluidsystem] do not use wetting/nonwettingphase as alias

parent 19e0d69e
No related branches found
No related tags found
1 merge request!4Feature/improve fluidsystem ex
Hide whitespace changes
Inline Side-by-side
exercises/exercise-fluidsystem/2pproblem.hh
+ 4
− 4
View file @ 23c52f8c
...@@ -91,16 +91,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem) ...@@ -91,16 +91,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
private: private:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using TabulatedH2O = Components::TabulatedComponent<Components::H2O<Scalar>>; using TabulatedH2O = Components::TabulatedComponent<Components::H2O<Scalar>>;
using WettingPhase = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>; using LiquidWater = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>;
/*! /*!
* Uncomment first line and comment second line for using the incompressible component * Uncomment first line and comment second line for using the incompressible component
* Uncomment second line and comment first line for using the compressible component * Uncomment second line and comment first line for using the compressible component
*/ */
using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >; using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
// using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >; // using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
public: public:
using type = typename FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase>; using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWater, LiquidMyComponent>;
}; };
} }
......
exercises/exercise-fluidsystem/README.md
+ 4
− 4
View file @ 23c52f8c
...@@ -92,16 +92,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem) ...@@ -92,16 +92,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
private: private:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using TabulatedH2O = Components::TabulatedComponent<Components::H2O<Scalar>>; using TabulatedH2O = Components::TabulatedComponent<Components::H2O<Scalar>>;
using WettingPhase = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>; using LiquidWater = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>;
/*! /*!
* Uncomment first line and comment second line for using the incompressible component * Uncomment first line and comment second line for using the incompressible component
* Uncomment second line and comment first line for using the compressible component * Uncomment second line and comment first line for using the compressible component
*/ */
using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >; using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
// using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >; // using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
public: public:
using type = typename FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase>; using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWater, LiquidMyComponent>;
}; };
``` ```
......
exercises/solution/ex3/2pproblem.hh
+ 4
− 4
View file @ 23c52f8c
...@@ -91,16 +91,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem) ...@@ -91,16 +91,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
private: private:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using TabulatedH2O = Components::TabulatedComponent<Components::H2O<Scalar>>; using TabulatedH2O = Components::TabulatedComponent<Components::H2O<Scalar>>;
using WettingPhase = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>; using LiquidWater = typename FluidSystems::OnePLiquid<Scalar, TabulatedH2O>;
/*! /*!
* Uncomment first line and comment second line for using the incompressible component * Uncomment first line and comment second line for using the incompressible component
* Uncomment second line and comment first line for using the compressible component * Uncomment second line and comment first line for using the compressible component
*/ */
using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >; using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
// using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >; // using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
public: public:
using type = typename FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase>; using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWater, LiquidMyComponent>;
}; };
} }
......
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