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

exercises/exercise-fluidsystem/2pproblem.hh

@@ -91,16 +91,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
 private:
     using Scalar = typename GET_PROP_TYPE(TypeTag, 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 second line and comment first line for using the compressible component
      */
-    using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
-    // using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
+    using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
+    // using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
 
 public:
-    using type = typename FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase>;
+    using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWater, LiquidMyComponent>;
 };
 
 }

exercises/exercise-fluidsystem/README.md

@@ -92,16 +92,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
 private:
     using Scalar = typename GET_PROP_TYPE(TypeTag, 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 second line and comment first line for using the compressible component
      */
-    using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
-    // using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
+    using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
+    // using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
 
 public:
-    using type = typename FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase>;
+    using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWater, LiquidMyComponent>;
 };
 ```
 

exercises/solution/ex3/2pproblem.hh

@@ -91,16 +91,16 @@ SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
 private:
     using Scalar = typename GET_PROP_TYPE(TypeTag, 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 second line and comment first line for using the compressible component
      */
-    using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
-    // using NonWettingPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
+    using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
+    // using LiquidMyComponent = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
 
 public:
-    using type = typename FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase>;
+    using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWater, LiquidMyComponent>;
 };
 
 }