From 3e115467d78f7fcb6bc8adf6a3a8ee9b8a1fb526 Mon Sep 17 00:00:00 2001
From: renchao_lu <renchao.lu@gmail.com>
Date: Fri, 12 Mar 2021 01:04:55 +0100
Subject: [PATCH] [CL] reset access specifier.
---
ChemistryLib/ChemicalSolverInterface.h | 2 ++
ChemistryLib/PhreeqcIO.cpp | 2 --
ChemistryLib/PhreeqcIO.h | 4 ++--
ProcessLib/ComponentTransport/ComponentTransportProcess.cpp | 2 ++
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ChemistryLib/ChemicalSolverInterface.h b/ChemistryLib/ChemicalSolverInterface.h
index 492e88e79c0..b7339bfe695 100644
--- a/ChemistryLib/ChemicalSolverInterface.h
+++ b/ChemistryLib/ChemicalSolverInterface.h
@@ -48,6 +48,8 @@ public:
{
}
+ virtual void setAqueousSolutionsPrevFromDumpFile() {}
+
virtual void executeInitialCalculation() = 0;
virtual void doWaterChemistryCalculation(double const dt) = 0;
diff --git a/ChemistryLib/PhreeqcIO.cpp b/ChemistryLib/PhreeqcIO.cpp
index 9ecc4807c5d..07b12640a3d 100644
--- a/ChemistryLib/PhreeqcIO.cpp
+++ b/ChemistryLib/PhreeqcIO.cpp
@@ -302,8 +302,6 @@ std::vector<GlobalVector*> PhreeqcIO::getIntPtProcessSolutions() const
void PhreeqcIO::doWaterChemistryCalculation(double const dt)
{
- setAqueousSolutionsPrevFromDumpFile();
-
writeInputsToFile(dt);
execute();
diff --git a/ChemistryLib/PhreeqcIO.h b/ChemistryLib/PhreeqcIO.h
index 376f8aaa712..3871493addc 100644
--- a/ChemistryLib/PhreeqcIO.h
+++ b/ChemistryLib/PhreeqcIO.h
@@ -61,6 +61,8 @@ public:
ParameterLib::SpatialPosition const& pos, double const t,
double const dt) override;
+ void setAqueousSolutionsPrevFromDumpFile() override;
+
void executeInitialCalculation() override;
void doWaterChemistryCalculation(double const dt) override;
@@ -93,8 +95,6 @@ private:
return *this;
}
- void setAqueousSolutionsPrevFromDumpFile();
-
std::string const _database;
std::unique_ptr<ChemicalSystem> _chemical_system;
std::vector<ReactionRate> const _reaction_rates;
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index 8b59ddfecdd..ea76dff778b 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
@@ -239,6 +239,8 @@ void ComponentTransportProcess::solveReactionEquation(
BaseLib::RunTime time_phreeqc;
time_phreeqc.start();
+ _chemical_solver_interface->setAqueousSolutionsPrevFromDumpFile();
+
_chemical_solver_interface->doWaterChemistryCalculation(dt);
extrapolateIntegrationPointValuesToNodes(
--
GitLab