Skip to content
Snippets Groups Projects
Commit 070a32c4 authored by renchao.lu's avatar renchao.lu
Browse files

[CL] Store initial amount of reactants.

parent 862a9a18
No related branches found
No related tags found
No related merge requests found
......@@ -55,7 +55,7 @@ std::vector<EquilibriumReactant> createEquilibriumReactants(
1);
equilibrium_reactants.emplace_back(
std::move(name), amount, saturation_index);
std::move(name), amount, initial_amount, saturation_index);
}
return equilibrium_reactants;
......
......@@ -71,6 +71,7 @@ std::vector<KineticReactant> createKineticReactants(
kinetic_reactants.emplace_back(std::move(name),
std::move(chemical_formula),
amount,
initial_amount,
std::move(parameters),
fix_amount);
}
......
......@@ -30,9 +30,11 @@ struct EquilibriumReactant
{
EquilibriumReactant(std::string name_,
MeshLib::PropertyVector<double>* amount_,
double const initial_amount_,
double saturation_index_)
: name(std::move(name_)),
amount(amount_),
initial_amount(initial_amount_),
saturation_index(saturation_index_)
{
}
......@@ -41,6 +43,7 @@ struct EquilibriumReactant
std::string const name;
MeshLib::PropertyVector<double>* amount;
double const initial_amount;
double const saturation_index;
static const ItemType item_type = ItemType::EquilibriumReactant;
};
......
......@@ -27,11 +27,13 @@ struct KineticReactant
KineticReactant(std::string name_,
std::string chemical_formula_,
MeshLib::PropertyVector<double>* amount_,
double const initial_amount_,
std::vector<double>&& parameters_,
bool const fix_amount_)
: name(std::move(name_)),
chemical_formula(std::move(chemical_formula_)),
amount(amount_),
initial_amount(initial_amount_),
parameters(std::move(parameters_)),
fix_amount(fix_amount_)
{
......@@ -42,6 +44,7 @@ struct KineticReactant
std::string const name;
std::string const chemical_formula;
MeshLib::PropertyVector<double>* amount;
double const initial_amount;
std::vector<double> const parameters;
bool const fix_amount;
static const ItemType item_type = ItemType::KineticReactant;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment