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/components/simpleco2.hh b/dumux/material/components/simpleco2.hh index 863c087e774a3fd4ce0c968b08703400d155ad4f..696e90d69f78225d0739e5cc90781e41add54342 100644 --- a/dumux/material/components/simpleco2.hh +++ b/dumux/material/components/simpleco2.hh @@ -88,7 +88,7 @@ public: /*! * \brief Specific enthalpy of CO2 \f$\mathrm{[J/kg]}\f$. - * source: Shomate Equation for a temperature range of 298. to 1200°C. + * source: Shomate Equation for a temperature range of 298. to 1200K. * with components published by NIST \cite NIST * https://webbook.nist.gov/cgi/cbook.cgi?ID=C124389&Mask=1&Type=JANAFG&Table=on * \param temperature temperature of component in \f$\mathrm{[K]}\f$ @@ -105,7 +105,7 @@ public: constexpr double e = -0.136638; constexpr double f = -403.6075; constexpr double h = -393.5224; - return (a*t + b*t*t/2 + c*t*t*t/3 + d*t*t*t*t/4 - e/t -h)*1000/molarMass(); //conversion from kJ/mol to J/kg + return (a*t + b*t*t/2 + c*t*t*t/3 + d*t*t*t*t/4 - e/t +f -h)*1000/molarMass(); //conversion from kJ/mol to J/kg } /*! @@ -246,7 +246,7 @@ public: /*! * \brief Specific isobaric heat capacity of CO2 \f$\mathrm{[J/(kg*K)]}\f$. - * source: Shomate Equation for a temperature range of 298. to 1200°C. + * source: Shomate Equation for a temperature range of 298. to 1200K. * with components published by NIST \cite NIST * https://webbook.nist.gov/cgi/cbook.cgi?ID=C124389&Mask=1&Type=JANAFG&Table=on * \param temperature temperature of component in \f$\mathrm{[K]}\f$ 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 diff --git a/examples/biomineralization/doc/fluidmaterial.md b/examples/biomineralization/doc/fluidmaterial.md index bc7cf70850d9f4c982e95a7f407f4143020ef8cc..1cf8f0dfce73d37e163ee424b158b55e0cb70e5b 100644 --- a/examples/biomineralization/doc/fluidmaterial.md +++ b/examples/biomineralization/doc/fluidmaterial.md @@ -123,7 +123,7 @@ which are needed to model biomineralization. // we include all necessary fluid components #include <dumux/material/fluidstates/adapter.hh> -#include <dumux/material/components/co2.hh> +#include <dumux/material/components/simpleco2.hh> #include <dumux/material/components/h2o.hh> #include <dumux/material/components/tabulatedcomponent.hh> #include <dumux/material/components/sodiumion.hh> @@ -152,7 +152,7 @@ which are needed to model biomineralization. ### The fluidsystem class In the BioMinSimpleChemistryFluid fluid system, we define all functions needed to describe the fluids and their properties accounted for in our simulation. -The simplified biogeochemistry biomineralization fluid system requires the CO2 tables and the H2OType as template parameters. +The simplified biogeochemistry biomineralization fluid system requires the CO2 component and the H2OType as template parameters. We enter the namespace Dumux. All Dumux functions and classes are in a namespace Dumux, to make sure they don`t clash with symbols from other libraries you may want to use in conjunction with Dumux. ```cpp diff --git a/examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh b/examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh index 9155bb6f4ce7d19d3b117674c6c79ebac53ac8e3..d2638bcc843c03ce1e6d937feaea2b64d389a7f0 100644 --- a/examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh +++ b/examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh @@ -39,7 +39,7 @@ // we include all necessary fluid components #include <dumux/material/fluidstates/adapter.hh> -#include <dumux/material/components/co2.hh> +#include <dumux/material/components/simpleco2.hh> #include <dumux/material/components/h2o.hh> #include <dumux/material/components/tabulatedcomponent.hh> #include <dumux/material/components/sodiumion.hh> @@ -63,7 +63,7 @@ // // ### The fluidsystem class // In the BioMinSimpleChemistryFluid fluid system, we define all functions needed to describe the fluids and their properties accounted for in our simulation. -// The simplified biogeochemistry biomineralization fluid system requires the CO2 tables and the H2OType as template parameters. +// The simplified biogeochemistry biomineralization fluid system requires the CO2 component and the H2OType as template parameters. // We enter the namespace Dumux. All Dumux functions and classes are in a namespace Dumux, to make sure they don`t clash with symbols from other libraries you may want to use in conjunction with Dumux. // [[codeblock]] namespace Dumux::FluidSystems {