diff --git a/ChemistryLib/PhreeqcIO.cpp b/ChemistryLib/PhreeqcIO.cpp
index 91711e29547dd4daa8cd402bedad5c0504416944..d1515e5d2441256872a341544ed1c77ca604bf2e 100644
--- a/ChemistryLib/PhreeqcIO.cpp
+++ b/ChemistryLib/PhreeqcIO.cpp
@@ -51,29 +51,30 @@ std::ostream& operator<<(std::ostream& os,
}
template <typename Reactant>
-void setReactantAmount(Reactant& reactant,
- GlobalIndexType const& chemical_system_id,
- MaterialPropertyLib::Phase const& solid_phase,
- ParameterLib::SpatialPosition const& pos, double const t)
+void setReactantMolality(Reactant& reactant,
+ GlobalIndexType const& chemical_system_id,
+ MaterialPropertyLib::Phase const& solid_phase,
+ ParameterLib::SpatialPosition const& pos,
+ double const t)
{
auto const& solid_constituent = solid_phase.component(reactant.name);
- auto const amount =
- solid_constituent.property(MaterialPropertyLib::PropertyType::amount)
+ auto const molality =
+ solid_constituent.property(MaterialPropertyLib::PropertyType::molality)
.template initialValue<double>(pos, t);
- (*reactant.amount)[chemical_system_id] = amount;
+ (*reactant.molality)[chemical_system_id] = molality;
}
template <typename Reactant>
-static double averageReactantAmount(
+static double averageReactantMolality(
Reactant const& reactant,
std::vector<GlobalIndexType> const& chemical_system_indices)
{
double const sum = std::accumulate(
chemical_system_indices.begin(), chemical_system_indices.end(), 0.0,
[&](double const s, GlobalIndexType const id) {
- return s + (*reactant.amount)[id];
+ return s + (*reactant.molality)[id];
});
return sum / chemical_system_indices.size();
}
@@ -151,14 +152,14 @@ void PhreeqcIO::initializeChemicalSystemConcrete(
auto const& solid_phase = medium->phase("Solid");
for (auto& kinetic_reactant : _chemical_system->kinetic_reactants)
{
- setReactantAmount(kinetic_reactant, chemical_system_id, solid_phase,
- pos, t);
+ setReactantMolality(kinetic_reactant, chemical_system_id, solid_phase,
+ pos, t);
}
for (auto& equilibrium_reactant : _chemical_system->equilibrium_reactants)
{
- setReactantAmount(equilibrium_reactant, chemical_system_id, solid_phase,
- pos, t);
+ setReactantMolality(equilibrium_reactant, chemical_system_id,
+ solid_phase, pos, t);
}
}
@@ -530,7 +531,7 @@ std::istream& operator>>(std::istream& in, PhreeqcIO& phreeqc_io)
equilibrium_reactants.end(), compare_by_name,
"Could not find equilibrium reactant '" + item_name +
"'.");
- (*equilibrium_reactant.amount)[chemical_system_id] =
+ (*equilibrium_reactant.molality)[chemical_system_id] =
accepted_items[item_id];
break;
}
@@ -541,7 +542,7 @@ std::istream& operator>>(std::istream& in, PhreeqcIO& phreeqc_io)
kinetic_reactants.begin(), kinetic_reactants.end(),
compare_by_name,
"Could not find kinetic reactant '" + item_name + "'.");
- (*kinetic_reactant.amount)[chemical_system_id] =
+ (*kinetic_reactant.molality)[chemical_system_id] =
accepted_items[item_id];
break;
}
@@ -585,14 +586,15 @@ void PhreeqcIO::computeSecondaryVariable(
{
for (auto& kinetic_reactant : _chemical_system->kinetic_reactants)
{
- (*kinetic_reactant.amount_avg)[ele_id] =
- averageReactantAmount(kinetic_reactant, chemical_system_indices);
+ (*kinetic_reactant.mesh_prop_molality)[ele_id] =
+ averageReactantMolality(kinetic_reactant, chemical_system_indices);
}
for (auto& equilibrium_reactant : _chemical_system->equilibrium_reactants)
{
- (*equilibrium_reactant.amount_avg)[ele_id] = averageReactantAmount(
- equilibrium_reactant, chemical_system_indices);
+ (*equilibrium_reactant.mesh_prop_molality)[ele_id] =
+ averageReactantMolality(equilibrium_reactant,
+ chemical_system_indices);
}
}
} // namespace PhreeqcIOData
diff --git a/ChemistryLib/PhreeqcIOData/ChemicalSystem.cpp b/ChemistryLib/PhreeqcIOData/ChemicalSystem.cpp
index 669c57d3b88816b9e901e3fbde076554adc0dc88..6a7286fb1c9012b5e6fd995076e727dd8aa12b7a 100644
--- a/ChemistryLib/PhreeqcIOData/ChemicalSystem.cpp
+++ b/ChemistryLib/PhreeqcIOData/ChemicalSystem.cpp
@@ -38,12 +38,12 @@ void ChemicalSystem::initialize(std::size_t const num_chemical_systems)
for (auto& kinetic_reactant : kinetic_reactants)
{
- kinetic_reactant.amount->resize(num_chemical_systems);
+ kinetic_reactant.molality->resize(num_chemical_systems);
}
for (auto& equilibrium_reactant : equilibrium_reactants)
{
- equilibrium_reactant.amount->resize(num_chemical_systems);
+ equilibrium_reactant.molality->resize(num_chemical_systems);
}
}
} // namespace PhreeqcIOData
diff --git a/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp b/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp
index 198f4f59896f542c03487e0667c8e4629ddd6f1d..8455a6f23a95b11aeae478540dba07185a1b77b0 100644
--- a/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp
+++ b/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp
@@ -42,17 +42,15 @@ std::vector<EquilibriumReactant> createEquilibriumReactants(
equilibrium_reactant_config.getConfigParameter<double>(
"saturation_index");
- auto amount = MeshLib::getOrCreateMeshProperty<double>(
+ auto molality = MeshLib::getOrCreateMeshProperty<double>(
mesh, name, MeshLib::MeshItemType::IntegrationPoint, 1);
- auto mesh_prop_amount = MeshLib::getOrCreateMeshProperty<double>(
+ auto mesh_prop_molality = MeshLib::getOrCreateMeshProperty<double>(
mesh, name + "_avg", MeshLib::MeshItemType::Cell, 1);
- mesh_prop_amount->resize(mesh.getNumberOfElements());
+ mesh_prop_molality->resize(mesh.getNumberOfElements());
- equilibrium_reactants.emplace_back(std::move(name),
- amount,
- mesh_prop_amount,
- saturation_index);
+ equilibrium_reactants.emplace_back(
+ std::move(name), molality, mesh_prop_molality, saturation_index);
}
return equilibrium_reactants;
diff --git a/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp b/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp
index a063b340b30e8ab12705f92284d56faebd64d41e..8ab72618334ff9349f37e8023baa4f29e1c42e16 100644
--- a/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp
+++ b/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp
@@ -50,12 +50,12 @@ std::vector<KineticReactant> createKineticReactants(
//! \ogs_file_param{prj__chemical_system__kinetic_reactants__kinetic_reactant__fix_amount}
reactant_config.getConfigParameter<bool>("fix_amount", false);
- auto amount = MeshLib::getOrCreateMeshProperty<double>(
+ auto molality = MeshLib::getOrCreateMeshProperty<double>(
mesh, name, MeshLib::MeshItemType::IntegrationPoint, 1);
- auto mesh_prop_amount = MeshLib::getOrCreateMeshProperty<double>(
+ auto mesh_prop_molality = MeshLib::getOrCreateMeshProperty<double>(
mesh, name + "_avg", MeshLib::MeshItemType::Cell, 1);
- mesh_prop_amount->resize(mesh.getNumberOfElements());
+ mesh_prop_molality->resize(mesh.getNumberOfElements());
if (chemical_formula.empty() && fix_amount)
{
@@ -66,8 +66,8 @@ std::vector<KineticReactant> createKineticReactants(
kinetic_reactants.emplace_back(std::move(name),
std::move(chemical_formula),
- amount,
- mesh_prop_amount,
+ molality,
+ mesh_prop_molality,
std::move(parameters),
fix_amount);
}
diff --git a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp
index f6ff1020f85de0c89aa85888067b471f80b43146..e48e452afc1b017c67cb12d58ac564c24defcb3e 100644
--- a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp
+++ b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp
@@ -17,10 +17,10 @@ namespace ChemistryLib
namespace PhreeqcIOData
{
void EquilibriumReactant::print(std::ostream& os,
- std::size_t const global_id) const
+ std::size_t const chemical_system_id) const
{
os << name << " " << saturation_index << " "
- << (*amount)[global_id] << "\n";
+ << (*molality)[chemical_system_id] << "\n";
}
} // namespace PhreeqcIOData
} // namespace ChemistryLib
diff --git a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.h b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.h
index 3ef18ab9e9c82bbff80790eb81f7c5b812d07637..03a1b7dd14b7b33b2fc7a9d393eacd5c8aa5df0a 100644
--- a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.h
+++ b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.h
@@ -29,21 +29,21 @@ namespace PhreeqcIOData
struct EquilibriumReactant
{
EquilibriumReactant(std::string name_,
- MeshLib::PropertyVector<double>* amount_,
- MeshLib::PropertyVector<double>* amount_avg_,
+ MeshLib::PropertyVector<double>* molality_,
+ MeshLib::PropertyVector<double>* mesh_prop_molality_,
double saturation_index_)
: name(std::move(name_)),
- amount(amount_),
- amount_avg(amount_avg_),
+ molality(molality_),
+ mesh_prop_molality(mesh_prop_molality_),
saturation_index(saturation_index_)
{
}
- void print(std::ostream& os, std::size_t const global_id) const;
+ void print(std::ostream& os, std::size_t const chemical_system_id) const;
std::string const name;
- MeshLib::PropertyVector<double>* amount;
- MeshLib::PropertyVector<double>* amount_avg;
+ MeshLib::PropertyVector<double>* molality;
+ MeshLib::PropertyVector<double>* mesh_prop_molality;
double const saturation_index;
static const ItemType item_type = ItemType::EquilibriumReactant;
};
diff --git a/ChemistryLib/PhreeqcIOData/KineticReactant.cpp b/ChemistryLib/PhreeqcIOData/KineticReactant.cpp
index 18db0961fe7272fb3b01a927c9edb5923aea9452..173635e2ebcdc11c343e1f6b1a2180aff34b9367 100644
--- a/ChemistryLib/PhreeqcIOData/KineticReactant.cpp
+++ b/ChemistryLib/PhreeqcIOData/KineticReactant.cpp
@@ -17,7 +17,7 @@ namespace ChemistryLib
namespace PhreeqcIOData
{
void KineticReactant::print(std::ostream& os,
- std::size_t const global_id) const
+ std::size_t const chemical_system_id) const
{
os << name << "\n";
@@ -26,17 +26,14 @@ void KineticReactant::print(std::ostream& os,
os << "-formula " << chemical_formula << "\n";
}
- os << "-m " << (*amount)[global_id] << "\n";
+ os << "-m " << (*molality)[chemical_system_id] << "\n";
- if (!parameters.empty())
+ os << "-parms " << (*molality)[chemical_system_id];
+ for (auto const& parameter : parameters)
{
- os << "-parms";
- for (auto const& parameter : parameters)
- {
- os << " " << parameter;
- }
- os << "\n";
+ os << " " << parameter;
}
+ os << "\n";
}
const ItemType KineticReactant::item_type;
} // namespace PhreeqcIOData
diff --git a/ChemistryLib/PhreeqcIOData/KineticReactant.h b/ChemistryLib/PhreeqcIOData/KineticReactant.h
index 40c9af5b6f4f7fe9c16e7c03bafeecfae20aeaf5..1859418b92c85e6f544f9ff082e5c6815ae7cbb5 100644
--- a/ChemistryLib/PhreeqcIOData/KineticReactant.h
+++ b/ChemistryLib/PhreeqcIOData/KineticReactant.h
@@ -26,25 +26,25 @@ struct KineticReactant
{
KineticReactant(std::string name_,
std::string chemical_formula_,
- MeshLib::PropertyVector<double>* amount_,
- MeshLib::PropertyVector<double>* amount_avg_,
+ MeshLib::PropertyVector<double>* molality_,
+ MeshLib::PropertyVector<double>* mesh_prop_molality_,
std::vector<double>&& parameters_,
bool const fix_amount_)
: name(std::move(name_)),
chemical_formula(std::move(chemical_formula_)),
- amount(amount_),
- amount_avg(amount_avg_),
+ molality(molality_),
+ mesh_prop_molality(mesh_prop_molality_),
parameters(std::move(parameters_)),
fix_amount(fix_amount_)
{
}
- void print(std::ostream& os, std::size_t const global_id) const;
+ void print(std::ostream& os, std::size_t const chemical_system_id) const;
std::string const name;
std::string const chemical_formula;
- MeshLib::PropertyVector<double>* amount;
- MeshLib::PropertyVector<double>* amount_avg;
+ MeshLib::PropertyVector<double>* molality;
+ MeshLib::PropertyVector<double>* mesh_prop_molality;
std::vector<double> const parameters;
bool const fix_amount;
static const ItemType item_type = ItemType::KineticReactant;
diff --git a/MaterialLib/MPL/PropertyType.h b/MaterialLib/MPL/PropertyType.h
index 55a7adb99c0793ef778d0367ab7337d8e05b5e96..554e7a52bb131f56752fe4667b407e6ef0228dc0 100644
--- a/MaterialLib/MPL/PropertyType.h
+++ b/MaterialLib/MPL/PropertyType.h
@@ -35,7 +35,6 @@ namespace MaterialPropertyLib
enum PropertyType : int
{
acentric_factor,
- amount,
binary_interaction_coefficient,
biot_coefficient,
bishops_effective_stress,
@@ -58,6 +57,7 @@ enum PropertyType : int
heat_capacity,
/// used to compute the hydrodynamic dispersion tensor.
longitudinal_dispersivity,
+ molality,
molar_mass,
mole_fraction,
/// used to compute the hydrodynamic dispersion tensor.
@@ -182,6 +182,11 @@ inline PropertyType convertStringToProperty(std::string const& inString)
{
return PropertyType::longitudinal_dispersivity;
}
+ // TODO (renchao): add property "volume fraction"
+ if (boost::iequals(inString, "molality"))
+ {
+ return PropertyType::molality;
+ }
if (boost::iequals(inString, "molar_mass"))
{
return PropertyType::molar_mass;
@@ -290,11 +295,6 @@ inline PropertyType convertStringToProperty(std::string const& inString)
{
return PropertyType::viscosity;
}
- // TODO (renchao): replace property "amount" with volume fraction
- if (boost::iequals(inString, "amount"))
- {
- return PropertyType::amount;
- }
OGS_FATAL(
"The property name '{:s}' does not correspond to any known property",
@@ -306,7 +306,6 @@ inline PropertyType convertStringToProperty(std::string const& inString)
static const std::array<std::string, PropertyType::number_of_properties>
property_enum_to_string{{"acentric_factor",
- "amount",
"binary_interaction_coefficient",
"biot_coefficient",
"bishops_effective_stress",
@@ -327,6 +326,7 @@ static const std::array<std::string, PropertyType::number_of_properties>
"fredlund_parameters",
"heat_capacity",
"longitudinal_dispersivity",
+ "molality",
"molar_mass",
"mole_fraction",
"molecular_diffusion",
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
index 96e8bae845966d5e44aa560b8aed58e87a865837..d0046d52a3651fb59b9ead4e8ceabaad77062936 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
@@ -153,7 +153,7 @@
<name>Calcite</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>2.07e-4</value>
</property>
@@ -163,7 +163,7 @@
<name>Dolomite(dis)</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1e-10</value>
</property>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj
index 532743e1ce88c9394a7c9fe90cf5646a467505fa..e2f0c75347e8c6d08ba32b47907cf74600c2bde8 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj
@@ -111,7 +111,7 @@
<name>Productc</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1e-6</value>
</property>
@@ -121,7 +121,7 @@
<name>Productd</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1e-6</value>
</property>
@@ -131,7 +131,7 @@
<name>Producte</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1e-6</value>
</property>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj
index 843b8cbb329fad83d35c7fd693566a3620137111..ec07bf2c88cf059196495e5b0b22886028cd120e 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj
@@ -111,7 +111,7 @@
<name>Productd</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1e-6</value>
</property>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj
index 9ce00428f61d498cfa9886b37ce7e32306189b97..2f7925567b40a04c789fa7d2c3be8e04a2b5c543 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj
@@ -132,7 +132,7 @@
<name>Synthetics_to_Productd</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj
index cb72a78c3ccf451a35591a128f3e01dc7151ce53..5b030cfa016ca6126561cbcc4ab1e0ff852a7c5e 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj
@@ -132,7 +132,7 @@
<name>Synthetics_to_Productd</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/SurfaceComplexation/RadionuclideSorption.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/SurfaceComplexation/RadionuclideSorption.prj
index 66ec523428baf5ffbe604a163a4e89eb664996af..e0230244d8f45638a58a6461b89d135b953beab3 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/SurfaceComplexation/RadionuclideSorption.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/SurfaceComplexation/RadionuclideSorption.prj
@@ -175,7 +175,7 @@
<name>Calcite</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>10</value>
</property>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/Wetland/Wetland_1d.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/Wetland/Wetland_1d.prj
index 46f2ffd29fb05e861247aae32bc32460f97df545..6f689d7c2489480626343794e17bf35204fe72a0 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/Wetland/Wetland_1d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/Wetland/Wetland_1d.prj
@@ -279,7 +279,7 @@
<name>Aeration</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -289,7 +289,7 @@
<name>AttDetachment_Xi</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -299,7 +299,7 @@
<name>AttDetachment_Xs</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -309,7 +309,7 @@
<name>Hydrolysis_Xs_m</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -319,7 +319,7 @@
<name>Hydrolysis_Xs_im</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -329,7 +329,7 @@
<name>Aerobic_Growth_Xh_on_Sf</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -339,7 +339,7 @@
<name>Anoxic_Growth_Xh_on_Sf</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -349,7 +349,7 @@
<name>Aerobic_Growth_Xh_on_Sa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -359,7 +359,7 @@
<name>Anoxic_Growth_Xh_on_Sa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -369,7 +369,7 @@
<name>Lysis_Xh</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -379,7 +379,7 @@
<name>Aerobic_Growth_Xa_on_Snh</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -389,7 +389,7 @@
<name>Lysis_Xa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -399,7 +399,7 @@
<name>Growth_Xfb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -409,7 +409,7 @@
<name>Lysis_Xfb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -419,7 +419,7 @@
<name>Growth_Xamb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -429,7 +429,7 @@
<name>Lysis_Xamb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -439,7 +439,7 @@
<name>Growth_Xasrb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -449,7 +449,7 @@
<name>Lysis_Xasrb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -459,7 +459,7 @@
<name>Aerobic_Growth_Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -469,7 +469,7 @@
<name>Anoxic_Growth_Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -479,7 +479,7 @@
<name>Lysis_Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -489,7 +489,7 @@
<name>Xh</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -499,7 +499,7 @@
<name>Xa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -509,7 +509,7 @@
<name>Xfb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -519,7 +519,7 @@
<name>Xamb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -529,7 +529,7 @@
<name>Xasrb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -539,7 +539,7 @@
<name>Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -549,7 +549,7 @@
<name>Xs_im</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-4</value>
</property>
@@ -559,7 +559,7 @@
<name>Xi_im</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-4</value>
</property>
@@ -837,7 +837,7 @@
<name>Aeration</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -847,7 +847,7 @@
<name>AttDetachment_Xi</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -857,7 +857,7 @@
<name>AttDetachment_Xs</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -867,7 +867,7 @@
<name>Hydrolysis_Xs_m</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -877,7 +877,7 @@
<name>Hydrolysis_Xs_im</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -887,7 +887,7 @@
<name>Aerobic_Growth_Xh_on_Sf</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -897,7 +897,7 @@
<name>Anoxic_Growth_Xh_on_Sf</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -907,7 +907,7 @@
<name>Aerobic_Growth_Xh_on_Sa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -917,7 +917,7 @@
<name>Anoxic_Growth_Xh_on_Sa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -927,7 +927,7 @@
<name>Lysis_Xh</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -937,7 +937,7 @@
<name>Aerobic_Growth_Xa_on_Snh</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -947,7 +947,7 @@
<name>Lysis_Xa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -957,7 +957,7 @@
<name>Growth_Xfb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -967,7 +967,7 @@
<name>Lysis_Xfb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -977,7 +977,7 @@
<name>Growth_Xamb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -987,7 +987,7 @@
<name>Lysis_Xamb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -997,7 +997,7 @@
<name>Growth_Xasrb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1007,7 +1007,7 @@
<name>Lysis_Xasrb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1017,7 +1017,7 @@
<name>Aerobic_Growth_Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1027,7 +1027,7 @@
<name>Anoxic_Growth_Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1037,7 +1037,7 @@
<name>Lysis_Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1047,7 +1047,7 @@
<name>Xh</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1057,7 +1057,7 @@
<name>Xa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1067,7 +1067,7 @@
<name>Xfb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1077,7 +1077,7 @@
<name>Xamb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1087,7 +1087,7 @@
<name>Xasrb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1097,7 +1097,7 @@
<name>Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1107,7 +1107,7 @@
<name>Xs_im</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-4</value>
</property>
@@ -1117,7 +1117,7 @@
<name>Xi_im</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-4</value>
</property>
@@ -1395,7 +1395,7 @@
<name>Aeration</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1405,7 +1405,7 @@
<name>AttDetachment_Xi</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1415,7 +1415,7 @@
<name>AttDetachment_Xs</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1425,7 +1425,7 @@
<name>Hydrolysis_Xs_m</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1435,7 +1435,7 @@
<name>Hydrolysis_Xs_im</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1445,7 +1445,7 @@
<name>Aerobic_Growth_Xh_on_Sf</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1455,7 +1455,7 @@
<name>Anoxic_Growth_Xh_on_Sf</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1465,7 +1465,7 @@
<name>Aerobic_Growth_Xh_on_Sa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1475,7 +1475,7 @@
<name>Anoxic_Growth_Xh_on_Sa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1485,7 +1485,7 @@
<name>Lysis_Xh</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1495,7 +1495,7 @@
<name>Aerobic_Growth_Xa_on_Snh</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1505,7 +1505,7 @@
<name>Lysis_Xa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1515,7 +1515,7 @@
<name>Growth_Xfb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1525,7 +1525,7 @@
<name>Lysis_Xfb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1535,7 +1535,7 @@
<name>Growth_Xamb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1545,7 +1545,7 @@
<name>Lysis_Xamb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1555,7 +1555,7 @@
<name>Growth_Xasrb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1565,7 +1565,7 @@
<name>Lysis_Xasrb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1575,7 +1575,7 @@
<name>Aerobic_Growth_Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1585,7 +1585,7 @@
<name>Anoxic_Growth_Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1595,7 +1595,7 @@
<name>Lysis_Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0</value>
</property>
@@ -1605,7 +1605,7 @@
<name>Xh</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1615,7 +1615,7 @@
<name>Xa</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1625,7 +1625,7 @@
<name>Xfb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1635,7 +1635,7 @@
<name>Xamb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1645,7 +1645,7 @@
<name>Xasrb</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1655,7 +1655,7 @@
<name>Xsob</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-3</value>
</property>
@@ -1665,7 +1665,7 @@
<name>Xs_im</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-4</value>
</property>
@@ -1675,7 +1675,7 @@
<name>Xi_im</name>
<properties>
<property>
- <name>amount</name>
+ <name>molality</name>
<type>Constant</type>
<value>1.0e-4</value>
</property>