diff --git a/dumux/material/binarycoefficients/brine_co2.hh b/dumux/material/binarycoefficients/brine_co2.hh index c1bba1a569a61be7dfe3e4b83a4fc4d0fdea30e3..10119a59af78a93cbd4558d58945ebd9e2499700 100644 --- a/dumux/material/binarycoefficients/brine_co2.hh +++ b/dumux/material/binarycoefficients/brine_co2.hh @@ -33,7 +33,6 @@ #include <dumux/material/components/brine.hh> #include <dumux/material/components/h2o.hh> #include <dumux/material/components/co2.hh> -#include <dumux/material/components/simpleco2.hh> #include <dumux/material/idealgas.hh> namespace Dumux::BinaryCoeff { @@ -42,7 +41,7 @@ namespace Dumux::BinaryCoeff { * \ingroup Binarycoefficients * \brief Binary coefficients for brine and CO2. */ -template<class Scalar, class CO2Impl = Components::SimpleCO2<Scalar>, bool verbose = true> +template<class Scalar, class CO2Impl, bool verbose = true> class Brine_CO2 { using H2O = Components::H2O<Scalar>; @@ -387,7 +386,7 @@ private: * molfraction of H2O has been assumed to be a constant value * For use with the actual brine_co2_system this class still needs to be adapted */ -template<class Scalar, class CO2Impl = Components::SimpleCO2<Scalar>, bool verbose = true> +template<class Scalar, class CO2Impl, bool verbose = true> class Brine_CO2_Old { using H2O = Components::H2O<Scalar>; diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh index bd8c069077494f47ba07ef3f7ec4dc99bcb1a8b4..3920c7d518fd5251687a056009365002092cdd0f 100644 --- a/dumux/material/fluidsystems/brineco2.hh +++ b/dumux/material/fluidsystems/brineco2.hh @@ -36,7 +36,6 @@ #include <dumux/material/fluidstates/adapter.hh> #include <dumux/material/components/brine.hh> -#include <dumux/material/components/simpleco2.hh> #include <dumux/material/components/co2.hh> #include <dumux/material/components/tabulatedcomponent.hh> @@ -107,7 +106,7 @@ struct BrineCO2DefaultPolicy * \note This implementation always assumes NaCl stays in the liquid phase. */ template< class Scalar, - class CO2Impl = Components::SimpleCO2<Scalar>, + class CO2Impl, class H2OType = Components::TabulatedComponent<Components::H2O<Scalar>>, class Policy = BrineCO2DefaultPolicy</*constantSalinity?*/true> > class BrineCO2