diff --git a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp index 89c88653a11fa822b43f729a0de92614386402c9..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 << " " << (*molality)[global_id] - << "\n"; + os << name << " " << saturation_index << " " + << (*molality)[chemical_system_id] << "\n"; } } // namespace PhreeqcIOData } // namespace ChemistryLib diff --git a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.h b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.h index c502f756d0577d5802de6f31b6cdf7a6c4b7af0e..03a1b7dd14b7b33b2fc7a9d393eacd5c8aa5df0a 100644 --- a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.h +++ b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.h @@ -39,7 +39,7 @@ struct EquilibriumReactant { } - 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>* molality; diff --git a/ChemistryLib/PhreeqcIOData/KineticReactant.cpp b/ChemistryLib/PhreeqcIOData/KineticReactant.cpp index 37ddaf35ef22be6e46e2705097e175ddcbab0670..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,9 +26,9 @@ void KineticReactant::print(std::ostream& os, os << "-formula " << chemical_formula << "\n"; } - os << "-m " << (*molality)[global_id] << "\n"; + os << "-m " << (*molality)[chemical_system_id] << "\n"; - os << "-parms " << (*molality)[global_id]; + os << "-parms " << (*molality)[chemical_system_id]; for (auto const& parameter : parameters) { os << " " << parameter; diff --git a/ChemistryLib/PhreeqcIOData/KineticReactant.h b/ChemistryLib/PhreeqcIOData/KineticReactant.h index b104206f71f66703be5924cad1d737a02ce45b54..1859418b92c85e6f544f9ff082e5c6815ae7cbb5 100644 --- a/ChemistryLib/PhreeqcIOData/KineticReactant.h +++ b/ChemistryLib/PhreeqcIOData/KineticReactant.h @@ -39,7 +39,7 @@ struct KineticReactant { } - 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;