From f11ac3dc389243d24cb5e3bce90ce39a9a2022fc Mon Sep 17 00:00:00 2001
From: renchao_lu <renchao.lu@gmail.com>
Date: Fri, 11 Dec 2020 19:39:49 +0100
Subject: [PATCH] [PL/CT] Store in class ComponentTransportProcess
---
Applications/ApplicationsLib/ProjectData.cpp | 6 +++---
Applications/ApplicationsLib/ProjectData.h | 10 +++++-----
.../ComponentTransport/ComponentTransportProcess.cpp | 7 +++++--
.../ComponentTransport/ComponentTransportProcess.h | 12 +++++++++++-
.../CreateComponentTransportProcess.cpp | 8 +++++---
.../CreateComponentTransportProcess.h | 3 ++-
6 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index 8e8d16614e7..785ef60b107 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -343,7 +343,7 @@ ProjectData::ProjectData(BaseLib::ConfigTree const& project_config,
//! \ogs_file_param{prj__processes}
parseProcesses(project_config.getConfigSubtree("processes"),
project_directory, output_directory,
- chemical_solver_interface.get());
+ std::move(chemical_solver_interface));
//! \ogs_file_param{prj__linear_solvers}
parseLinearSolvers(project_config.getConfigSubtree("linear_solvers"));
@@ -570,7 +570,7 @@ void ProjectData::parseProcesses(
BaseLib::ConfigTree const& processes_config,
std::string const& project_directory,
std::string const& output_directory,
- [[maybe_unused]] ChemistryLib::ChemicalSolverInterface* const
+ [[maybe_unused]] std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
chemical_solver_interface)
{
(void)project_directory; // to avoid compilation warning
@@ -742,7 +742,7 @@ void ProjectData::parseProcesses(
name, *_mesh_vec[0], std::move(jacobian_assembler),
_process_variables, _parameters, integration_order,
process_config, _mesh_vec, _media,
- chemical_solver_interface);
+ std::move(chemical_solver_interface));
}
else
#endif
diff --git a/Applications/ApplicationsLib/ProjectData.h b/Applications/ApplicationsLib/ProjectData.h
index 6b02facc8ed..7f2ad85cd0f 100644
--- a/Applications/ApplicationsLib/ProjectData.h
+++ b/Applications/ApplicationsLib/ProjectData.h
@@ -99,11 +99,11 @@ private:
/// Parses the processes configuration and creates new processes for each
/// process entry passing the corresponding subtree to the process
/// constructor.
- void parseProcesses(
- BaseLib::ConfigTree const& processes_config,
- std::string const& project_directory,
- std::string const& output_directory,
- ChemistryLib::ChemicalSolverInterface* chemical_solver_interface);
+ void parseProcesses(BaseLib::ConfigTree const& processes_config,
+ std::string const& project_directory,
+ std::string const& output_directory,
+ std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
+ chemical_solver_interface);
/// Parses the time loop configuration.
void parseTimeLoop(BaseLib::ConfigTree const& config,
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index b3718236004..89da836b97d 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
@@ -31,12 +31,15 @@ ComponentTransportProcess::ComponentTransportProcess(
ComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
bool const use_monolithic_scheme,
- std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux)
+ std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux,
+ std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
+ chemical_solver_interface)
: Process(std::move(name), mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
std::move(secondary_variables), use_monolithic_scheme),
_process_data(std::move(process_data)),
- _surfaceflux(std::move(surfaceflux))
+ _surfaceflux(std::move(surfaceflux)),
+ _chemical_solver_interface(std::move(chemical_solver_interface))
{
}
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.h b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
index c13c5e8ab64..873eed1e112 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.h
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
@@ -15,6 +15,11 @@
#include "NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h"
#include "ProcessLib/Process.h"
+namespace ChemistryLib
+{
+class ChemicalSolverInterface;
+}
+
namespace ProcessLib
{
struct SurfaceFluxData;
@@ -102,7 +107,9 @@ public:
ComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
bool const use_monolithic_scheme,
- std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux);
+ std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux,
+ std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
+ chemical_solver_interface);
//! \name ODESystem interface
//! @{
@@ -164,6 +171,9 @@ private:
_local_assemblers;
std::unique_ptr<ProcessLib::SurfaceFluxData> _surfaceflux;
+
+ std::unique_ptr<ChemistryLib::ChemicalSolverInterface>
+ _chemical_solver_interface;
};
} // namespace ComponentTransport
diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
index a8964d06159..d04aa117f4a 100644
--- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
@@ -84,7 +84,8 @@ std::unique_ptr<Process> createComponentTransportProcess(
BaseLib::ConfigTree const& config,
std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes,
std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media,
- ChemistryLib::ChemicalSolverInterface* const chemical_solver_interface)
+ std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
+ chemical_solver_interface)
{
//! \ogs_file_param{prj__processes__process__type}
config.checkConfigParameter("type", "ComponentTransport");
@@ -225,7 +226,7 @@ std::unique_ptr<Process> createComponentTransportProcess(
DBUG("Media properties verified.");
auto chemical_process_data =
- createChemicalProcessData(chemical_solver_interface);
+ createChemicalProcessData(chemical_solver_interface.get());
ComponentTransportProcessData process_data{std::move(media_map),
specific_body_force,
@@ -253,7 +254,8 @@ std::unique_ptr<Process> createComponentTransportProcess(
std::move(name), mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
std::move(process_data), std::move(secondary_variables),
- use_monolithic_scheme, std::move(surfaceflux));
+ use_monolithic_scheme, std::move(surfaceflux),
+ std::move(chemical_solver_interface));
}
} // namespace ComponentTransport
diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.h b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.h
index 123f7ff8bc7..abc6364fd42 100644
--- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.h
+++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.h
@@ -37,6 +37,7 @@ std::unique_ptr<Process> createComponentTransportProcess(
BaseLib::ConfigTree const& config,
std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes,
std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media,
- ChemistryLib::ChemicalSolverInterface* chemical_solver_interface);
+ std::unique_ptr<ChemistryLib::ChemicalSolverInterface>&&
+ chemical_solver_interface);
} // namespace ComponentTransport
} // namespace ProcessLib
--
GitLab