From 4c34a747358ec7bbb7ca20cc078950efa0e3621e Mon Sep 17 00:00:00 2001
From: Mathis Kelm <mathis.kelm@iws.uni-stuttgart.de>
Date: Thu, 16 Mar 2023 15:30:04 +0100
Subject: [PATCH] [material][SimpleCO2] fix enthalpy calculation
---
dumux/material/components/simpleco2.hh | 6 +++---
examples/biomineralization/doc/fluidmaterial.md | 4 ++--
.../material/fluidsystems/biominsimplechemistry.hh | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dumux/material/components/simpleco2.hh b/dumux/material/components/simpleco2.hh
index 863c087e77..696e90d69f 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/examples/biomineralization/doc/fluidmaterial.md b/examples/biomineralization/doc/fluidmaterial.md
index bc7cf70850..1cf8f0dfce 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 9155bb6f4c..d2638bcc84 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 {
--
GitLab