Commit 70b6ce0c authored by Stefanie Kiemle's avatar Stefanie Kiemle
Browse files

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

[fix] use new co2tables

See merge request !176
parents cd2affc7 4fe9e298
Pipeline #17345 passed with stage
......@@ -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
This diff is collapsed.
......@@ -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();
......
......@@ -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>>;
};
......
......@@ -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
......
......@@ -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>;
......
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