From e004a37dce2c8a5d9808fd7c7ffd74cbbd14e77e Mon Sep 17 00:00:00 2001 From: renchao_lu <renchao.lu@gmail.com> Date: Fri, 1 Jan 2021 21:33:54 +0100 Subject: [PATCH] [CL] Rename function argument. --- ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp | 6 +++--- ChemistryLib/PhreeqcIOData/EquilibriumReactant.h | 2 +- ChemistryLib/PhreeqcIOData/KineticReactant.cpp | 6 +++--- ChemistryLib/PhreeqcIOData/KineticReactant.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp index 89c88653a11..e48e452afc1 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 c502f756d05..03a1b7dd14b 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 37ddaf35ef2..173635e2ebc 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 b104206f71f..1859418b92c 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; -- GitLab