diff --git a/examples/biomineralization/.doc_config b/examples/biomineralization/.doc_config
index 4481d351ff115af9825079dd1b9ba73496b38eee..b00f4f51785bbac41878c723670fc865b731c319 100644
--- a/examples/biomineralization/.doc_config
+++ b/examples/biomineralization/.doc_config
@@ -21,7 +21,7 @@
"doc/fluidmaterial.md" : [
"doc/fluidmaterial_intro.md",
- "material/co2tableslaboratory.hh",
+ "material/co2tables.hh",
"material/components/suspendedbiomass.hh",
"material/fluidsystems/biominsimplechemistry.hh",
"material/fluidsystems/icpcomplexsalinitybrine.hh"
diff --git a/examples/biomineralization/README.md b/examples/biomineralization/README.md
index f631d662614506500327ab71256ec5e93224ed85..540241ed00535b24be9fcff3393858e675a4d96d 100644
--- a/examples/biomineralization/README.md
+++ b/examples/biomineralization/README.md
@@ -122,7 +122,7 @@ We will discuss the different parts of the code in detail subsequently.
│ └── icpcomplexsalinitybrine.hh
├── solidsystems/
│ └── biominsolids.hh
- └── co2tableslaboratory.hh
+ └── co2tables.hh
```
In order to define a simulation setup in DuMu<sup>x</sup>, you need to implement compile-time settings,
@@ -149,7 +149,7 @@ Similar strategies might be useful when simulating experimental setups with boun
__Part 4__ discusses the code concerned with the fluid (files in the folder `material/`),
especially the multi-component fluidsystems.
-The CO<sub>2</sub> properties are stored in the CO<sub>2</sub> tables in the subfolder `material` (`co2tableslaboratory.hh`,`co2valueslaboratory.inc`).
+The CO<sub>2</sub> properties are stored in the CO<sub>2</sub> tables in the subfolder `material` (`co2tables.hh`,`co2values.inc`).
__Part 5__ discusses the code concerned with the solid properties (files in the folder `material/`),
especially the multi-component solidsystems and variable solid volume fractions.
diff --git a/examples/biomineralization/doc/_intro.md b/examples/biomineralization/doc/_intro.md
index 34d532bb0a4cfba01070e38bef15564eed7d072a..6e651d688ed268381cc86c4ea047dd44ac2b0d90 100644
--- a/examples/biomineralization/doc/_intro.md
+++ b/examples/biomineralization/doc/_intro.md
@@ -120,7 +120,7 @@ We will discuss the different parts of the code in detail subsequently.
│ └── icpcomplexsalinitybrine.hh
├── solidsystems/
│ └── biominsolids.hh
- └── co2tableslaboratory.hh
+ └── co2tables.hh
```
In order to define a simulation setup in DuMu<sup>x</sup>, you need to implement compile-time settings,
@@ -147,7 +147,7 @@ Similar strategies might be useful when simulating experimental setups with boun
__Part 4__ discusses the code concerned with the fluid (files in the folder `material/`),
especially the multi-component fluidsystems.
-The CO<sub>2</sub> properties are stored in the CO<sub>2</sub> tables in the subfolder `material` (`co2tableslaboratory.hh`,`co2valueslaboratory.inc`).
+The CO<sub>2</sub> properties are stored in the CO<sub>2</sub> tables in the subfolder `material` (`co2tables.hh`,`co2values.inc`).
__Part 5__ discusses the code concerned with the solid properties (files in the folder `material/`),
especially the multi-component solidsystems and variable solid volume fractions.
diff --git a/examples/biomineralization/doc/fluidmaterial.md b/examples/biomineralization/doc/fluidmaterial.md
index fffd89216f144fd0e65c7afdda7765991a03a914..018ea8dc872bd747b2272f88c416dc3e381bc66d 100644
--- a/examples/biomineralization/doc/fluidmaterial.md
+++ b/examples/biomineralization/doc/fluidmaterial.md
@@ -30,7 +30,7 @@ For further specialization, the overview over the material subfolder is split in
## Fluids in the folder `material`
As this example is about biomineralization involving many components with complex inteactions, some specific fluid material files are necessary.
-A CO_2-Table file provides tabulated CO_2 properties according to @Span1996 in `material/co2tableslaboratory.hh`
+A CO_2-Table file provides tabulated CO_2 properties according to @Span1996 in `material/co2tables.hh`
In the component subfolder, `material/components/suspendedbiomass.hh` defines the component suspended biomass, which is the mobile form of biomass being transported suspended in the aqueous fluid phase.
In the fluidsystem subfolder, the biomineralization fluidsystem `material/fluidsystems/biominsimplechemistry.hh` as well as
the complex salinity brine adapter `material/fluidsystems/icpcomplexsalinitybrine.hh` can be found.
@@ -48,24 +48,174 @@ The subsequent documentation is structured as follows:
[@Span1996]: https://aip.scitation.org/doi/abs/10.1063/1.555991 "A new equation of state for carbon dioxide covering the fluid region from the triple-point temperature to 1100 K at pressures up to 800 MPa"
-## The CO2 tables (`co2tableslaboratory.hh`)
-This file contains the __co2table class__ which forwards to tabulated properties of CO2 according to Span and Wagner 1996.
-The real work (creating the tables) is done by some external program by Span and Wagner 1996 which provides the ready-to-use tables.
+```cpp
+/*!
+ * \file
+ * \ingroup Components
+ * \brief A reader and tables for CO$_2$ tabulated material laws that depend
+ * on pressure and temperature.
+ */
+
+
+#include <dune/common/float_cmp.hh>
+```
+
+## The CO2 tables (`co2tables.hh`)
+
+This file contains the __co2table class__ which forwards to tabulated properties of CO2.
+The tables are generated using the NIST (National Institute of Standards
+and Technology) Standard Reference Database Number 69
+(https://doi.org/10.18434/T4D303).
+
+Copyright for NIST Standard Reference Data is governed by the Standard
+Reference Data Act (https://www.nist.gov/srd/public-law).
+
+######################################################################
+In case you are using this the data generated with this script
+please cite the following publications:
+
+P.J. Linstrom and W.G. Mallard, Eds.,
+NIST Chemistry WebBook, NIST Standard Reference Database Number 69,
+National Institute of Standards and Technology, Gaithersburg MD, 20899,
+https://doi.org/10.18434/T4D303, (retrieved [insert date]).
+
+Span, Roland, and Wolfgang Wagner.
+"A new equation of state for carbon dioxide covering
+the fluid region from the tripleâ€point temperature
+to 1100 K at pressures up to 800 MPa."
+Journal of physical and chemical reference data 25.6 (1996): 1509-1596.
+https://doi.org/10.1063/1.555991
+
+######################################################################
+
+The density and the enthalpy are calculated using the equation of Span and
+Wagner (2009 "A New Equation of State for Carbon Dioxide Covering the Fluid
+Region from the Triple-Point Temperature to 1100 K at Pressures up to 800 MPa").
+Therefore, the maximum pressure limit is the lowest of the following values:
+* 800.0000 MPa
+* The pressure at which a density of 1178.5 kg/m3 is reached.
<details open>
-<summary><b>Click to hide/show the file documentation</b> (or inspect the [source code](../material/co2tableslaboratory.hh))</summary>
+<summary><b>Click to hide/show the file documentation</b> (or inspect the [source code](../material/co2tables.hh))</summary>
```cpp
-#include <assert.h>
-#include <test/porousmediumflow/co2/co2tablereader.hh>
-namespace Dumux::ICP {
-#include "co2valueslaboratory.inc"
-}// end namespace Dumux::ICP
+namespace Dumux::BiomineralizationCO2Tables {
+
+/*!
+ * \ingroup Components
+ * \brief A generic template for tabulated material laws that depend
+ * on two parameters.
+ */
+template <class Traits>
+class TabulatedProperties
+{
+ using Scalar = typename Traits::Scalar;
+
+ static constexpr auto numTempSteps = Traits::numTempSteps;
+ static constexpr auto numPressSteps = Traits::numPressSteps;
+
+public:
+ TabulatedProperties() = default;
+
+ constexpr Scalar minTemp() const { return Traits::minTemp; }
+ constexpr Scalar maxTemp() const { return Traits::maxTemp; }
+ constexpr Scalar minPress() const { return Traits::minPress; }
+ constexpr Scalar maxPress() const { return Traits::maxPress; }
+
+ constexpr bool applies(Scalar temperature, Scalar pressure) const
+ {
+ return minTemp() <= temperature && temperature <= maxTemp() &&
+ minPress() <= pressure && pressure <= maxPress();
+ }
+
+ constexpr Scalar at(Scalar temperature, Scalar pressure) const
+ {
+ if (!applies(temperature, pressure))
+ {
+ if (temperature<minTemp()) temperature = minTemp();
+ else if (temperature>maxTemp()) temperature = maxTemp();
+
+ if (pressure<minPress()) pressure = minPress();
+ else if (pressure>maxPress()) pressure = maxPress();
+ }
+
+ const int i = findTempIdx_(temperature);
+ const int j = findPressIdx_(pressure);
+
+ const Scalar tempAtI = temperatureAt_(i);
+ const Scalar tempAtI1 = temperatureAt_(i + 1);
+ const Scalar pressAtI = pressureAt_(j);
+ const Scalar pressAtI1 = pressureAt_(j + 1);
+
+ const Scalar alpha = (temperature - tempAtI)/(tempAtI1 - tempAtI);
+ const Scalar beta = (pressure - pressAtI)/(pressAtI1 - pressAtI);
+
+ // bi-linear interpolation
+ const Scalar lowresValue =
+ (1-alpha)*(1-beta)*val(i, j) +
+ (1-alpha)*( beta)*val(i, j + 1) +
+ ( alpha)*(1-beta)*val(i + 1, j) +
+ ( alpha)*( beta)*val(i + 1, j + 1);
+
+ // return the weighted sum of the low- and high-resolution values
+ return lowresValue;
+ }
+
+ constexpr Scalar val(int i, int j) const
+ { return Traits::vals[i][j]; }
+
+private:
+ constexpr int findTempIdx_(Scalar temperature) const
+ {
+ if (Dune::FloatCmp::eq<Scalar>(temperature, maxTemp()))
+ return numTempSteps - 2;
+
+ const int result = static_cast<int>((temperature - minTemp())/(maxTemp() - minTemp())*(numTempSteps - 1));
+
+ using std::clamp;
+ return clamp(result, 0, numTempSteps - 2);
+ }
+
+ constexpr int findPressIdx_(Scalar pressure) const
+ {
+ if (Dune::FloatCmp::eq<Scalar>(pressure, maxPress()))
+ return numPressSteps - 2;
+
+ const int result = static_cast<int>((pressure - minPress())/(maxPress() - minPress())*(numPressSteps - 1));
+
+ using std::clamp;
+ return clamp(result, 0, numPressSteps - 2);
+ }
+
+ constexpr Scalar temperatureAt_(int i) const
+ { return i*(maxTemp() - minTemp())/(numTempSteps - 1) + minTemp(); }
+
+ constexpr Scalar pressureAt_(int j) const
+ { return j*(maxPress() - minPress())/(numPressSteps - 1) + minPress(); }
+};
+
+#ifndef DOXYGEN // hide from doxygen
+// the real work is done by some external program which provides
+// ready-to-use tables.
+#include "co2values.inc"
+
+
+using TabulatedDensity = TabulatedProperties<TabulatedDensityTraits>;
+using TabulatedEnthalpy = TabulatedProperties<TabulatedEnthalpyTraits>;
+
+// this class collects all the tabulated quantities in one convenient place
+struct CO2Tables
+{
+ static constexpr inline TabulatedEnthalpy tabulatedEnthalpy = {};
+ static constexpr inline TabulatedDensity tabulatedDensity = {};
+};
+
+} // end namespace Dumux::GeneratedCO2Tables
```
diff --git a/examples/biomineralization/doc/fluidmaterial_intro.md b/examples/biomineralization/doc/fluidmaterial_intro.md
index 84c360cd3959bb7a385a8dea691fe6d8056976fe..5bd010706cc6c061bd6ce5ecd1185c44206ecc42 100644
--- a/examples/biomineralization/doc/fluidmaterial_intro.md
+++ b/examples/biomineralization/doc/fluidmaterial_intro.md
@@ -24,7 +24,7 @@ For further specialization, the overview over the material subfolder is split in
## Fluids in the folder `material`
As this example is about biomineralization involving many components with complex inteactions, some specific fluid material files are necessary.
-A CO_2-Table file provides tabulated CO_2 properties according to @Span1996 in `material/co2tableslaboratory.hh`
+A CO_2-Table file provides tabulated CO_2 properties according to @Span1996 in `material/co2tables.hh`
In the component subfolder, `material/components/suspendedbiomass.hh` defines the component suspended biomass, which is the mobile form of biomass being transported suspended in the aqueous fluid phase.
In the fluidsystem subfolder, the biomineralization fluidsystem `material/fluidsystems/biominsimplechemistry.hh` as well as
the complex salinity brine adapter `material/fluidsystems/icpcomplexsalinitybrine.hh` can be found.
diff --git a/examples/biomineralization/doc/setup.md b/examples/biomineralization/doc/setup.md
index 76d61cd9f48c15fcdc89501c0f8ac2c169ba2e1b..1824d6c3c3ca74ca963745fcaf673a1f5e0d04f7 100644
--- a/examples/biomineralization/doc/setup.md
+++ b/examples/biomineralization/doc/setup.md
@@ -835,7 +835,7 @@ We include the necessary material files
```cpp
#include <examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh>
#include <examples/biomineralization/material/solidsystems/biominsolids.hh>
-#include <examples/biomineralization/material/co2tableslaboratory.hh>
+#include <examples/biomineralization/material/co2tables.hh>
```
We include the problem and spatial parameters headers used for this simulation.
@@ -886,7 +886,7 @@ template<class TypeTag>
struct FluidSystem<TypeTag, TTag::MICPColumnSimpleChemistry>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using CO2Tables = Dumux::ICP::CO2Tables;
+ using CO2Tables = BiomineralizationCO2Tables::CO2Tables;
using H2OTabulated = Components::TabulatedComponent<Components::H2O<Scalar>>;
using type = Dumux::FluidSystems::BioMinSimpleChemistryFluid<Scalar, CO2Tables, H2OTabulated>;
};
diff --git a/examples/biomineralization/material/co2tables.hh b/examples/biomineralization/material/co2tables.hh
new file mode 100644
index 0000000000000000000000000000000000000000..4c8c7be6567f82c8f8ec6db59c7c6ca411c6cd35
--- /dev/null
+++ b/examples/biomineralization/material/co2tables.hh
@@ -0,0 +1,184 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \ingroup Components
+ * \brief A reader and tables for CO$_2$ tabulated material laws that depend
+ * on pressure and temperature.
+ */
+#ifndef DUMUX_EXAMPLE_BIOMINERALIZATION_CO2TABLES_HH
+#define DUMUX_EXAMPLE_BIOMINERALIZATION_CO2TABLES_HH
+
+#include <dune/common/float_cmp.hh>
+
+// ## The CO2 tables (`co2tables.hh`)
+//
+// This file contains the __co2table class__ which forwards to tabulated properties of CO2.
+// The tables are generated using the NIST (National Institute of Standards
+// and Technology) Standard Reference Database Number 69
+// (https://doi.org/10.18434/T4D303).
+//
+// Copyright for NIST Standard Reference Data is governed by the Standard
+// Reference Data Act (https://www.nist.gov/srd/public-law).
+//
+// ######################################################################
+// In case you are using this the data generated with this script
+// please cite the following publications:
+//
+// P.J. Linstrom and W.G. Mallard, Eds.,
+// NIST Chemistry WebBook, NIST Standard Reference Database Number 69,
+// National Institute of Standards and Technology, Gaithersburg MD, 20899,
+// https://doi.org/10.18434/T4D303, (retrieved [insert date]).
+//
+// Span, Roland, and Wolfgang Wagner.
+// "A new equation of state for carbon dioxide covering
+// the fluid region from the tripleâ€point temperature
+// to 1100 K at pressures up to 800 MPa."
+// Journal of physical and chemical reference data 25.6 (1996): 1509-1596.
+// https://doi.org/10.1063/1.555991
+//
+// ######################################################################
+//
+// The density and the enthalpy are calculated using the equation of Span and
+// Wagner (2009 "A New Equation of State for Carbon Dioxide Covering the Fluid
+// Region from the Triple-Point Temperature to 1100 K at Pressures up to 800 MPa").
+// Therefore, the maximum pressure limit is the lowest of the following values:
+// * 800.0000 MPa
+// * The pressure at which a density of 1178.5 kg/m3 is reached.
+//
+// [[content]]
+//
+// [[codeblock]]
+
+namespace Dumux::BiomineralizationCO2Tables {
+
+/*!
+ * \ingroup Components
+ * \brief A generic template for tabulated material laws that depend
+ * on two parameters.
+ */
+template <class Traits>
+class TabulatedProperties
+{
+ using Scalar = typename Traits::Scalar;
+
+ static constexpr auto numTempSteps = Traits::numTempSteps;
+ static constexpr auto numPressSteps = Traits::numPressSteps;
+
+public:
+ TabulatedProperties() = default;
+
+ constexpr Scalar minTemp() const { return Traits::minTemp; }
+ constexpr Scalar maxTemp() const { return Traits::maxTemp; }
+ constexpr Scalar minPress() const { return Traits::minPress; }
+ constexpr Scalar maxPress() const { return Traits::maxPress; }
+
+ constexpr bool applies(Scalar temperature, Scalar pressure) const
+ {
+ return minTemp() <= temperature && temperature <= maxTemp() &&
+ minPress() <= pressure && pressure <= maxPress();
+ }
+
+ constexpr Scalar at(Scalar temperature, Scalar pressure) const
+ {
+ if (!applies(temperature, pressure))
+ {
+ if (temperature<minTemp()) temperature = minTemp();
+ else if (temperature>maxTemp()) temperature = maxTemp();
+
+ if (pressure<minPress()) pressure = minPress();
+ else if (pressure>maxPress()) pressure = maxPress();
+ }
+
+ const int i = findTempIdx_(temperature);
+ const int j = findPressIdx_(pressure);
+
+ const Scalar tempAtI = temperatureAt_(i);
+ const Scalar tempAtI1 = temperatureAt_(i + 1);
+ const Scalar pressAtI = pressureAt_(j);
+ const Scalar pressAtI1 = pressureAt_(j + 1);
+
+ const Scalar alpha = (temperature - tempAtI)/(tempAtI1 - tempAtI);
+ const Scalar beta = (pressure - pressAtI)/(pressAtI1 - pressAtI);
+
+ // bi-linear interpolation
+ const Scalar lowresValue =
+ (1-alpha)*(1-beta)*val(i, j) +
+ (1-alpha)*( beta)*val(i, j + 1) +
+ ( alpha)*(1-beta)*val(i + 1, j) +
+ ( alpha)*( beta)*val(i + 1, j + 1);
+
+ // return the weighted sum of the low- and high-resolution values
+ return lowresValue;
+ }
+
+ constexpr Scalar val(int i, int j) const
+ { return Traits::vals[i][j]; }
+
+private:
+ constexpr int findTempIdx_(Scalar temperature) const
+ {
+ if (Dune::FloatCmp::eq<Scalar>(temperature, maxTemp()))
+ return numTempSteps - 2;
+
+ const int result = static_cast<int>((temperature - minTemp())/(maxTemp() - minTemp())*(numTempSteps - 1));
+
+ using std::clamp;
+ return clamp(result, 0, numTempSteps - 2);
+ }
+
+ constexpr int findPressIdx_(Scalar pressure) const
+ {
+ if (Dune::FloatCmp::eq<Scalar>(pressure, maxPress()))
+ return numPressSteps - 2;
+
+ const int result = static_cast<int>((pressure - minPress())/(maxPress() - minPress())*(numPressSteps - 1));
+
+ using std::clamp;
+ return clamp(result, 0, numPressSteps - 2);
+ }
+
+ constexpr Scalar temperatureAt_(int i) const
+ { return i*(maxTemp() - minTemp())/(numTempSteps - 1) + minTemp(); }
+
+ constexpr Scalar pressureAt_(int j) const
+ { return j*(maxPress() - minPress())/(numPressSteps - 1) + minPress(); }
+};
+
+#ifndef DOXYGEN // hide from doxygen
+// the real work is done by some external program which provides
+// ready-to-use tables.
+#include "co2values.inc"
+#endif
+
+using TabulatedDensity = TabulatedProperties<TabulatedDensityTraits>;
+using TabulatedEnthalpy = TabulatedProperties<TabulatedEnthalpyTraits>;
+
+// this class collects all the tabulated quantities in one convenient place
+struct CO2Tables
+{
+ static constexpr inline TabulatedEnthalpy tabulatedEnthalpy = {};
+ static constexpr inline TabulatedDensity tabulatedDensity = {};
+};
+
+} // end namespace Dumux::GeneratedCO2Tables
+// [[/codeblock]]
+// [[/content]]
+
+#endif
diff --git a/examples/biomineralization/material/co2tableslaboratory.hh b/examples/biomineralization/material/co2tableslaboratory.hh
deleted file mode 100644
index 972dc17ffb4286a038760b862898f3d1cd0cde3e..0000000000000000000000000000000000000000
--- a/examples/biomineralization/material/co2tableslaboratory.hh
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-
-#ifndef DUMUX_ICP_CO2TABLES_LABORATORY_HH
-#define DUMUX_ICP_CO2TABLES_LABORATORY_HH
-
-// ## The CO2 tables (`co2tableslaboratory.hh`)
-//
-// This file contains the __co2table class__ which forwards to tabulated properties of CO2 according to Span and Wagner 1996.
-// The real work (creating the tables) is done by some external program by Span and Wagner 1996 which provides the ready-to-use tables.
-//
-// [[content]]
-//
-// [[codeblock]]
-
-#include <assert.h>
-#include <test/porousmediumflow/co2/co2tablereader.hh>
-namespace Dumux::ICP {
-#include "co2valueslaboratory.inc"
-}// end namespace Dumux::ICP
-// [[/codeblock]]
-// [[/content]]
-#endif
diff --git a/examples/biomineralization/material/co2values.inc b/examples/biomineralization/material/co2values.inc
new file mode 100644
index 0000000000000000000000000000000000000000..434b1a2e3a2d042eb4b2447ad30c7476590b7284
--- /dev/null
+++ b/examples/biomineralization/material/co2values.inc
@@ -0,0 +1,78 @@
+/* Tables for CO2 fluid properties calculated according to Span and
+ * Wagner (1996) and using a web service of the National Institute
+ * of Standards and Techlology of the U.S. Department of Commerce:
+ * https://webbook.nist.gov/
+ *
+ * THIS AN AUTO-GENERATED FILE! DO NOT EDIT IT!
+ *
+ ********************************************************************
+
+ In case you are using this the data generated with this script
+ please cite the following publications:
+
+ P.J. Linstrom and W.G. Mallard, Eds.,
+ NIST Chemistry WebBook, NIST Standard Reference Database Number 69,
+ National Institute of Standards and Technology, Gaithersburg MD, 20899,
+ https://doi.org/10.18434/T4D303, (retrieved April 25, 2022).
+
+ Span, Roland, and Wolfgang Wagner.
+ "A new equation of state for carbon dioxide covering
+ the fluid region from the tripleâ€point temperature
+ to 1100 K at pressures up to 800 MPa."
+ Journal of physical and chemical reference data 25.6 (1996): 1509-1596.
+ https://doi.org/10.1063/1.555991
+
+ ********************************************************************
+ *
+ * Generated using:
+ *
+ * ./make_co2_table.py -t1 293.15 -t2 303.15 -nt 10 -p1 95000.0 -p2 145000.0 -np 50
+ */
+
+struct TabulatedDensityTraits
+{
+ using Scalar = double;
+ static constexpr std::string_view name = "density";
+ static constexpr int numTempSteps = 10;
+ static constexpr Scalar minTemp = 293.15;
+ static constexpr Scalar maxTemp = 303.15;
+ static constexpr int numPressSteps = 50;
+ static constexpr Scalar minPress = 95000.0;
+ static constexpr Scalar maxPress = 145000.0;
+ static constexpr Scalar vals[numTempSteps][numPressSteps] = {
+ {1.723948306030e+00, 1.742559905290e+00, 1.761173529270e+00, 1.779789178530e+00, 1.798406853630e+00, 1.817026555130e+00, 1.835648283590e+00, 1.854272039590e+00, 1.872897823680e+00, 1.891525636430e+00, 1.910155478410e+00, 1.928787350180e+00, 1.947421252310e+00, 1.966057185360e+00, 1.984695149890e+00, 2.003335146480e+00, 2.021977175690e+00, 2.040621238090e+00, 2.059267334250e+00, 2.077915464720e+00, 2.096565630090e+00, 2.115217830910e+00, 2.133872067760e+00, 2.152528341200e+00, 2.171186651800e+00, 2.189847000140e+00, 2.208509386770e+00, 2.227173812280e+00, 2.245840277220e+00, 2.264508782180e+00, 2.283179327710e+00, 2.301851914390e+00, 2.320526542790e+00, 2.339203213480e+00, 2.357881927040e+00, 2.376562684030e+00, 2.395245485020e+00, 2.413930330590e+00, 2.432617221310e+00, 2.451306157750e+00, 2.469997140490e+00, 2.488690170090e+00, 2.507385247140e+00, 2.526082372190e+00, 2.544781545840e+00, 2.563482768650e+00, 2.582186041190e+00, 2.600891364050e+00, 2.619598737790e+00, 2.638308162990e+00},
+ {1.717331325170e+00, 1.735870305270e+00, 1.754411276690e+00, 1.772954239980e+00, 1.791499195680e+00, 1.810046144340e+00, 1.828595086510e+00, 1.847146022730e+00, 1.865698953550e+00, 1.884253879520e+00, 1.902810801180e+00, 1.921369719090e+00, 1.939930633780e+00, 1.958493545810e+00, 1.977058455730e+00, 1.995625364080e+00, 2.014194271410e+00, 2.032765178280e+00, 2.051338085230e+00, 2.069912992810e+00, 2.088489901570e+00, 2.107068812060e+00, 2.125649724840e+00, 2.144232640440e+00, 2.162817559430e+00, 2.181404482350e+00, 2.199993409760e+00, 2.218584342200e+00, 2.237177280240e+00, 2.255772224410e+00, 2.274369175270e+00, 2.292968133380e+00, 2.311569099290e+00, 2.330172073550e+00, 2.348777056710e+00, 2.367384049330e+00, 2.385993051960e+00, 2.404604065150e+00, 2.423217089470e+00, 2.441832125450e+00, 2.460449173670e+00, 2.479068234670e+00, 2.497689309010e+00, 2.516312397240e+00, 2.534937499920e+00, 2.553564617610e+00, 2.572193750860e+00, 2.590824900220e+00, 2.609458066260e+00, 2.628093249540e+00},
+ {1.710765836600e+00, 1.729232781450e+00, 1.747701684910e+00, 1.766172547500e+00, 1.784645369750e+00, 1.803120152200e+00, 1.821596895360e+00, 1.840075599780e+00, 1.858556265980e+00, 1.877038894490e+00, 1.895523485840e+00, 1.914010040560e+00, 1.932498559180e+00, 1.950989042240e+00, 1.969481490260e+00, 1.987975903780e+00, 2.006472283330e+00, 2.024970629430e+00, 2.043470942630e+00, 2.061973223460e+00, 2.080477472440e+00, 2.098983690110e+00, 2.117491877000e+00, 2.136002033650e+00, 2.154514160590e+00, 2.173028258350e+00, 2.191544327480e+00, 2.210062368490e+00, 2.228582381930e+00, 2.247104368330e+00, 2.265628328230e+00, 2.284154262160e+00, 2.302682170660e+00, 2.321212054260e+00, 2.339743913500e+00, 2.358277748910e+00, 2.376813561030e+00, 2.395351350400e+00, 2.413891117560e+00, 2.432432863040e+00, 2.450976587370e+00, 2.469522291110e+00, 2.488069974780e+00, 2.506619638920e+00, 2.525171284070e+00, 2.543724910760e+00, 2.562280519550e+00, 2.580838110970e+00, 2.599397685550e+00, 2.617959243830e+00},
+ {1.704251226290e+00, 1.722646712460e+00, 1.741044125190e+00, 1.759443464970e+00, 1.777844732320e+00, 1.796247927750e+00, 1.814653051780e+00, 1.833060104920e+00, 1.851469087680e+00, 1.869880000580e+00, 1.888292844130e+00, 1.906707618840e+00, 1.925124325230e+00, 1.943542963810e+00, 1.961963535100e+00, 1.980386039620e+00, 1.998810477870e+00, 2.017236850370e+00, 2.035665157650e+00, 2.054095400200e+00, 2.072527578560e+00, 2.090961693240e+00, 2.109397744750e+00, 2.127835733610e+00, 2.146275660330e+00, 2.164717525440e+00, 2.183161329450e+00, 2.201607072890e+00, 2.220054756260e+00, 2.238504380080e+00, 2.256955944880e+00, 2.275409451170e+00, 2.293864899470e+00, 2.312322290300e+00, 2.330781624180e+00, 2.349242901630e+00, 2.367706123160e+00, 2.386171289310e+00, 2.404638400580e+00, 2.423107457500e+00, 2.441578460590e+00, 2.460051410360e+00, 2.478526307350e+00, 2.497003152070e+00, 2.515481945040e+00, 2.533962686790e+00, 2.552445377840e+00, 2.570930018700e+00, 2.589416609900e+00, 2.607905151970e+00},
+ {1.697786890250e+00, 1.716111487110e+00, 1.734437979100e+00, 1.752766366720e+00, 1.771096650450e+00, 1.789428830800e+00, 1.807762908270e+00, 1.826098883340e+00, 1.844436756530e+00, 1.862776528320e+00, 1.881118199210e+00, 1.899461769710e+00, 1.917807240300e+00, 1.936154611500e+00, 1.954503883800e+00, 1.972855057690e+00, 1.991208133680e+00, 2.009563112260e+00, 2.027919993940e+00, 2.046278779210e+00, 2.064639468580e+00, 2.083002062550e+00, 2.101366561610e+00, 2.119732966270e+00, 2.138101277020e+00, 2.156471494380e+00, 2.174843618830e+00, 2.193217650890e+00, 2.211593591050e+00, 2.229971439810e+00, 2.248351197680e+00, 2.266732865160e+00, 2.285116442760e+00, 2.303501930960e+00, 2.321889330290e+00, 2.340278641240e+00, 2.358669864310e+00, 2.377063000010e+00, 2.395458048850e+00, 2.413855011320e+00, 2.432253887930e+00, 2.450654679190e+00, 2.469057385590e+00, 2.487462007660e+00, 2.505868545880e+00, 2.524277000760e+00, 2.542687372820e+00, 2.561099662560e+00, 2.579513870480e+00, 2.597929997080e+00},
+ {1.691372234350e+00, 1.709626504170e+00, 1.727882638330e+00, 1.746140637300e+00, 1.764400501570e+00, 1.782662231610e+00, 1.800925827910e+00, 1.819191290960e+00, 1.837458621220e+00, 1.855727819200e+00, 1.873998885360e+00, 1.892271820190e+00, 1.910546624170e+00, 1.928823297790e+00, 1.947101841530e+00, 1.965382255880e+00, 1.983664541310e+00, 2.001948698320e+00, 2.020234727380e+00, 2.038522628980e+00, 2.056812403610e+00, 2.075104051740e+00, 2.093397573870e+00, 2.111692970480e+00, 2.129990242050e+00, 2.148289389080e+00, 2.166590412040e+00, 2.184893311420e+00, 2.203198087710e+00, 2.221504741400e+00, 2.239813272970e+00, 2.258123682900e+00, 2.276435971700e+00, 2.294750139830e+00, 2.313066187790e+00, 2.331384116080e+00, 2.349703925160e+00, 2.368025615540e+00, 2.386349187710e+00, 2.404674642140e+00, 2.423001979330e+00, 2.441331199770e+00, 2.459662303940e+00, 2.477995292340e+00, 2.496330165460e+00, 2.514666923780e+00, 2.533005567800e+00, 2.551346098000e+00, 2.569688514870e+00, 2.588032818910e+00},
+ {1.685006674100e+00, 1.703191172190e+00, 1.721377504430e+00, 1.739565671290e+00, 1.757755673230e+00, 1.775947510710e+00, 1.794141184220e+00, 1.812336694210e+00, 1.830534041140e+00, 1.848733225500e+00, 1.866934247740e+00, 1.885137108340e+00, 1.903341807760e+00, 1.921548346470e+00, 1.939756724930e+00, 1.957966943630e+00, 1.976179003020e+00, 1.994392903580e+00, 2.012608645770e+00, 2.030826230060e+00, 2.049045656930e+00, 2.067266926840e+00, 2.085490040270e+00, 2.103714997680e+00, 2.121941799540e+00, 2.140170446330e+00, 2.158400938510e+00, 2.176633276560e+00, 2.194867460940e+00, 2.213103492140e+00, 2.231341370610e+00, 2.249581096840e+00, 2.267822671290e+00, 2.286066094440e+00, 2.304311366760e+00, 2.322558488710e+00, 2.340807460780e+00, 2.359058283440e+00, 2.377310957150e+00, 2.395565482400e+00, 2.413821859660e+00, 2.432080089390e+00, 2.450340172080e+00, 2.468602108200e+00, 2.486865898220e+00, 2.505131542620e+00, 2.523399041860e+00, 2.541668396440e+00, 2.559939606810e+00, 2.578212673460e+00},
+ {1.678689634460e+00, 1.696804909270e+00, 1.714921988650e+00, 1.733040873050e+00, 1.751161562910e+00, 1.769284058690e+00, 1.787408360840e+00, 1.805534469810e+00, 1.823662386060e+00, 1.841792110050e+00, 1.859923642210e+00, 1.878056983010e+00, 1.896192132900e+00, 1.914329092340e+00, 1.932467861780e+00, 1.950608441660e+00, 1.968750832460e+00, 1.986895034620e+00, 2.005041048590e+00, 2.023188874830e+00, 2.041338513810e+00, 2.059489965960e+00, 2.077643231750e+00, 2.095798311640e+00, 2.113955206070e+00, 2.132113915510e+00, 2.150274440410e+00, 2.168436781230e+00, 2.186600938420e+00, 2.204766912440e+00, 2.222934703760e+00, 2.241104312810e+00, 2.259275740080e+00, 2.277448986000e+00, 2.295624051040e+00, 2.313800935650e+00, 2.331979640300e+00, 2.350160165440e+00, 2.368342511540e+00, 2.386526679040e+00, 2.404712668410e+00, 2.422900480110e+00, 2.441090114590e+00, 2.459281572330e+00, 2.477474853760e+00, 2.495669959360e+00, 2.513866889590e+00, 2.532065644900e+00, 2.550266225760e+00, 2.568468632630e+00},
+ {1.672420549580e+00, 1.690467142870e+00, 1.708515511710e+00, 1.726565656540e+00, 1.744617577810e+00, 1.762671275940e+00, 1.780726751390e+00, 1.798784004580e+00, 1.816843035960e+00, 1.834903845960e+00, 1.852966435030e+00, 1.871030803610e+00, 1.889096952130e+00, 1.907164881040e+00, 1.925234590770e+00, 1.943306081770e+00, 1.961379354470e+00, 1.979454409320e+00, 1.997531246750e+00, 2.015609867220e+00, 2.033690271150e+00, 2.051772459000e+00, 2.069856431190e+00, 2.087942188190e+00, 2.106029730410e+00, 2.124119058320e+00, 2.142210172340e+00, 2.160303072930e+00, 2.178397760520e+00, 2.196494235570e+00, 2.214592498500e+00, 2.232692549760e+00, 2.250794389810e+00, 2.268898019070e+00, 2.287003438000e+00, 2.305110647030e+00, 2.323219646620e+00, 2.341330437210e+00, 2.359443019230e+00, 2.377557393140e+00, 2.395673559380e+00, 2.413791518400e+00, 2.431911270630e+00, 2.450032816530e+00, 2.468156156540e+00, 2.486281291110e+00, 2.504408220670e+00, 2.522536945690e+00, 2.540667466600e+00, 2.558799783840e+00},
+ {1.666198862710e+00, 1.684177309590e+00, 1.702157503580e+00, 1.720139445120e+00, 1.738123134620e+00, 1.756108572510e+00, 1.774095759220e+00, 1.792084695160e+00, 1.810075380780e+00, 1.828067816480e+00, 1.846062002710e+00, 1.864057939880e+00, 1.882055628420e+00, 1.900055068760e+00, 1.918056261320e+00, 1.936059206540e+00, 1.954063904830e+00, 1.972070356630e+00, 1.990078562360e+00, 2.008088522450e+00, 2.026100237330e+00, 2.044113707420e+00, 2.062128933160e+00, 2.080145914960e+00, 2.098164653270e+00, 2.116185148510e+00, 2.134207401100e+00, 2.152231411480e+00, 2.170257180080e+00, 2.188284707320e+00, 2.206313993630e+00, 2.224345039440e+00, 2.242377845190e+00, 2.260412411300e+00, 2.278448738210e+00, 2.296486826330e+00, 2.314526676110e+00, 2.332568287970e+00, 2.350611662340e+00, 2.368656799660e+00, 2.386703700360e+00, 2.404752364860e+00, 2.422802793610e+00, 2.440854987020e+00, 2.458908945530e+00, 2.476964669580e+00, 2.495022159590e+00, 2.513081416000e+00, 2.531142439240e+00, 2.549205229740e+00}
+ };
+};
+
+struct TabulatedEnthalpyTraits
+{
+ using Scalar = double;
+ static constexpr std::string_view name = "enthalpy";
+ static constexpr int numTempSteps = 10;
+ static constexpr Scalar minTemp = 293.15;
+ static constexpr Scalar maxTemp = 303.15;
+ static constexpr int numPressSteps = 50;
+ static constexpr Scalar minPress = 95000.0;
+ static constexpr Scalar maxPress = 145000.0;
+ static constexpr Scalar vals[numTempSteps][numPressSteps] = {
+ {1.678997536687e+04, 1.678012437187e+04, 1.677027245487e+04, 1.676041961487e+04, 1.675056585287e+04, 1.674071116687e+04, 1.673085555887e+04, 1.672099902587e+04, 1.671114156987e+04, 1.670128318987e+04, 1.669142388587e+04, 1.668156365687e+04, 1.667170250287e+04, 1.666184042487e+04, 1.665197742087e+04, 1.664211349187e+04, 1.663224863587e+04, 1.662238285487e+04, 1.661251614787e+04, 1.660264851387e+04, 1.659277995287e+04, 1.658291046487e+04, 1.657304005087e+04, 1.656316870787e+04, 1.655329643787e+04, 1.654342323987e+04, 1.653354911287e+04, 1.652367405787e+04, 1.651379807387e+04, 1.650392116087e+04, 1.649404331887e+04, 1.648416454787e+04, 1.647428484587e+04, 1.646440421487e+04, 1.645452265287e+04, 1.644464016087e+04, 1.643475673787e+04, 1.642487238387e+04, 1.641498709887e+04, 1.640510088187e+04, 1.639521373287e+04, 1.638532565287e+04, 1.637543663987e+04, 1.636554669387e+04, 1.635565581587e+04, 1.634576400487e+04, 1.633587125987e+04, 1.632597758187e+04, 1.631608296987e+04, 1.630618742387e+04},
+ {1.773011562787e+04, 1.772034748787e+04, 1.771057844687e+04, 1.770080850487e+04, 1.769103766187e+04, 1.768126591687e+04, 1.767149327087e+04, 1.766171972387e+04, 1.765194527387e+04, 1.764216992187e+04, 1.763239366687e+04, 1.762261650987e+04, 1.761283844887e+04, 1.760305948487e+04, 1.759327961787e+04, 1.758349884687e+04, 1.757371717187e+04, 1.756393459287e+04, 1.755415110887e+04, 1.754436672087e+04, 1.753458142687e+04, 1.752479522887e+04, 1.751500812487e+04, 1.750522011587e+04, 1.749543119987e+04, 1.748564137787e+04, 1.747585064987e+04, 1.746605901587e+04, 1.745626647387e+04, 1.744647302587e+04, 1.743667866987e+04, 1.742688340687e+04, 1.741708723487e+04, 1.740729015587e+04, 1.739749216787e+04, 1.738769327187e+04, 1.737789346687e+04, 1.736809275287e+04, 1.735829112987e+04, 1.734848859687e+04, 1.733868515387e+04, 1.732888080187e+04, 1.731907553887e+04, 1.730926936587e+04, 1.729946228187e+04, 1.728965428687e+04, 1.727984538087e+04, 1.727003556287e+04, 1.726022483387e+04, 1.725041319287e+04},
+ {1.867144821787e+04, 1.866176178387e+04, 1.865207447087e+04, 1.864238627787e+04, 1.863269720487e+04, 1.862300725187e+04, 1.861331641787e+04, 1.860362470287e+04, 1.859393210787e+04, 1.858423863087e+04, 1.857454427287e+04, 1.856484903287e+04, 1.855515291187e+04, 1.854545590787e+04, 1.853575802187e+04, 1.852605925287e+04, 1.851635960187e+04, 1.850665906687e+04, 1.849695764987e+04, 1.848725534887e+04, 1.847755216387e+04, 1.846784809487e+04, 1.845814314187e+04, 1.844843730487e+04, 1.843873058287e+04, 1.842902297587e+04, 1.841931448387e+04, 1.840960510687e+04, 1.839989484387e+04, 1.839018369587e+04, 1.838047166087e+04, 1.837075873987e+04, 1.836104493287e+04, 1.835133023887e+04, 1.834161465787e+04, 1.833189818987e+04, 1.832218083487e+04, 1.831246259187e+04, 1.830274346087e+04, 1.829302344187e+04, 1.828330253487e+04, 1.827358073887e+04, 1.826385805387e+04, 1.825413447987e+04, 1.824441001687e+04, 1.823468466487e+04, 1.822495842287e+04, 1.821523129087e+04, 1.820550326887e+04, 1.819577435587e+04},
+ {1.961397238587e+04, 1.960436653387e+04, 1.959475982187e+04, 1.958515225187e+04, 1.957554382187e+04, 1.956593453187e+04, 1.955632438187e+04, 1.954671337287e+04, 1.953710150187e+04, 1.952748877087e+04, 1.951787517887e+04, 1.950826072687e+04, 1.949864541187e+04, 1.948902923687e+04, 1.947941219987e+04, 1.946979429987e+04, 1.946017553887e+04, 1.945055591487e+04, 1.944093542787e+04, 1.943131407887e+04, 1.942169186687e+04, 1.941206879087e+04, 1.940244485187e+04, 1.939282004987e+04, 1.938319438287e+04, 1.937356785187e+04, 1.936394045687e+04, 1.935431219687e+04, 1.934468307287e+04, 1.933505308287e+04, 1.932542222787e+04, 1.931579050787e+04, 1.930615792187e+04, 1.929652446987e+04, 1.928689015187e+04, 1.927725496687e+04, 1.926761891587e+04, 1.925798199887e+04, 1.924834421387e+04, 1.923870556187e+04, 1.922906604187e+04, 1.921942565487e+04, 1.920978439987e+04, 1.920014227687e+04, 1.919049928487e+04, 1.918085542487e+04, 1.917121069587e+04, 1.916156509787e+04, 1.915191863087e+04, 1.914227129387e+04},
+ {2.055768731187e+04, 2.054816093787e+04, 2.053863372487e+04, 2.052910567287e+04, 2.051957678087e+04, 2.051004704987e+04, 2.050051647787e+04, 2.049098506587e+04, 2.048145281387e+04, 2.047191972187e+04, 2.046238578787e+04, 2.045285101287e+04, 2.044331539787e+04, 2.043377893987e+04, 2.042424164087e+04, 2.041470350087e+04, 2.040516451787e+04, 2.039562469187e+04, 2.038608402487e+04, 2.037654251387e+04, 2.036700016087e+04, 2.035745696487e+04, 2.034791292487e+04, 2.033836804087e+04, 2.032882231387e+04, 2.031927574287e+04, 2.030972832787e+04, 2.030018006787e+04, 2.029063096287e+04, 2.028108101387e+04, 2.027153021987e+04, 2.026197857987e+04, 2.025242609487e+04, 2.024287276487e+04, 2.023331858787e+04, 2.022376356487e+04, 2.021420769587e+04, 2.020465098087e+04, 2.019509341787e+04, 2.018553500887e+04, 2.017597575287e+04, 2.016641564887e+04, 2.015685469787e+04, 2.014729289787e+04, 2.013773025087e+04, 2.012816675587e+04, 2.011860241187e+04, 2.010903721887e+04, 2.009947117787e+04, 2.008990428687e+04},
+ {2.150259211087e+04, 2.149314413387e+04, 2.148369533687e+04, 2.147424572087e+04, 2.146479528387e+04, 2.145534402687e+04, 2.144589194887e+04, 2.143643904987e+04, 2.142698533087e+04, 2.141753079087e+04, 2.140807542887e+04, 2.139861924487e+04, 2.138916223987e+04, 2.137970441287e+04, 2.137024576387e+04, 2.136078629287e+04, 2.135132599887e+04, 2.134186488187e+04, 2.133240294187e+04, 2.132294017887e+04, 2.131347659287e+04, 2.130401218287e+04, 2.129454694987e+04, 2.128508089187e+04, 2.127561400987e+04, 2.126614630387e+04, 2.125667777387e+04, 2.124720841787e+04, 2.123773823787e+04, 2.122826723187e+04, 2.121879540087e+04, 2.120932274487e+04, 2.119984926287e+04, 2.119037495387e+04, 2.118089981987e+04, 2.117142385887e+04, 2.116194707187e+04, 2.115246945687e+04, 2.114299101587e+04, 2.113351174687e+04, 2.112403165087e+04, 2.111455072787e+04, 2.110506897687e+04, 2.109558639687e+04, 2.108610298887e+04, 2.107661875287e+04, 2.106713368887e+04, 2.105764779487e+04, 2.104816107187e+04, 2.103867351987e+04},
+ {2.244868583587e+04, 2.243931519487e+04, 2.242994375287e+04, 2.242057150887e+04, 2.241119846487e+04, 2.240182461887e+04, 2.239244997187e+04, 2.238307452287e+04, 2.237369827187e+04, 2.236432121887e+04, 2.235494336287e+04, 2.234556470487e+04, 2.233618524387e+04, 2.232680497987e+04, 2.231742391287e+04, 2.230804204287e+04, 2.229865936887e+04, 2.228927589087e+04, 2.227989160987e+04, 2.227050652487e+04, 2.226112063487e+04, 2.225173393987e+04, 2.224234644087e+04, 2.223295813787e+04, 2.222356902887e+04, 2.221417911387e+04, 2.220478839487e+04, 2.219539686887e+04, 2.218600453787e+04, 2.217661140087e+04, 2.216721745787e+04, 2.215782270787e+04, 2.214842715087e+04, 2.213903078787e+04, 2.212963361787e+04, 2.212023563987e+04, 2.211083685487e+04, 2.210143726187e+04, 2.209203686187e+04, 2.208263565387e+04, 2.207323363687e+04, 2.206383081187e+04, 2.205442717887e+04, 2.204502273587e+04, 2.203561748487e+04, 2.202621142487e+04, 2.201680455487e+04, 2.200739687487e+04, 2.199798838587e+04, 2.198857908687e+04},
+ {2.339596747787e+04, 2.338667313187e+04, 2.337737800387e+04, 2.336808209187e+04, 2.335878539787e+04, 2.334948792087e+04, 2.334018966087e+04, 2.333089061787e+04, 2.332159079087e+04, 2.331229017987e+04, 2.330298878587e+04, 2.329368660687e+04, 2.328438364387e+04, 2.327507989687e+04, 2.326577536487e+04, 2.325647004887e+04, 2.324716394687e+04, 2.323785705987e+04, 2.322854938787e+04, 2.321924092987e+04, 2.320993168687e+04, 2.320062165687e+04, 2.319131084187e+04, 2.318199923987e+04, 2.317268685187e+04, 2.316337367687e+04, 2.315405971487e+04, 2.314474496587e+04, 2.313542942987e+04, 2.312611310587e+04, 2.311679599487e+04, 2.310747809587e+04, 2.309815940987e+04, 2.308883993487e+04, 2.307951967087e+04, 2.307019861887e+04, 2.306087677887e+04, 2.305155414887e+04, 2.304223073087e+04, 2.303290652287e+04, 2.302358152487e+04, 2.301425573787e+04, 2.300492916087e+04, 2.299560179387e+04, 2.298627363687e+04, 2.297694468887e+04, 2.296761495087e+04, 2.295828442187e+04, 2.294895310187e+04, 2.293962099087e+04},
+ {2.434443597187e+04, 2.433521689887e+04, 2.432599706287e+04, 2.431677646187e+04, 2.430755509587e+04, 2.429833296487e+04, 2.428911006887e+04, 2.427988640687e+04, 2.427066197987e+04, 2.426143678687e+04, 2.425221082887e+04, 2.424298410387e+04, 2.423375661287e+04, 2.422452835587e+04, 2.421529933187e+04, 2.420606954087e+04, 2.419683898387e+04, 2.418760765887e+04, 2.417837556687e+04, 2.416914270687e+04, 2.415990907987e+04, 2.415067468487e+04, 2.414143952187e+04, 2.413220359087e+04, 2.412296689087e+04, 2.411372942287e+04, 2.410449118587e+04, 2.409525217987e+04, 2.408601240487e+04, 2.407677186087e+04, 2.406753054687e+04, 2.405828846387e+04, 2.404904561087e+04, 2.403980198787e+04, 2.403055759387e+04, 2.402131243087e+04, 2.401206649687e+04, 2.400281979187e+04, 2.399357231587e+04, 2.398432406887e+04, 2.397507505087e+04, 2.396582526187e+04, 2.395657469987e+04, 2.394732336787e+04, 2.393807126287e+04, 2.392881838587e+04, 2.391956473587e+04, 2.391031031387e+04, 2.390105511987e+04, 2.389179915187e+04},
+ {2.529409019387e+04, 2.528494539387e+04, 2.527579984687e+04, 2.526665355387e+04, 2.525750651287e+04, 2.524835872387e+04, 2.523921018787e+04, 2.523006090387e+04, 2.522091087187e+04, 2.521176009187e+04, 2.520260856287e+04, 2.519345628587e+04, 2.518430325987e+04, 2.517514948587e+04, 2.516599496187e+04, 2.515683968887e+04, 2.514768366687e+04, 2.513852689487e+04, 2.512936937387e+04, 2.512021110187e+04, 2.511105208087e+04, 2.510189230887e+04, 2.509273178687e+04, 2.508357051387e+04, 2.507440849087e+04, 2.506524571687e+04, 2.505608219087e+04, 2.504691791487e+04, 2.503775288587e+04, 2.502858710687e+04, 2.501942057487e+04, 2.501025329187e+04, 2.500108525587e+04, 2.499191646787e+04, 2.498274692787e+04, 2.497357663487e+04, 2.496440558887e+04, 2.495523378987e+04, 2.494606123787e+04, 2.493688793287e+04, 2.492771387387e+04, 2.491853906187e+04, 2.490936349487e+04, 2.490018717487e+04, 2.489101010087e+04, 2.488183227187e+04, 2.487265368787e+04, 2.486347434987e+04, 2.485429425687e+04, 2.484511340887e+04}
+ };
+};
diff --git a/examples/biomineralization/material/co2valueslaboratory.inc b/examples/biomineralization/material/co2valueslaboratory.inc
deleted file mode 100644
index 536074c76bf8d5a9d5d509b8c98b75bb529ac5cc..0000000000000000000000000000000000000000
--- a/examples/biomineralization/material/co2valueslaboratory.inc
+++ /dev/null
@@ -1,424 +0,0 @@
-/* Tables for CO2 fluid properties calculated according to Span and
- * Wagner (1996).
- *
- * THIS AN AUTO-GENERATED FILE! DO NOT EDIT IT!
- *
- * Temperature range: 288.000 K to 303.000 K, using 15 sampling points
- * Pressure range: 0.095 MPa to 0.145 MPa, using 50 sampling points
- *
- * Generated using:
- *
- * ./extractproperties 288 303 15 95000 145000 50
- */
-
-
-struct TabulatedDensityTraits {
- typedef double Scalar;
- static const char *name;
- static const int numTempSteps = 15;
- static constexpr Scalar minTemp = 2.880000000000000e+02;
- static constexpr Scalar maxTemp = 3.030000000000000e+02;
- static const int numPressSteps = 50;
- static constexpr Scalar minPress = 9.500000000000000e+04;
- static constexpr Scalar maxPress = 1.450000000000000e+05;
- static const Scalar vals[numTempSteps][numPressSteps];
-};
-
-const char *TabulatedDensityTraits::name = "density";
-
-const double TabulatedDensityTraits::vals[15][50] =
-{
- {
- 1.755308372911512e+00, 1.774264402821289e+00, 1.793222621515086e+00, 1.812183029645950e+00, 1.831145627867246e+00,
- 1.850110416832651e+00, 1.869077397196165e+00, 1.888046569612100e+00, 1.907017934735086e+00, 1.925991493220070e+00,
- 1.944967245722317e+00, 1.963945192897409e+00, 1.982925335401247e+00, 2.001907673890049e+00, 2.020892209020350e+00,
- 2.039878941449006e+00, 2.058867871833190e+00, 2.077859000830393e+00, 2.096852329098427e+00, 2.115847857295424e+00,
- 2.134845586079831e+00, 2.153845516110419e+00, 2.172847648046278e+00, 2.191851982546817e+00, 2.210858520271766e+00,
- 2.229867261881177e+00, 2.248878208035418e+00, 2.267891359395183e+00, 2.286906716621488e+00, 2.305924280375664e+00,
- 2.324944051319368e+00, 2.343966030114581e+00, 2.362990217423599e+00, 2.382016613909049e+00, 2.401045220233873e+00,
- 2.420076037061341e+00, 2.439109065055041e+00, 2.458144304878889e+00, 2.477181757197121e+00, 2.496221422674298e+00,
- 2.515263301975305e+00, 2.534307395765349e+00, 2.553353704709964e+00, 2.572402229475007e+00, 2.591452970726658e+00,
- 2.610505929131427e+00, 2.629561105356142e+00, 2.648618500067962e+00, 2.667678113934368e+00, 2.686739947623169e+00
- },
- {
- 1.748688604734713e+00, 1.767571892229173e+00, 1.786457333061390e+00, 1.805344927864506e+00, 1.824234677271969e+00,
- 1.843126581917526e+00, 1.862020642435228e+00, 1.880916859459429e+00, 1.899815233624782e+00, 1.918715765566246e+00,
- 1.937618455919081e+00, 1.956523305318852e+00, 1.975430314401425e+00, 1.994339483802971e+00, 2.013250814159965e+00,
- 2.032164306109183e+00, 2.051079960287710e+00, 2.069997777332932e+00, 2.088917757882538e+00, 2.107839902574526e+00,
- 2.126764212047197e+00, 2.145690686939155e+00, 2.164619327889312e+00, 2.183550135536884e+00, 2.202483110521394e+00,
- 2.221418253482670e+00, 2.240355565060845e+00, 2.259295045896362e+00, 2.278236696629965e+00, 2.297180517902710e+00,
- 2.316126510355958e+00, 2.335074674631374e+00, 2.354025011370935e+00, 2.372977521216923e+00, 2.391932204811928e+00,
- 2.410889062798848e+00, 2.429848095820891e+00, 2.448809304521571e+00, 2.467772689544708e+00, 2.486738251534437e+00,
- 2.505705991135198e+00, 2.524675908991741e+00, 2.543648005749125e+00, 2.562622282052718e+00, 2.581598738548199e+00,
- 2.600577375881557e+00, 2.619558194699090e+00, 2.638541195647405e+00, 2.657526379373425e+00, 2.676513746524379e+00
- },
- {
- 1.742119513324718e+00, 1.760930634944350e+00, 1.779743875160616e+00, 1.798559234587417e+00, 1.817376713838946e+00,
- 1.836196313529680e+00, 1.855018034274388e+00, 1.873841876688128e+00, 1.892667841386243e+00, 1.911495928984368e+00,
- 1.930326140098427e+00, 1.949158475344631e+00, 1.967992935339483e+00, 1.986829520699775e+00, 2.005668232042588e+00,
- 2.024509069985295e+00, 2.043352035145557e+00, 2.062197128141326e+00, 2.081044349590847e+00, 2.099893700112652e+00,
- 2.118745180325567e+00, 2.137598790848708e+00, 2.156454532301483e+00, 2.175312405303590e+00, 2.194172410475020e+00,
- 2.213034548436057e+00, 2.231898819807275e+00, 2.250765225209542e+00, 2.269633765264017e+00, 2.288504440592153e+00,
- 2.307377251815696e+00, 2.326252199556683e+00, 2.345129284437447e+00, 2.364008507080612e+00, 2.382889868109099e+00,
- 2.401773368146120e+00, 2.420659007815180e+00, 2.439546787740082e+00, 2.458436708544920e+00, 2.477328770854085e+00,
- 2.496222975292262e+00, 2.515119322484431e+00, 2.534017813055865e+00, 2.552918447632137e+00, 2.571821226839111e+00,
- 2.590726151302949e+00, 2.609633221650109e+00, 2.628542438507346e+00, 2.647453802501707e+00, 2.666367314260542e+00
- },
- {
- 1.735600503086598e+00, 1.754340028201860e+00, 1.773081637860596e+00, 1.791825332658108e+00, 1.810571113189969e+00,
- 1.829318980052027e+00, 1.848068933840407e+00, 1.866820975151510e+00, 1.885575104582009e+00, 1.904331322728859e+00,
- 1.923089630189284e+00, 1.941850027560791e+00, 1.960612515441156e+00, 1.979377094428439e+00, 1.998143765120974e+00,
- 2.016912528117368e+00, 2.035683384016511e+00, 2.054456333417567e+00, 2.073231376919978e+00, 2.092008515123465e+00,
- 2.110787748628023e+00, 2.129569078033930e+00, 2.148352503941738e+00, 2.167138026952281e+00, 2.185925647666668e+00,
- 2.204715366686289e+00, 2.223507184612810e+00, 2.242301102048181e+00, 2.261097119594628e+00, 2.279895237854655e+00,
- 2.298695457431049e+00, 2.317497778926874e+00, 2.336302202945476e+00, 2.355108730090479e+00, 2.373917360965788e+00,
- 2.392728096175590e+00, 2.411540936324352e+00, 2.430355882016820e+00, 2.449172933858022e+00, 2.467992092453268e+00,
- 2.486813358408150e+00, 2.505636732328538e+00, 2.524462214820588e+00, 2.543289806490736e+00, 2.562119507945698e+00,
- 2.580951319792477e+00, 2.599785242638353e+00, 2.618621277090893e+00, 2.637459423757945e+00, 2.656299683247639e+00
- },
- {
- 1.729130988069413e+00, 1.747799479006408e+00, 1.766470021105015e+00, 1.785142614942543e+00, 1.803817261096561e+00,
- 1.822493960144904e+00, 1.841172712665666e+00, 1.859853519237209e+00, 1.878536380438155e+00, 1.897221296847389e+00,
- 1.915908269044062e+00, 1.934597297607586e+00, 1.953288383117640e+00, 1.971981526154163e+00, 1.990676727297363e+00,
- 2.009373987127709e+00, 2.028073306225935e+00, 2.046774685173041e+00, 2.065478124550290e+00, 2.084183624939213e+00,
- 2.102891186921603e+00, 2.121600811079520e+00, 2.140312497995291e+00, 2.159026248251505e+00, 2.177742062431020e+00,
- 2.196459941116959e+00, 2.215179884892710e+00, 2.233901894341931e+00, 2.252625970048542e+00, 2.271352112596734e+00,
- 2.290080322570960e+00, 2.308810600555946e+00, 2.327542947136680e+00, 2.346277362898420e+00, 2.365013848426691e+00,
- 2.383752404307285e+00, 2.402493031126264e+00, 2.421235729469957e+00, 2.439980499924959e+00, 2.458727343078137e+00,
- 2.477476259516623e+00, 2.496227249827822e+00, 2.514980314599402e+00, 2.533735454419308e+00, 2.552492669875746e+00,
- 2.571251961557198e+00, 2.590013330052412e+00, 2.608776775950404e+00, 2.627542299840464e+00, 2.646309902312153e+00
- },
- {
- 1.722710391762579e+00, 1.741308403925821e+00, 1.759908434523914e+00, 1.778510484116767e+00, 1.797114553264537e+00,
- 1.815720642527634e+00, 1.834328752466721e+00, 1.852938883642709e+00, 1.871551036616761e+00, 1.890165211950294e+00,
- 1.908781410204973e+00, 1.927399631942718e+00, 1.946019877725699e+00, 1.964642148116340e+00, 1.983266443677315e+00,
- 2.001892764971552e+00, 2.020521112562232e+00, 2.039151487012787e+00, 2.057783888886904e+00, 2.076418318748522e+00,
- 2.095054777161832e+00, 2.113693264691282e+00, 2.132333781901571e+00, 2.150976329357650e+00, 2.169620907624727e+00,
- 2.188267517268265e+00, 2.206916158853976e+00, 2.225566832947831e+00, 2.244219540116054e+00, 2.262874280925123e+00,
- 2.281531055941773e+00, 2.300189865732990e+00, 2.318850710866020e+00, 2.337513591908360e+00, 2.356178509427764e+00,
- 2.374845463992243e+00, 2.393514456170064e+00, 2.412185486529745e+00, 2.430858555640066e+00, 2.449533664070059e+00,
- 2.468210812389017e+00, 2.486890001166484e+00, 2.505571230972264e+00, 2.524254502376418e+00, 2.542939815949262e+00,
- 2.561627172261374e+00, 2.580316571883581e+00, 2.599008015386975e+00, 2.617701503342902e+00, 2.636397036322968e+00
- },
- {
- 1.716338146897580e+00, 1.734866228889907e+00, 1.753396297229703e+00, 1.771928352460044e+00, 1.790462395124249e+00,
- 1.808998425765874e+00, 1.827536444928716e+00, 1.846076453156811e+00, 1.864618450994437e+00, 1.883162438986109e+00,
- 1.901708417676587e+00, 1.920256387610867e+00, 1.938806349334189e+00, 1.957358303392030e+00, 1.975912250330114e+00,
- 1.994468190694400e+00, 2.013026125031091e+00, 2.031586053886632e+00, 2.050147977807709e+00, 2.068711897341247e+00,
- 2.087277813034418e+00, 2.105845725434632e+00, 2.124415635089543e+00, 2.142987542547046e+00, 2.161561448355279e+00,
- 2.180137353062624e+00, 2.198715257217703e+00, 2.217295161369383e+00, 2.235877066066772e+00, 2.254460971859225e+00,
- 2.273046879296335e+00, 2.291634788927943e+00, 2.310224701304131e+00, 2.328816616975225e+00, 2.347410536491797e+00,
- 2.366006460404661e+00, 2.384604389264875e+00, 2.403204323623743e+00, 2.421806264032811e+00, 2.440410211043872e+00,
- 2.459016165208964e+00, 2.477624127080368e+00, 2.496234097210611e+00, 2.514846076152465e+00, 2.533460064458948e+00,
- 2.552076062683323e+00, 2.570694071379098e+00, 2.589314091100029e+00, 2.607936122400116e+00, 2.626560165833606e+00
- },
- {
- 1.710013695254868e+00, 1.728472388994598e+00, 1.746933037618520e+00, 1.765395641653431e+00, 1.783860201626355e+00,
- 1.802326718064545e+00, 1.820795191495484e+00, 1.839265622446885e+00, 1.857738011446687e+00, 1.876212359023062e+00,
- 1.894688665704410e+00, 1.913166932019361e+00, 1.931647158496774e+00, 1.950129345665740e+00, 1.968613494055580e+00,
- 1.987099604195842e+00, 2.005587676616308e+00, 2.024077711846988e+00, 2.042569710418126e+00, 2.061063672860195e+00,
- 2.079559599703896e+00, 2.098057491480167e+00, 2.116557348720172e+00, 2.135059171955310e+00, 2.153562961717211e+00,
- 2.172068718537734e+00, 2.190576442948971e+00, 2.209086135483248e+00, 2.227597796673122e+00, 2.246111427051381e+00,
- 2.264627027151048e+00, 2.283144597505372e+00, 2.301664138647844e+00, 2.320185651112181e+00, 2.338709135432337e+00,
- 2.357234592142493e+00, 2.375762021777073e+00, 2.394291424870723e+00, 2.412822801958331e+00, 2.431356153575015e+00,
- 2.449891480256128e+00, 2.468428782537256e+00, 2.486968060954219e+00, 2.505509316043070e+00, 2.524052548340100e+00,
- 2.542597758381833e+00, 2.561144946705024e+00, 2.579694113846667e+00, 2.598245260343989e+00, 2.616798386734454e+00
- },
- {
- 1.703736487475788e+00, 1.722126328311195e+00, 1.740518093176789e+00, 1.758911782583613e+00, 1.777307397042928e+00,
- 1.795704937066214e+00, 1.814104403165170e+00, 1.832505795851713e+00, 1.850909115637979e+00, 1.869314363036326e+00,
- 1.887721538559327e+00, 1.906130642719779e+00, 1.924541676030695e+00, 1.942954639005309e+00, 1.961369532157075e+00,
- 1.979786355999667e+00, 1.998205111046980e+00, 2.016625797813126e+00, 2.035048416812443e+00, 2.053472968559482e+00,
- 2.071899453569022e+00, 2.090327872356059e+00, 2.108758225435809e+00, 2.127190513323711e+00, 2.145624736535425e+00,
- 2.164060895586833e+00, 2.182498990994034e+00, 2.200939023273354e+00, 2.219380992941339e+00, 2.237824900514755e+00,
- 2.256270746510591e+00, 2.274718531446059e+00, 2.293168255838592e+00, 2.311619920205845e+00, 2.330073525065698e+00,
- 2.348529070936249e+00, 2.366986558335824e+00, 2.385445987782969e+00, 2.403907359796452e+00, 2.422370674895265e+00,
- 2.440835933598625e+00, 2.459303136425971e+00, 2.477772283896963e+00, 2.496243376531490e+00, 2.514716414849660e+00,
- 2.533191399371808e+00, 2.551668330618489e+00, 2.570147209110487e+00, 2.588628035368806e+00, 2.607110809914681e+00
- },
- {
- 1.697505982879398e+00, 1.715827499700588e+00, 1.734150910292815e+00, 1.752476215151878e+00, 1.770803414773786e+00,
- 1.789132509654754e+00, 1.807463500291209e+00, 1.825796387179785e+00, 1.844131170817327e+00, 1.862467851700888e+00,
- 1.880806430327732e+00, 1.899146907195332e+00, 1.917489282801369e+00, 1.935833557643738e+00, 1.954179732220541e+00,
- 1.972527807030090e+00, 1.990877782570909e+00, 2.009229659341731e+00, 2.027583437841500e+00, 2.045939118569371e+00,
- 2.064296702024710e+00, 2.082656188707092e+00, 2.101017579116305e+00, 2.119380873752348e+00, 2.137746073115430e+00,
- 2.156113177705973e+00, 2.174482188024609e+00, 2.192853104572181e+00, 2.211225927849747e+00, 2.229600658358574e+00,
- 2.247977296600142e+00, 2.266355843076143e+00, 2.284736298288480e+00, 2.303118662739270e+00, 2.321502936930843e+00,
- 2.339889121365739e+00, 2.358277216546714e+00, 2.376667222976734e+00, 2.395059141158978e+00, 2.413452971596841e+00,
- 2.431848714793929e+00, 2.450246371254060e+00, 2.468645941481269e+00, 2.487047425979803e+00, 2.505450825254121e+00,
- 2.523856139808898e+00, 2.542263370149021e+00, 2.560672516779593e+00, 2.579083580205932e+00, 2.597496560933566e+00
- },
- {
- 1.691321649284043e+00, 1.709575364632300e+00, 1.727830944073291e+00, 1.746088388088063e+00, 1.764347697157863e+00,
- 1.782608871764136e+00, 1.800871912388526e+00, 1.819136819512882e+00, 1.837403593619246e+00, 1.855672235189865e+00,
- 1.873942744707183e+00, 1.892215122653849e+00, 1.910489369512707e+00, 1.928765485766804e+00, 1.947043471899390e+00,
- 1.965323328393911e+00, 1.983605055734019e+00, 2.001888654403562e+00, 2.020174124886593e+00, 2.038461467667364e+00,
- 2.056750683230330e+00, 2.075041772060146e+00, 2.093334734641670e+00, 2.111629571459961e+00, 2.129926283000279e+00,
- 2.148224869748088e+00, 2.166525332189051e+00, 2.184827670809036e+00, 2.203131886094113e+00, 2.221437978530552e+00,
- 2.239745948604829e+00, 2.258055796803620e+00, 2.276367523613803e+00, 2.294681129522462e+00, 2.312996615016882e+00,
- 2.331313980584552e+00, 2.349633226713162e+00, 2.367954353890609e+00, 2.386277362604989e+00, 2.404602253344606e+00,
- 2.422929026597965e+00, 2.441257682853774e+00, 2.459588222600948e+00, 2.477920646328603e+00, 2.496254954526061e+00,
- 2.514591147682848e+00, 2.532929226288692e+00, 2.551269190833529e+00, 2.569611041807498e+00, 2.587954779700943e+00
- },
- {
- 1.685182962833544e+00, 1.703369393008219e+00, 1.721557658164561e+00, 1.739747758769335e+00, 1.757939695289500e+00,
- 1.776133468192206e+00, 1.794329077944792e+00, 1.812526525014790e+00, 1.830725809869921e+00, 1.848926932978100e+00,
- 1.867129894807431e+00, 1.885334695826211e+00, 1.903541336502926e+00, 1.921749817306258e+00, 1.939960138705077e+00,
- 1.958172301168445e+00, 1.976386305165618e+00, 1.994602151166044e+00, 2.012819839639362e+00, 2.031039371055401e+00,
- 2.049260745884189e+00, 2.067483964595941e+00, 2.085709027661065e+00, 2.103935935550165e+00, 2.122164688734034e+00,
- 2.140395287683661e+00, 2.158627732870225e+00, 2.176862024765100e+00, 2.195098163839856e+00, 2.213336150566250e+00,
- 2.231575985416239e+00, 2.249817668861968e+00, 2.268061201375779e+00, 2.286306583430208e+00, 2.304553815497984e+00,
- 2.322802898052028e+00, 2.341053831565459e+00, 2.359306616511588e+00, 2.377561253363920e+00, 2.395817742596156e+00,
- 2.414076084682191e+00, 2.432336280096114e+00, 2.450598329312208e+00, 2.468862232804953e+00, 2.487127991049023e+00,
- 2.505395604519288e+00, 2.523665073690812e+00, 2.541936399038852e+00, 2.560209581038867e+00, 2.578484620166506e+00
- },
- {
- 1.679089407827878e+00, 1.697209062990904e+00, 1.715330524578524e+00, 1.733453793043684e+00, 1.751578868839513e+00,
- 1.769705752419320e+00, 1.787834444236597e+00, 1.805964944745021e+00, 1.824097254398450e+00, 1.842231373650924e+00,
- 1.860367302956667e+00, 1.878505042770085e+00, 1.896644593545767e+00, 1.914785955738489e+00, 1.932929129803203e+00,
- 1.951074116195050e+00, 1.969220915369354e+00, 1.987369527781620e+00, 2.005519953887538e+00, 2.023672194142983e+00,
- 2.041826249004011e+00, 2.059982118926865e+00, 2.078139804367971e+00, 2.096299305783937e+00, 2.114460623631559e+00,
- 2.132623758367814e+00, 2.150788710449866e+00, 2.168955480335062e+00, 2.187124068480935e+00, 2.205294475345202e+00,
- 2.223466701385763e+00, 2.241640747060706e+00, 2.259816612828304e+00, 2.277994299147012e+00, 2.296173806475474e+00,
- 2.314355135272516e+00, 2.332538285997154e+00, 2.350723259108584e+00, 2.368910055066190e+00, 2.387098674329545e+00,
- 2.405289117358405e+00, 2.423481384612710e+00, 2.441675476552588e+00, 2.459871393638356e+00, 2.478069136330513e+00,
- 2.496268705089746e+00, 2.514470100376929e+00, 2.532673322653122e+00, 2.550878372379573e+00, 2.569085250017714e+00
- },
- {
- 1.673040476558227e+00, 1.691093860836300e+00, 1.709149023523030e+00, 1.727205965057981e+00, 1.745264685880892e+00,
- 1.763325186431675e+00, 1.781387467150417e+00, 1.799451528477381e+00, 1.817517370853002e+00, 1.835584994717892e+00,
- 1.853654400512836e+00, 1.871725588678794e+00, 1.889798559656902e+00, 1.907873313888471e+00, 1.925949851814986e+00,
- 1.944028173878108e+00, 1.962108280519675e+00, 1.980190172181696e+00, 1.998273849306359e+00, 2.016359312336028e+00,
- 2.034446561713241e+00, 2.052535597880711e+00, 2.070626421281331e+00, 2.088719032358165e+00, 2.106813431554456e+00,
- 2.124909619313623e+00, 2.143007596079261e+00, 2.161107362295140e+00, 2.179208918405208e+00, 2.197312264853591e+00,
- 2.215417402084588e+00, 2.233524330542677e+00, 2.251633050672513e+00, 2.269743562918927e+00, 2.287855867726928e+00,
- 2.305969965541701e+00, 2.324085856808610e+00, 2.342203541973195e+00, 2.360323021481173e+00, 2.378444295778439e+00,
- 2.396567365311067e+00, 2.414692230525306e+00, 2.432818891867587e+00, 2.450947349784512e+00, 2.469077604722869e+00,
- 2.487209657129619e+00, 2.505343507451902e+00, 2.523479156137038e+00, 2.541616603632523e+00, 2.559755850386034e+00
- },
- {
- 1.667035669146253e+00, 1.685023280730779e+00, 1.703012643236649e+00, 1.721003757090469e+00, 1.738996622719014e+00,
- 1.756991240549225e+00, 1.774987611008209e+00, 1.792985734523242e+00, 1.810985611521764e+00, 1.828987242431384e+00,
- 1.846990627679876e+00, 1.864995767695184e+00, 1.883002662905417e+00, 1.901011313738852e+00, 1.919021720623934e+00,
- 1.937033883989274e+00, 1.955047804263653e+00, 1.973063481876017e+00, 1.991080917255481e+00, 2.009100110831328e+00,
- 2.027121063033010e+00, 2.045143774290143e+00, 2.063168245032518e+00, 2.081194475690086e+00, 2.099222466692973e+00,
- 2.117252218471470e+00, 2.135283731456037e+00, 2.153317006077303e+00, 2.171352042766067e+00, 2.189388841953294e+00,
- 2.207427404070120e+00, 2.225467729547847e+00, 2.243509818817949e+00, 2.261553672312070e+00, 2.279599290462019e+00,
- 2.297646673699778e+00, 2.315695822457497e+00, 2.333746737167496e+00, 2.351799418262262e+00, 2.369853866174454e+00,
- 2.387910081336903e+00, 2.405968064182606e+00, 2.424027815144730e+00, 2.442089334656615e+00, 2.460152623151768e+00,
- 2.478217681063868e+00, 2.496284508826763e+00, 2.514353106874473e+00, 2.532423475641187e+00, 2.550495615561266e+00
- }
-};
-
-typedef TabulatedCO2Properties< TabulatedDensityTraits > TabulatedDensity;
-
-struct TabulatedEnthalpyTraits {
- typedef double Scalar;
- static const char *name;
- static const int numTempSteps = 15;
- static constexpr Scalar minTemp = 2.880000000000000e+02;
- static constexpr Scalar maxTemp = 3.030000000000000e+02;
- static const int numPressSteps = 50;
- static constexpr Scalar minPress = 9.500000000000000e+04;
- static constexpr Scalar maxPress = 1.450000000000000e+05;
- static const Scalar vals[numTempSteps][numPressSteps];
-};
-
-const char *TabulatedEnthalpyTraits::name = "enthalpy";
-
-const double TabulatedEnthalpyTraits::vals[15][50] =
-{
- {
- 1.244801188627830e+04, 1.243776118212441e+04, 1.242750944725234e+04, 1.241725668135906e+04, 1.240700288414147e+04,
- 1.239674805529627e+04, 1.238649219452005e+04, 1.237623530150919e+04, 1.236597737596004e+04, 1.235571841756868e+04,
- 1.234545842603116e+04, 1.233519740104331e+04, 1.232493534230083e+04, 1.231467224949931e+04, 1.230440812233415e+04,
- 1.229414296050063e+04, 1.228387676369388e+04, 1.227360953160892e+04, 1.226334126394057e+04, 1.225307196038350e+04,
- 1.224280162063231e+04, 1.223253024438139e+04, 1.222225783132500e+04, 1.221198438115726e+04, 1.220170989357216e+04,
- 1.219143436826350e+04, 1.218115780492498e+04, 1.217088020325013e+04, 1.216060156293235e+04, 1.215032188366487e+04,
- 1.214004116514082e+04, 1.212975940705310e+04, 1.211947660909460e+04, 1.210919277095791e+04, 1.209890789233557e+04,
- 1.208862197291995e+04, 1.207833501240327e+04, 1.206804701047762e+04, 1.205775796683492e+04, 1.204746788116695e+04,
- 1.203717675316535e+04, 1.202688458252161e+04, 1.201659136892707e+04, 1.200629711207294e+04, 1.199600181165024e+04,
- 1.198570546734989e+04, 1.197540807886265e+04, 1.196510964587912e+04, 1.195481016808974e+04, 1.194450964518485e+04
- },
- {
- 1.334921879332812e+04, 1.333905343954384e+04, 1.332888707876712e+04, 1.331871971070738e+04, 1.330855133507387e+04,
- 1.329838195157575e+04, 1.328821155992203e+04, 1.327804015982153e+04, 1.326786775098304e+04, 1.325769433311511e+04,
- 1.324751990592623e+04, 1.323734446912471e+04, 1.322716802241874e+04, 1.321699056551638e+04, 1.320681209812554e+04,
- 1.319663261995399e+04, 1.318645213070940e+04, 1.317627063009926e+04, 1.316608811783093e+04, 1.315590459361167e+04,
- 1.314572005714856e+04, 1.313553450814857e+04, 1.312534794631852e+04, 1.311516037136511e+04, 1.310497178299487e+04,
- 1.309478218091422e+04, 1.308459156482944e+04, 1.307439993444667e+04, 1.306420728947192e+04, 1.305401362961104e+04,
- 1.304381895456975e+04, 1.303362326405367e+04, 1.302342655776822e+04, 1.301322883541872e+04, 1.300303009671038e+04,
- 1.299283034134818e+04, 1.298262956903707e+04, 1.297242777948177e+04, 1.296222497238694e+04, 1.295202114745705e+04,
- 1.294181630439645e+04, 1.293161044290934e+04, 1.292140356269980e+04, 1.291119566347175e+04, 1.290098674492898e+04,
- 1.289077680677517e+04, 1.288056584871380e+04, 1.287035387044827e+04, 1.286014087168180e+04, 1.284992685211751e+04
- },
- {
- 1.425153675761450e+04, 1.424145558062830e+04, 1.423137341974496e+04, 1.422129027468572e+04, 1.421120614517171e+04,
- 1.420112103092392e+04, 1.419103493166322e+04, 1.418094784711038e+04, 1.417085977698598e+04, 1.416077072101051e+04,
- 1.415068067890437e+04, 1.414058965038775e+04, 1.413049763518076e+04, 1.412040463300338e+04, 1.411031064357545e+04,
- 1.410021566661668e+04, 1.409011970184669e+04, 1.408002274898492e+04, 1.406992480775069e+04, 1.405982587786323e+04,
- 1.404972595904159e+04, 1.403962505100474e+04, 1.402952315347146e+04, 1.401942026616046e+04, 1.400931638879028e+04,
- 1.399921152107939e+04, 1.398910566274605e+04, 1.397899881350843e+04, 1.396889097308459e+04, 1.395878214119243e+04,
- 1.394867231754973e+04, 1.393856150187414e+04, 1.392844969388319e+04, 1.391833689329426e+04, 1.390822309982461e+04,
- 1.389810831319137e+04, 1.388799253311155e+04, 1.387787575930201e+04, 1.386775799147951e+04, 1.385763922936062e+04,
- 1.384751947266185e+04, 1.383739872109954e+04, 1.382727697438991e+04, 1.381715423224905e+04, 1.380703049439290e+04,
- 1.379690576053730e+04, 1.378678003039795e+04, 1.377665330369038e+04, 1.376652558013005e+04, 1.375639685943226e+04
- },
- {
- 1.515496541458116e+04, 1.514496726388252e+04, 1.513496815177172e+04, 1.512496807798126e+04, 1.511496704224361e+04,
- 1.510496504429113e+04, 1.509496208385599e+04, 1.508495816067028e+04, 1.507495327446596e+04, 1.506494742497492e+04,
- 1.505494061192882e+04, 1.504493283505930e+04, 1.503492409409782e+04, 1.502491438877576e+04, 1.501490371882435e+04,
- 1.500489208397471e+04, 1.499487948395784e+04, 1.498486591850461e+04, 1.497485138734575e+04, 1.496483589021197e+04,
- 1.495481942683368e+04, 1.494480199694134e+04, 1.493478360026519e+04, 1.492476423653538e+04, 1.491474390548194e+04,
- 1.490472260683475e+04, 1.489470034032361e+04, 1.488467710567817e+04, 1.487465290262799e+04, 1.486462773090243e+04,
- 1.485460159023084e+04, 1.484457448034232e+04, 1.483454640096598e+04, 1.482451735183071e+04, 1.481448733266532e+04,
- 1.480445634319848e+04, 1.479442438315876e+04, 1.478439145227457e+04, 1.477435755027422e+04, 1.476432267688591e+04,
- 1.475428683183771e+04, 1.474425001485754e+04, 1.473421222567321e+04, 1.472417346401242e+04, 1.471413372960275e+04,
- 1.470409302217166e+04, 1.469405134144643e+04, 1.468400868715428e+04, 1.467396505902229e+04, 1.466392045677741e+04
- },
- {
- 1.605950433294651e+04, 1.604958808049365e+04, 1.603967088852259e+04, 1.602975275677668e+04, 1.601983368499922e+04,
- 1.600991367293331e+04, 1.599999272032205e+04, 1.599007082690831e+04, 1.598014799243494e+04, 1.597022421664459e+04,
- 1.596029949927988e+04, 1.595037384008326e+04, 1.594044723879708e+04, 1.593051969516359e+04, 1.592059120892489e+04,
- 1.591066177982301e+04, 1.590073140759983e+04, 1.589080009199715e+04, 1.588086783275664e+04, 1.587093462961981e+04,
- 1.586100048232813e+04, 1.585106539062290e+04, 1.584112935424535e+04, 1.583119237293657e+04, 1.582125444643752e+04,
- 1.581131557448906e+04, 1.580137575683196e+04, 1.579143499320681e+04, 1.578149328335418e+04, 1.577155062701443e+04,
- 1.576160702392785e+04, 1.575166247383463e+04, 1.574171697647480e+04, 1.573177053158830e+04, 1.572182313891498e+04,
- 1.571187479819451e+04, 1.570192550916651e+04, 1.569197527157041e+04, 1.568202408514563e+04, 1.567207194963135e+04,
- 1.566211886476675e+04, 1.565216483029080e+04, 1.564220984594243e+04, 1.563225391146040e+04, 1.562229702658333e+04,
- 1.561233919104983e+04, 1.560238040459830e+04, 1.559242066696704e+04, 1.558245997789426e+04, 1.557249833711804e+04
- },
- {
- 1.696515301627922e+04, 1.695531755591777e+04, 1.694548117735978e+04, 1.693564388035892e+04, 1.692580566466881e+04,
- 1.691596653004295e+04, 1.690612647623471e+04, 1.689628550299739e+04, 1.688644361008412e+04, 1.687660079724800e+04,
- 1.686675706424200e+04, 1.685691241081894e+04, 1.684706683673154e+04, 1.683722034173249e+04, 1.682737292557428e+04,
- 1.681752458800932e+04, 1.680767532878993e+04, 1.679782514766833e+04, 1.678797404439659e+04, 1.677812201872669e+04,
- 1.676826907041053e+04, 1.675841519919986e+04, 1.674856040484634e+04, 1.673870468710153e+04, 1.672884804571687e+04,
- 1.671899048044368e+04, 1.670913199103320e+04, 1.669927257723655e+04, 1.668941223880471e+04, 1.667955097548860e+04,
- 1.666968878703902e+04, 1.665982567320664e+04, 1.664996163374202e+04, 1.664009666839563e+04, 1.663023077691784e+04,
- 1.662036395905885e+04, 1.661049621456884e+04, 1.660062754319782e+04, 1.659075794469570e+04, 1.658088741881229e+04,
- 1.657101596529728e+04, 1.656114358390027e+04, 1.655127027437072e+04, 1.654139603645801e+04, 1.653152086991137e+04,
- 1.652164477448000e+04, 1.651176774991289e+04, 1.650188979595898e+04, 1.649201091236711e+04, 1.648213109888593e+04
- },
- {
- 1.787191090459213e+04, 1.786215515148537e+04, 1.785239850094927e+04, 1.784264095274742e+04, 1.783288250664326e+04,
- 1.782312316240021e+04, 1.781336291978155e+04, 1.780360177855044e+04, 1.779383973846997e+04, 1.778407679930311e+04,
- 1.777431296081275e+04, 1.776454822276166e+04, 1.775478258491250e+04, 1.774501604702784e+04, 1.773524860887015e+04,
- 1.772548027020181e+04, 1.771571103078506e+04, 1.770594089038209e+04, 1.769616984875494e+04, 1.768639790566556e+04,
- 1.767662506087583e+04, 1.766685131414749e+04, 1.765707666524219e+04, 1.764730111392147e+04, 1.763752465994680e+04,
- 1.762774730307949e+04, 1.761796904308081e+04, 1.760818987971189e+04, 1.759840981273377e+04, 1.758862884190736e+04,
- 1.757884696699352e+04, 1.756906418775294e+04, 1.755928050394628e+04, 1.754949591533405e+04, 1.753971042167666e+04,
- 1.752992402273442e+04, 1.752013671826755e+04, 1.751034850803618e+04, 1.750055939180027e+04, 1.749076936931976e+04,
- 1.748097844035442e+04, 1.747118660466396e+04, 1.746139386200796e+04, 1.745160021214592e+04, 1.744180565483721e+04,
- 1.743201018984114e+04, 1.742221381691684e+04, 1.741241653582341e+04, 1.740261834631982e+04, 1.739281924816492e+04
- },
- {
- 1.877977737598986e+04, 1.877010026606088e+04, 1.876042227893256e+04, 1.875074341437791e+04, 1.874106367216987e+04,
- 1.873138305208128e+04, 1.872170155388487e+04, 1.871201917735331e+04, 1.870233592225914e+04, 1.869265178837481e+04,
- 1.868296677547268e+04, 1.867328088332501e+04, 1.866359411170398e+04, 1.865390646038166e+04, 1.864421792913001e+04,
- 1.863452851772092e+04, 1.862483822592618e+04, 1.861514705351746e+04, 1.860545500026635e+04, 1.859576206594436e+04,
- 1.858606825032287e+04, 1.857637355317319e+04, 1.856667797426651e+04, 1.855698151337396e+04, 1.854728417026652e+04,
- 1.853758594471513e+04, 1.852788683649060e+04, 1.851818684536365e+04, 1.850848597110489e+04, 1.849878421348486e+04,
- 1.848908157227397e+04, 1.847937804724257e+04, 1.846967363816089e+04, 1.845996834479905e+04, 1.845026216692713e+04,
- 1.844055510431504e+04, 1.843084715673263e+04, 1.842113832394965e+04, 1.841142860573573e+04, 1.840171800186046e+04,
- 1.839200651209326e+04, 1.838229413620351e+04, 1.837258087396047e+04, 1.836286672513328e+04, 1.835315168949101e+04,
- 1.834343576680265e+04, 1.833371895683704e+04, 1.832400125936295e+04, 1.831428267414907e+04, 1.830456320096396e+04
- },
- {
- 1.968875174839150e+04, 1.967915223777856e+04, 1.966955186967561e+04, 1.965995064386471e+04, 1.965034856012783e+04,
- 1.964074561824686e+04, 1.963114181800357e+04, 1.962153715917969e+04, 1.961193164155682e+04, 1.960232526491650e+04,
- 1.959271802904013e+04, 1.958310993370905e+04, 1.957350097870453e+04, 1.956389116380774e+04, 1.955428048879972e+04,
- 1.954466895346145e+04, 1.953505655757382e+04, 1.952544330091763e+04, 1.951582918327359e+04, 1.950621420442230e+04,
- 1.949659836414429e+04, 1.948698166221999e+04, 1.947736409842973e+04, 1.946774567255376e+04, 1.945812638437225e+04,
- 1.944850623366526e+04, 1.943888522021276e+04, 1.942926334379464e+04, 1.941964060419069e+04, 1.941001700118059e+04,
- 1.940039253454397e+04, 1.939076720406034e+04, 1.938114100950913e+04, 1.937151395066967e+04, 1.936188602732117e+04,
- 1.935225723924283e+04, 1.934262758621367e+04, 1.933299706801268e+04, 1.932336568441872e+04, 1.931373343521055e+04,
- 1.930410032016689e+04, 1.929446633906634e+04, 1.928483149168738e+04, 1.927519577780842e+04, 1.926555919720780e+04,
- 1.925592174966373e+04, 1.924628343495435e+04, 1.923664425285771e+04, 1.922700420315175e+04, 1.921736328561433e+04
- },
- {
- 2.059883328134778e+04, 2.058931034587392e+04, 2.057978657211463e+04, 2.057026195986062e+04, 2.056073650890254e+04,
- 2.055121021903091e+04, 2.054168309003617e+04, 2.053215512170871e+04, 2.052262631383879e+04, 2.051309666621663e+04,
- 2.050356617863231e+04, 2.049403485087588e+04, 2.048450268273725e+04, 2.047496967400630e+04, 2.046543582447280e+04,
- 2.045590113392641e+04, 2.044636560215672e+04, 2.043682922895327e+04, 2.042729201410545e+04, 2.041775395740263e+04,
- 2.040821505863405e+04, 2.039867531758886e+04, 2.038913473405616e+04, 2.037959330782493e+04, 2.037005103868408e+04,
- 2.036050792642243e+04, 2.035096397082872e+04, 2.034141917169161e+04, 2.033187352879962e+04, 2.032232704194127e+04,
- 2.031277971090492e+04, 2.030323153547890e+04, 2.029368251545138e+04, 2.028413265061053e+04, 2.027458194074437e+04,
- 2.026503038564086e+04, 2.025547798508788e+04, 2.024592473887319e+04, 2.023637064678451e+04, 2.022681570860945e+04,
- 2.021725992413548e+04, 2.020770329315010e+04, 2.019814581544059e+04, 2.018858749079427e+04, 2.017902831899827e+04,
- 2.016946829983971e+04, 2.015990743310556e+04, 2.015034571858273e+04, 2.014078315605804e+04, 2.013121974531826e+04
- },
- {
- 2.151002117795434e+04, 2.150057381261242e+04, 2.149112562770026e+04, 2.148167662301682e+04, 2.147222679836103e+04,
- 2.146277615353168e+04, 2.145332468832754e+04, 2.144387240254723e+04, 2.143441929598936e+04, 2.142496536845241e+04,
- 2.141551061973478e+04, 2.140605504963485e+04, 2.139659865795084e+04, 2.138714144448092e+04, 2.137768340902319e+04,
- 2.136822455137568e+04, 2.135876487133630e+04, 2.134930436870289e+04, 2.133984304327324e+04, 2.133038089484503e+04,
- 2.132091792321584e+04, 2.131145412818323e+04, 2.130198950954462e+04, 2.129252406709739e+04, 2.128305780063880e+04,
- 2.127359070996605e+04, 2.126412279487627e+04, 2.125465405516648e+04, 2.124518449063364e+04, 2.123571410107462e+04,
- 2.122624288628622e+04, 2.121677084606514e+04, 2.120729798020801e+04, 2.119782428851136e+04, 2.118834977077168e+04,
- 2.117887442678532e+04, 2.116939825634861e+04, 2.115992125925773e+04, 2.115044343530886e+04, 2.114096478429800e+04,
- 2.113148530602118e+04, 2.112200500027424e+04, 2.111252386685300e+04, 2.110304190555319e+04, 2.109355911617045e+04,
- 2.108407549850033e+04, 2.107459105233831e+04, 2.106510577747980e+04, 2.105561967372010e+04, 2.104613274085443e+04
- },
- {
- 2.242231458686298e+04, 2.241294180531756e+04, 2.240356822244238e+04, 2.239419383804431e+04, 2.238481865193019e+04,
- 2.237544266390678e+04, 2.236606587378072e+04, 2.235668828135863e+04, 2.234730988644700e+04, 2.233793068885232e+04,
- 2.232855068838091e+04, 2.231916988483910e+04, 2.230978827803306e+04, 2.230040586776896e+04, 2.229102265385284e+04,
- 2.228163863609070e+04, 2.227225381428844e+04, 2.226286818825189e+04, 2.225348175778681e+04, 2.224409452269886e+04,
- 2.223470648279365e+04, 2.222531763787671e+04, 2.221592798775350e+04, 2.220653753222936e+04, 2.219714627110960e+04,
- 2.218775420419943e+04, 2.217836133130399e+04, 2.216896765222835e+04, 2.215957316677748e+04, 2.215017787475631e+04,
- 2.214078177596965e+04, 2.213138487022227e+04, 2.212198715731884e+04, 2.211258863706393e+04, 2.210318930926211e+04,
- 2.209378917371781e+04, 2.208438823023538e+04, 2.207498647861912e+04, 2.206558391867324e+04, 2.205618055020189e+04,
- 2.204677637300910e+04, 2.203737138689886e+04, 2.202796559167508e+04, 2.201855898714158e+04, 2.200915157310209e+04,
- 2.199974334936031e+04, 2.199033431571981e+04, 2.198092447198409e+04, 2.197151381795661e+04, 2.196210235344071e+04
- },
- {
- 2.333571260437436e+04, 2.332641343848122e+04, 2.331711348903825e+04, 2.330781275585994e+04, 2.329851123876068e+04,
- 2.328920893755483e+04, 2.327990585205664e+04, 2.327060198208032e+04, 2.326129732743997e+04, 2.325199188794967e+04,
- 2.324268566342337e+04, 2.323337865367499e+04, 2.322407085851836e+04, 2.321476227776725e+04, 2.320545291123534e+04,
- 2.319614275873626e+04, 2.318683182008354e+04, 2.317752009509066e+04, 2.316820758357102e+04, 2.315889428533795e+04,
- 2.314958020020470e+04, 2.314026532798446e+04, 2.313094966849034e+04, 2.312163322153536e+04, 2.311231598693250e+04,
- 2.310299796449465e+04, 2.309367915403464e+04, 2.308435955536519e+04, 2.307503916829900e+04, 2.306571799264867e+04,
- 2.305639602822672e+04, 2.304707327484559e+04, 2.303774973231769e+04, 2.302842540045531e+04, 2.301910027907070e+04,
- 2.300977436797601e+04, 2.300044766698335e+04, 2.299112017590471e+04, 2.298179189455205e+04, 2.297246282273725e+04,
- 2.296313296027208e+04, 2.295380230696829e+04, 2.294447086263751e+04, 2.293513862709134e+04, 2.292580560014127e+04,
- 2.291647178159873e+04, 2.290713717127507e+04, 2.289780176898159e+04, 2.288846557452950e+04, 2.287912858772991e+04
- },
- {
- 2.425021427659378e+04, 2.424098777593805e+04, 2.423176050906557e+04, 2.422253247579806e+04, 2.421330367595718e+04,
- 2.420407410936458e+04, 2.419484377584177e+04, 2.418561267521024e+04, 2.417638080729138e+04, 2.416714817190654e+04,
- 2.415791476887697e+04, 2.414868059802389e+04, 2.413944565916843e+04, 2.413020995213165e+04, 2.412097347673454e+04,
- 2.411173623279804e+04, 2.410249822014300e+04, 2.409325943859020e+04, 2.408401988796039e+04, 2.407477956807420e+04,
- 2.406553847875223e+04, 2.405629661981499e+04, 2.404705399108293e+04, 2.403781059237643e+04, 2.402856642351580e+04,
- 2.401932148432129e+04, 2.401007577461306e+04, 2.400082929421122e+04, 2.399158204293581e+04, 2.398233402060681e+04,
- 2.397308522704410e+04, 2.396383566206751e+04, 2.395458532549681e+04, 2.394533421715169e+04, 2.393608233685177e+04,
- 2.392682968441661e+04, 2.391757625966568e+04, 2.390832206241842e+04, 2.389906709249416e+04, 2.388981134971217e+04,
- 2.388055483389168e+04, 2.387129754485182e+04, 2.386203948241165e+04, 2.385278064639019e+04, 2.384352103660635e+04,
- 2.383426065287902e+04, 2.382499949502695e+04, 2.381573756286890e+04, 2.380647485622352e+04, 2.379721137490938e+04
- },
- {
- 2.516581860162409e+04, 2.515666383307756e+04, 2.514750831521358e+04, 2.513835204786084e+04, 2.512919503084798e+04,
- 2.512003726400359e+04, 2.511087874715617e+04, 2.510171948013416e+04, 2.509255946276593e+04, 2.508339869487983e+04,
- 2.507423717630408e+04, 2.506507490686689e+04, 2.505591188639637e+04, 2.504674811472057e+04, 2.503758359166751e+04,
- 2.502841831706510e+04, 2.501925229074121e+04, 2.501008551252365e+04, 2.500091798224013e+04, 2.499174969971836e+04,
- 2.498258066478591e+04, 2.497341087727034e+04, 2.496424033699913e+04, 2.495506904379967e+04, 2.494589699749934e+04,
- 2.493672419792541e+04, 2.492755064490508e+04, 2.491837633826553e+04, 2.490920127783382e+04, 2.490002546343700e+04,
- 2.489084889490202e+04, 2.488167157205576e+04, 2.487249349472505e+04, 2.486331466273668e+04, 2.485413507591731e+04,
- 2.484495473409360e+04, 2.483577363709210e+04, 2.482659178473931e+04, 2.481740917686167e+04, 2.480822581328557e+04,
- 2.479904169383731e+04, 2.478985681834310e+04, 2.478067118662915e+04, 2.477148479852155e+04, 2.476229765384635e+04,
- 2.475310975242952e+04, 2.474392109409700e+04, 2.473473167867461e+04, 2.472554150598814e+04, 2.471635057586330e+04
- }
-};
-
-typedef TabulatedCO2Properties< TabulatedEnthalpyTraits > TabulatedEnthalpy;
-
-
-// this class collects all the tabulated quantities in one convenient place
-struct CO2Tables {
- static const TabulatedEnthalpy tabulatedEnthalpy;
- static const TabulatedDensity tabulatedDensity;
-};
-
-const TabulatedEnthalpy CO2Tables::tabulatedEnthalpy;
-const TabulatedDensity CO2Tables::tabulatedDensity;
-
diff --git a/examples/biomineralization/properties.hh b/examples/biomineralization/properties.hh
index 86dd9660adc9776d3da00d870c6aced7e0f4213a..62fd78f7756ec791f3a85657b00b0e1a148032f9 100644
--- a/examples/biomineralization/properties.hh
+++ b/examples/biomineralization/properties.hh
@@ -47,7 +47,7 @@
// We include the necessary material files
#include <examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh>
#include <examples/biomineralization/material/solidsystems/biominsolids.hh>
-#include <examples/biomineralization/material/co2tableslaboratory.hh>
+#include <examples/biomineralization/material/co2tables.hh>
// We include the problem and spatial parameters headers used for this simulation.
#include "problem.hh"
@@ -93,7 +93,7 @@ template<class TypeTag>
struct FluidSystem<TypeTag, TTag::MICPColumnSimpleChemistry>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using CO2Tables = Dumux::ICP::CO2Tables;
+ using CO2Tables = BiomineralizationCO2Tables::CO2Tables;
using H2OTabulated = Components::TabulatedComponent<Components::H2O<Scalar>>;
using type = Dumux::FluidSystems::BioMinSimpleChemistryFluid<Scalar, CO2Tables, H2OTabulated>;
};