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

[PL/TimeLoop] Remove _chemical_solver_interface from class TimeLoop.

parent 3dfe856c
No related branches found
No related tags found
No related merge requests found
...@@ -353,7 +353,7 @@ ProjectData::ProjectData(BaseLib::ConfigTree const& project_config, ...@@ -353,7 +353,7 @@ ProjectData::ProjectData(BaseLib::ConfigTree const& project_config,
//! \ogs_file_param{prj__time_loop} //! \ogs_file_param{prj__time_loop}
parseTimeLoop(project_config.getConfigSubtree("time_loop"), parseTimeLoop(project_config.getConfigSubtree("time_loop"),
output_directory, std::move(chemical_solver_interface)); output_directory);
} }
void ProjectData::parseProcessVariables( void ProjectData::parseProcessVariables(
...@@ -1036,17 +1036,13 @@ void ProjectData::parseProcesses( ...@@ -1036,17 +1036,13 @@ void ProjectData::parseProcesses(
} }
} }
void ProjectData::parseTimeLoop( void ProjectData::parseTimeLoop(BaseLib::ConfigTree const& config,
BaseLib::ConfigTree const& config, std::string const& output_directory)
std::string const& output_directory,
std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
chemical_solver_interface)
{ {
DBUG("Reading time loop configuration."); DBUG("Reading time loop configuration.");
_time_loop = ProcessLib::createTimeLoop( _time_loop = ProcessLib::createTimeLoop(
config, output_directory, _processes, _nonlinear_solvers, _mesh_vec, config, output_directory, _processes, _nonlinear_solvers, _mesh_vec);
std::move(chemical_solver_interface));
if (!_time_loop) if (!_time_loop)
{ {
......
...@@ -107,9 +107,7 @@ private: ...@@ -107,9 +107,7 @@ private:
/// Parses the time loop configuration. /// Parses the time loop configuration.
void parseTimeLoop(BaseLib::ConfigTree const& config, void parseTimeLoop(BaseLib::ConfigTree const& config,
const std::string& output_directory, const std::string& output_directory);
std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
chemical_solver_interface);
void parseLinearSolvers(BaseLib::ConfigTree const& config); void parseLinearSolvers(BaseLib::ConfigTree const& config);
......
...@@ -24,9 +24,7 @@ std::unique_ptr<TimeLoop> createTimeLoop( ...@@ -24,9 +24,7 @@ std::unique_ptr<TimeLoop> createTimeLoop(
const std::vector<std::unique_ptr<Process>>& processes, const std::vector<std::unique_ptr<Process>>& processes,
const std::map<std::string, std::unique_ptr<NumLib::NonlinearSolverBase>>& const std::map<std::string, std::unique_ptr<NumLib::NonlinearSolverBase>>&
nonlinear_solvers, nonlinear_solvers,
std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes, std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes)
std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
chemical_solver_interface)
{ {
auto const& coupling_config auto const& coupling_config
//! \ogs_file_param{prj__time_loop__global_process_coupling} //! \ogs_file_param{prj__time_loop__global_process_coupling}
...@@ -94,7 +92,6 @@ std::unique_ptr<TimeLoop> createTimeLoop( ...@@ -94,7 +92,6 @@ std::unique_ptr<TimeLoop> createTimeLoop(
return std::make_unique<TimeLoop>( return std::make_unique<TimeLoop>(
std::move(output), std::move(per_process_data), max_coupling_iterations, std::move(output), std::move(per_process_data), max_coupling_iterations,
std::move(global_coupling_conv_criteria), std::move(global_coupling_conv_criteria), start_time, end_time);
std::move(chemical_solver_interface), start_time, end_time);
} }
} // namespace ProcessLib } // namespace ProcessLib
...@@ -30,11 +30,6 @@ namespace NumLib ...@@ -30,11 +30,6 @@ namespace NumLib
class NonlinearSolverBase; class NonlinearSolverBase;
} }
namespace ChemistryLib
{
class ChemicalSolverInterface;
}
namespace ProcessLib namespace ProcessLib
{ {
class TimeLoop; class TimeLoop;
...@@ -49,8 +44,6 @@ std::unique_ptr<TimeLoop> createTimeLoop( ...@@ -49,8 +44,6 @@ std::unique_ptr<TimeLoop> createTimeLoop(
std::vector<std::unique_ptr<Process>> const& processes, std::vector<std::unique_ptr<Process>> const& processes,
std::map<std::string, std::unique_ptr<NumLib::NonlinearSolverBase>> const& std::map<std::string, std::unique_ptr<NumLib::NonlinearSolverBase>> const&
nonlinear_solvers, nonlinear_solvers,
std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes, std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes);
std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
chemical_solver_interface);
} // namespace ProcessLib } // namespace ProcessLib
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include "BaseLib/Error.h" #include "BaseLib/Error.h"
#include "BaseLib/RunTime.h" #include "BaseLib/RunTime.h"
#include "ChemistryLib/ChemicalSolverInterface.h"
#include "CoupledSolutionsForStaggeredScheme.h" #include "CoupledSolutionsForStaggeredScheme.h"
#include "MathLib/LinAlg/LinAlg.h" #include "MathLib/LinAlg/LinAlg.h"
#include "NumLib/ODESolver/ConvergenceCriterionPerComponent.h" #include "NumLib/ODESolver/ConvergenceCriterionPerComponent.h"
...@@ -323,16 +322,13 @@ TimeLoop::TimeLoop(std::unique_ptr<Output>&& output, ...@@ -323,16 +322,13 @@ TimeLoop::TimeLoop(std::unique_ptr<Output>&& output,
const int global_coupling_max_iterations, const int global_coupling_max_iterations,
std::vector<std::unique_ptr<NumLib::ConvergenceCriterion>>&& std::vector<std::unique_ptr<NumLib::ConvergenceCriterion>>&&
global_coupling_conv_crit, global_coupling_conv_crit,
std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
chemical_solver_interface,
const double start_time, const double end_time) const double start_time, const double end_time)
: _output(std::move(output)), : _output(std::move(output)),
_per_process_data(std::move(per_process_data)), _per_process_data(std::move(per_process_data)),
_start_time(start_time), _start_time(start_time),
_end_time(end_time), _end_time(end_time),
_global_coupling_max_iterations(global_coupling_max_iterations), _global_coupling_max_iterations(global_coupling_max_iterations),
_global_coupling_conv_crit(std::move(global_coupling_conv_crit)), _global_coupling_conv_crit(std::move(global_coupling_conv_crit))
_chemical_solver_interface(std::move(chemical_solver_interface))
{ {
} }
......
...@@ -43,8 +43,6 @@ public: ...@@ -43,8 +43,6 @@ public:
const int global_coupling_max_iterations, const int global_coupling_max_iterations,
std::vector<std::unique_ptr<NumLib::ConvergenceCriterion>>&& std::vector<std::unique_ptr<NumLib::ConvergenceCriterion>>&&
global_coupling_conv_crit, global_coupling_conv_crit,
std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
chemical_system,
const double start_time, const double end_time); const double start_time, const double end_time);
void initialize(); void initialize();
...@@ -125,9 +123,6 @@ private: ...@@ -125,9 +123,6 @@ private:
std::vector<std::unique_ptr<NumLib::ConvergenceCriterion>> std::vector<std::unique_ptr<NumLib::ConvergenceCriterion>>
_global_coupling_conv_crit; _global_coupling_conv_crit;
std::unique_ptr<ChemistryLib::ChemicalSolverInterface>
_chemical_solver_interface;
/// Solutions of the previous coupling iteration for the convergence /// Solutions of the previous coupling iteration for the convergence
/// criteria of the coupling iteration. /// criteria of the coupling iteration.
std::vector<GlobalVector*> _solutions_of_last_cpl_iteration; std::vector<GlobalVector*> _solutions_of_last_cpl_iteration;
......
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