From e4aeabce6e10c312baae53f3b5229fde6b331898 Mon Sep 17 00:00:00 2001
From: Mathis Kelm <mathis.kelm@iws.uni-stuttgart.de>
Date: Thu, 16 Mar 2023 19:21:41 +0100
Subject: [PATCH] [material] remove SimpleCO2 as default CO2 implementation
BrineCO2 fluidsystem and Brine_CO2 binarycoefficients focus on supercritical CO2
---
dumux/material/binarycoefficients/brine_co2.hh | 5 ++---
dumux/material/fluidsystems/brineco2.hh | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dumux/material/binarycoefficients/brine_co2.hh b/dumux/material/binarycoefficients/brine_co2.hh
index c1bba1a569..10119a59af 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 bd8c069077..3920c7d518 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
--
GitLab