From 2c402d08f30bc17a67663f34dcc8ebee4d79fa2d Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Thu, 1 Feb 2018 13:01:57 +0100
Subject: [PATCH] [PL] TimeLoop: Move creation of process data.
---
ProcessLib/CreateProcessData.cpp | 113 ++++++++++++++++++++++
ProcessLib/CreateProcessData.h | 22 +++++
ProcessLib/UncoupledProcessesTimeLoop.cpp | 100 +------------------
3 files changed, 136 insertions(+), 99 deletions(-)
create mode 100644 ProcessLib/CreateProcessData.cpp
create mode 100644 ProcessLib/CreateProcessData.h
diff --git a/ProcessLib/CreateProcessData.cpp b/ProcessLib/CreateProcessData.cpp
new file mode 100644
index 00000000000..a95435dd79a
--- /dev/null
+++ b/ProcessLib/CreateProcessData.cpp
@@ -0,0 +1,113 @@
+/**
+ * \copyright
+ * Copyright (c) 2012-2018, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ *
+ */
+
+#include "NumLib/ODESolver/TimeDiscretizationBuilder.h"
+#include "NumLib/TimeStepping/CreateTimeStepper.h"
+#include "ProcessLib/Output/CreateProcessOutput.h"
+
+#include "CreateProcessData.h"
+
+namespace ProcessLib
+{
+static std::unique_ptr<SingleProcessData> makeSingleProcessData(
+ std::unique_ptr<NumLib::TimeStepAlgorithm>&& timestepper,
+ NumLib::NonlinearSolverBase& nonlinear_solver,
+ Process& process,
+ std::unique_ptr<NumLib::TimeDiscretization>&& time_disc,
+ std::unique_ptr<NumLib::ConvergenceCriterion>&& conv_crit,
+ ProcessOutput&& process_output)
+{
+ using Tag = NumLib::NonlinearSolverTag;
+
+ if (auto* nonlinear_solver_picard =
+ dynamic_cast<NumLib::NonlinearSolver<Tag::Picard>*>(
+ &nonlinear_solver))
+ {
+ return std::make_unique<SingleProcessData>(
+ std::move(timestepper), *nonlinear_solver_picard,
+ std::move(conv_crit), std::move(time_disc), process,
+ std::move(process_output));
+ }
+ if (auto* nonlinear_solver_newton =
+ dynamic_cast<NumLib::NonlinearSolver<Tag::Newton>*>(
+ &nonlinear_solver))
+ {
+ return std::make_unique<SingleProcessData>(
+ std::move(timestepper), *nonlinear_solver_newton,
+ std::move(conv_crit), std::move(time_disc), process,
+ std::move(process_output));
+ }
+
+ OGS_FATAL("Encountered unknown nonlinear solver type. Aborting");
+}
+
+std::vector<std::unique_ptr<SingleProcessData>> createPerProcessData(
+ BaseLib::ConfigTree const& config,
+ const std::map<std::string, std::unique_ptr<Process>>& processes,
+ std::map<std::string, std::unique_ptr<NumLib::NonlinearSolverBase>> const&
+ nonlinear_solvers)
+{
+ std::vector<std::unique_ptr<SingleProcessData>> per_process_data;
+
+ //! \ogs_file_param{prj__time_loop__processes__process}
+ for (auto pcs_config : config.getConfigSubtreeList("process"))
+ {
+ //! \ogs_file_attr{prj__time_loop__processes__process__ref}
+ auto const pcs_name = pcs_config.getConfigAttribute<std::string>("ref");
+ auto& pcs = *BaseLib::getOrError(
+ processes, pcs_name,
+ "A process with the given name has not been defined.");
+
+ auto const nl_slv_name =
+ //! \ogs_file_param{prj__time_loop__processes__process__nonlinear_solver}
+ pcs_config.getConfigParameter<std::string>("nonlinear_solver");
+ auto& nl_slv = *BaseLib::getOrError(
+ nonlinear_solvers, nl_slv_name,
+ "A nonlinear solver with the given name has not been defined.");
+
+ auto time_disc = NumLib::createTimeDiscretization(
+ //! \ogs_file_param{prj__time_loop__processes__process__time_discretization}
+ pcs_config.getConfigSubtree("time_discretization"));
+
+ auto timestepper = NumLib::createTimeStepper(
+ //! \ogs_file_param{prj__time_loop__processes__process__time_stepping}
+ pcs_config.getConfigSubtree("time_stepping"));
+
+ auto conv_crit = NumLib::createConvergenceCriterion(
+ //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion}
+ pcs_config.getConfigSubtree("convergence_criterion"));
+
+ ProcessOutput process_output =
+ //! \ogs_file_param{prj__time_loop__processes__process__output}
+ createProcessOutput(pcs_config.getConfigSubtree("output"));
+
+ per_process_data.emplace_back(makeSingleProcessData(
+ std::move(timestepper), nl_slv, pcs, std::move(time_disc),
+ std::move(conv_crit), std::move(process_output)));
+ }
+
+ if (per_process_data.size() != processes.size())
+ {
+ if (processes.size() > 1)
+ {
+ OGS_FATAL(
+ "Some processes have not been configured to be solved by this "
+ " time loop.");
+ }
+ else
+ {
+ INFO(
+ "The equations of the coupled processes will be solved by the "
+ "staggered scheme.")
+ }
+ }
+
+ return per_process_data;
+}
+} // namespace ProcessLib
diff --git a/ProcessLib/CreateProcessData.h b/ProcessLib/CreateProcessData.h
new file mode 100644
index 00000000000..7cfb937bb5c
--- /dev/null
+++ b/ProcessLib/CreateProcessData.h
@@ -0,0 +1,22 @@
+/**
+ * \copyright
+ * Copyright (c) 2012-2018, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ *
+ */
+
+#pragma once
+
+#include "ProcessData.h"
+
+namespace ProcessLib
+{
+std::vector<std::unique_ptr<SingleProcessData>> createPerProcessData(
+ BaseLib::ConfigTree const& config,
+ const std::map<std::string, std::unique_ptr<Process>>& processes,
+ std::map<std::string, std::unique_ptr<NumLib::NonlinearSolverBase>> const&
+ nonlinear_solvers);
+
+} // namespace ProcessLib
diff --git a/ProcessLib/UncoupledProcessesTimeLoop.cpp b/ProcessLib/UncoupledProcessesTimeLoop.cpp
index 7fdd057e95f..3f5f81b26b6 100644
--- a/ProcessLib/UncoupledProcessesTimeLoop.cpp
+++ b/ProcessLib/UncoupledProcessesTimeLoop.cpp
@@ -14,11 +14,9 @@
#include "BaseLib/uniqueInsert.h"
#include "MathLib/LinAlg/LinAlg.h"
#include "NumLib/ODESolver/ConvergenceCriterionPerComponent.h"
-#include "NumLib/ODESolver/TimeDiscretizationBuilder.h"
#include "NumLib/ODESolver/TimeDiscretizedODESystem.h"
-#include "NumLib/TimeStepping/CreateTimeStepper.h"
+#include "ProcessLib/CreateProcessData.h"
#include "ProcessLib/Output/CreateOutput.h"
-#include "ProcessLib/Output/CreateProcessOutput.h"
#include "CoupledSolutionsForStaggeredScheme.h"
#include "ProcessData.h"
@@ -147,102 +145,6 @@ void setTimeDiscretizedODESystem(SingleProcessData& spd)
setTimeDiscretizedODESystem(spd, spd.process);
}
-std::unique_ptr<SingleProcessData> makeSingleProcessData(
- std::unique_ptr<NumLib::TimeStepAlgorithm>&& timestepper,
- NumLib::NonlinearSolverBase& nonlinear_solver,
- Process& process,
- std::unique_ptr<NumLib::TimeDiscretization>&& time_disc,
- std::unique_ptr<NumLib::ConvergenceCriterion>&& conv_crit,
- ProcessOutput&& process_output)
-{
- using Tag = NumLib::NonlinearSolverTag;
-
- if (auto* nonlinear_solver_picard =
- dynamic_cast<NumLib::NonlinearSolver<Tag::Picard>*>(
- &nonlinear_solver))
- {
- return std::make_unique<SingleProcessData>(
- std::move(timestepper), *nonlinear_solver_picard,
- std::move(conv_crit), std::move(time_disc), process,
- std::move(process_output));
- }
- if (auto* nonlinear_solver_newton =
- dynamic_cast<NumLib::NonlinearSolver<Tag::Newton>*>(
- &nonlinear_solver))
- {
- return std::make_unique<SingleProcessData>(
- std::move(timestepper), *nonlinear_solver_newton,
- std::move(conv_crit), std::move(time_disc), process,
- std::move(process_output));
- }
-
- OGS_FATAL("Encountered unknown nonlinear solver type. Aborting");
-}
-
-std::vector<std::unique_ptr<SingleProcessData>> createPerProcessData(
- BaseLib::ConfigTree const& config,
- const std::map<std::string, std::unique_ptr<Process>>& processes,
- std::map<std::string, std::unique_ptr<NumLib::NonlinearSolverBase>> const&
- nonlinear_solvers)
-{
- std::vector<std::unique_ptr<SingleProcessData>> per_process_data;
-
- //! \ogs_file_param{prj__time_loop__processes__process}
- for (auto pcs_config : config.getConfigSubtreeList("process"))
- {
- //! \ogs_file_attr{prj__time_loop__processes__process__ref}
- auto const pcs_name = pcs_config.getConfigAttribute<std::string>("ref");
- auto& pcs = *BaseLib::getOrError(
- processes, pcs_name,
- "A process with the given name has not been defined.");
-
- auto const nl_slv_name =
- //! \ogs_file_param{prj__time_loop__processes__process__nonlinear_solver}
- pcs_config.getConfigParameter<std::string>("nonlinear_solver");
- auto& nl_slv = *BaseLib::getOrError(
- nonlinear_solvers, nl_slv_name,
- "A nonlinear solver with the given name has not been defined.");
-
- auto time_disc = NumLib::createTimeDiscretization(
- //! \ogs_file_param{prj__time_loop__processes__process__time_discretization}
- pcs_config.getConfigSubtree("time_discretization"));
-
- auto timestepper = NumLib::createTimeStepper(
- //! \ogs_file_param{prj__time_loop__processes__process__time_stepping}
- pcs_config.getConfigSubtree("time_stepping"));
-
- auto conv_crit = NumLib::createConvergenceCriterion(
- //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion}
- pcs_config.getConfigSubtree("convergence_criterion"));
-
- ProcessOutput process_output =
- //! \ogs_file_param{prj__time_loop__processes__process__output}
- createProcessOutput(pcs_config.getConfigSubtree("output"));
-
- per_process_data.emplace_back(makeSingleProcessData(
- std::move(timestepper), nl_slv, pcs, std::move(time_disc),
- std::move(conv_crit), std::move(process_output)));
- }
-
- if (per_process_data.size() != processes.size())
- {
- if (processes.size() > 1)
- {
- OGS_FATAL(
- "Some processes have not been configured to be solved by this "
- " time loop.");
- }
- else
- {
- INFO(
- "The equations of the coupled processes will be solved by the "
- "staggered scheme.")
- }
- }
-
- return per_process_data;
-}
-
std::unique_ptr<UncoupledProcessesTimeLoop> createUncoupledProcessesTimeLoop(
BaseLib::ConfigTree const& config, std::string const& output_directory,
const std::map<std::string, std::unique_ptr<Process>>& processes,
--
GitLab