Merge branch 'fix/use-new-co2tables' into 'master'

[fix] use new co2tables

See merge request !176

lecture/common/co2tablesbenchmark3.hh

@@ -25,14 +25,6 @@
 #ifndef DUMUX_HETEROGENEOUS_CO2TABLES_HH
 #define DUMUX_HETEROGENEOUS_CO2TABLES_HH
 
-#include <dumux/material/components/co2tablereader.hh>
-
-namespace Dumux {
-namespace CO2TablesBenchmarkThree {
-// the real work is done by some external program which provides
-// ready-to-use tables.
-#include "co2values.inc"
-} // end namespace CO2TablesBenchmarkThree
-} // end namespace Dumux
+#include <test/porousmediumflow/co2/co2tables.hh>
 
 #endif

lecture/mm/co2plume/co2plumeshapeproblem.hh

@@ -114,7 +114,7 @@ class PlumeShapeProblem : public PorousMediumFlowProblem<TypeTag>
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
 
-    using CO2 = Components::CO2<Scalar, CO2TablesBenchmarkThree::CO2Tables>;
+    using CO2 = Components::CO2<Scalar, GeneratedCO2Tables::CO2Tables>;
 
     //! property that defines whether mole or mass fractions are used
     static constexpr bool useMoles = ModelTraits::useMoles();

lecture/mm/co2plume/co2plumeshapeproperties.hh

@@ -72,7 +72,7 @@ private:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 public:
     using type = FluidSystems::BrineCO2<Scalar,
-                           CO2TablesBenchmarkThree::CO2Tables,
+                           GeneratedCO2Tables::CO2Tables,
                            Components::TabulatedComponent<Components::H2O<Scalar>>,
                            FluidSystems::BrineCO2DefaultPolicy</*constantSalinity=*/true, /*simpleButFast=*/true>>;
 };

lecture/mm/convectivemixing/convmixproblem.hh

@@ -61,8 +61,8 @@ class ConvmixProblem : public PorousMediumFlowProblem<TypeTag>
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
     using Element = typename GridView::template Codim<0>::Entity;
 
-    using CO2 = Components::CO2<Scalar, CO2TablesBenchmarkThree::CO2Tables>;
-    using Brine_CO2 = BinaryCoeff::Brine_CO2<Scalar, CO2TablesBenchmarkThree::CO2Tables>;
+    using CO2 = Components::CO2<Scalar, GeneratedCO2Tables::CO2Tables>;
+    using Brine_CO2 = BinaryCoeff::Brine_CO2<Scalar, GeneratedCO2Tables::CO2Tables>;
 
     // copy some indices for convenience
     enum

lecture/mm/convectivemixing/convmixproperties.hh

@@ -60,7 +60,7 @@ template<class TypeTag>
 struct FluidSystem<TypeTag, TTag::ConvmixTypeTag>
 {
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    using BrineCO2 = FluidSystems::BrineCO2<Scalar, CO2TablesBenchmarkThree::CO2Tables,
+    using BrineCO2 = FluidSystems::BrineCO2<Scalar, GeneratedCO2Tables::CO2Tables,
                            Components::TabulatedComponent<Components::H2O<GetPropType<TypeTag, Properties::Scalar>>>,
                            FluidSystems::BrineCO2DefaultPolicy</*constantSalinity=*/true, /*simplified=*/true>>;
     using type = FluidSystems::OnePAdapter<BrineCO2, BrineCO2::liquidPhaseIdx>;