diff --git a/ChemistryLib/ChemicalSolverInterface.h b/ChemistryLib/ChemicalSolverInterface.h index b7339bfe695ac843cc44fee55cc3e55978ee1ad9..ef6c1bbebfb1aad0fb57b739ee4102226fee604a 100644 --- a/ChemistryLib/ChemicalSolverInterface.h +++ b/ChemistryLib/ChemicalSolverInterface.h @@ -52,7 +52,7 @@ public: virtual void executeInitialCalculation() = 0; - virtual void doWaterChemistryCalculation(double const dt) = 0; + virtual void executeSpeciationCalculation(double const dt) = 0; virtual std::vector<GlobalVector*> getIntPtProcessSolutions() const = 0; diff --git a/ChemistryLib/PhreeqcIO.cpp b/ChemistryLib/PhreeqcIO.cpp index 07b12640a3d86b064b99d16ca210ef5f6231c29e..f021763254cfc0cdaca32f28e4750c7dad90ae20 100644 --- a/ChemistryLib/PhreeqcIO.cpp +++ b/ChemistryLib/PhreeqcIO.cpp @@ -300,7 +300,7 @@ std::vector<GlobalVector*> PhreeqcIO::getIntPtProcessSolutions() const return int_pt_process_solutions; } -void PhreeqcIO::doWaterChemistryCalculation(double const dt) +void PhreeqcIO::executeSpeciationCalculation(double const dt) { writeInputsToFile(dt); diff --git a/ChemistryLib/PhreeqcIO.h b/ChemistryLib/PhreeqcIO.h index 3871493addc99e919c0d54d0e38c4ce4650b648e..168b6588935dc8577e412141bffd821ba9e222cc 100644 --- a/ChemistryLib/PhreeqcIO.h +++ b/ChemistryLib/PhreeqcIO.h @@ -65,7 +65,7 @@ public: void executeInitialCalculation() override; - void doWaterChemistryCalculation(double const dt) override; + void executeSpeciationCalculation(double const dt) override; void writeInputsToFile(double const dt = 0); diff --git a/ChemistryLib/PhreeqcKernel.cpp b/ChemistryLib/PhreeqcKernel.cpp index 1c8a3c2f077ae95f1d2477e4993faaff84aa4c0b..473a47290feb2a059b944379c71e41a0d53d3ddc 100644 --- a/ChemistryLib/PhreeqcKernel.cpp +++ b/ChemistryLib/PhreeqcKernel.cpp @@ -170,7 +170,7 @@ void PhreeqcKernel::reinitializeRates() }; } -void PhreeqcKernel::doWaterChemistryCalculation(double const dt) +void PhreeqcKernel::executeSpeciationCalculation(double const dt) { std::vector<GlobalVector*> process_solutions; @@ -327,7 +327,7 @@ void PhreeqcKernel::reset(std::size_t const chemical_system_id) void PhreeqcKernel::executeInitialCalculation() { // TODO (Renchao): This function could be replaced with - // PhreeqcKernel::doWaterChemistryCalculation(std::vector<GlobalVector*>& + // PhreeqcKernel::executeSpeciationCalculation(std::vector<GlobalVector*>& // process_solutions, double const dt). std::vector<GlobalVector*> process_solutions; diff --git a/ChemistryLib/PhreeqcKernel.h b/ChemistryLib/PhreeqcKernel.h index b77c3cebc22ae13ce0ac2bdddffaa91d3468d846..e8fe4f6b248a86b4eb0428f2431feb738d3b0c99 100644 --- a/ChemistryLib/PhreeqcKernel.h +++ b/ChemistryLib/PhreeqcKernel.h @@ -43,7 +43,7 @@ public: void executeInitialCalculation() override; - void doWaterChemistryCalculation(double const dt) override; + void executeSpeciationCalculation(double const dt) override; void setAqueousSolutions( std::vector<GlobalVector*> const& process_solutions); diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp index ea76dff778bf8b11f47969bffe0fea958ab01548..02bb574341b4ddb7278ce5c9acf3739a1bed9d5d 100644 --- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp +++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp @@ -241,7 +241,7 @@ void ComponentTransportProcess::solveReactionEquation( _chemical_solver_interface->setAqueousSolutionsPrevFromDumpFile(); - _chemical_solver_interface->doWaterChemistryCalculation(dt); + _chemical_solver_interface->executeSpeciationCalculation(dt); extrapolateIntegrationPointValuesToNodes( t, _chemical_solver_interface->getIntPtProcessSolutions(), x);