diff --git a/Applications/ApplicationsLib/Simulation.cpp b/Applications/ApplicationsLib/Simulation.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9cd9b1eb7b16420666a521d522702d0a69269721
--- /dev/null
+++ b/Applications/ApplicationsLib/Simulation.cpp
@@ -0,0 +1,132 @@
+/**
+ * \brief Implementation of class Simulation
+ * \file
+ *
+ * \copyright
+ * Copyright (c) 2012-2022, 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 <spdlog/spdlog.h>
+
+#include "Simulation.h"
+
+#include "Applications/ApplicationsLib/LinearSolverLibrarySetup.h"
+#include "Applications/ApplicationsLib/ProjectData.h"
+#include "Applications/ApplicationsLib/TestDefinition.h"
+#include "Applications/InSituLib/Adaptor.h"
+#include "BaseLib/ConfigTreeUtil.h"
+#include "BaseLib/DateTools.h"
+#include "BaseLib/FileTools.h"
+#include "BaseLib/RunTime.h"
+#include "NumLib/NumericsConfig.h"
+#include "ProcessLib/TimeLoop.h"
+
+Simulation::Simulation(int argc, char* argv[])
+ : linear_solver_library_setup(argc, argv),
+#if defined(USE_PETSC)
+ controller(vtkSmartPointer<vtkMPIController>::New()),
+#endif
+ test_definition{std::nullopt}
+{
+#if defined(USE_PETSC)
+ controller->Initialize(&argc, &argv, 1);
+ vtkMPIController::SetGlobalController(controller);
+
+ { // Can be called only after MPI_INIT.
+ int mpi_rank;
+ MPI_Comm_rank(PETSC_COMM_WORLD, &mpi_rank);
+ spdlog::set_pattern(fmt::format("[{}] %^%l:%$ %v", mpi_rank));
+ }
+#endif
+}
+
+void Simulation::initializeDataStructures(
+ std::string&& project, std::vector<std::string>&& xml_patch_file_names,
+ bool reference_path_is_set, std::string&& reference_path, bool nonfatal,
+ std::string&& outdir)
+{
+ auto project_config = BaseLib::makeConfigTree(
+ project, !nonfatal, "OpenGeoSysProject", xml_patch_file_names);
+
+ BaseLib::setProjectDirectory(BaseLib::extractPath(project));
+
+ if (!reference_path_is_set)
+ { // Ignore the test_definition section.
+ project_config.ignoreConfigParameter("test_definition");
+ }
+ else
+ {
+ test_definition = ApplicationsLib::TestDefinition(
+ //! \ogs_file_param{prj__test_definition}
+ project_config.getConfigSubtree("test_definition"), reference_path,
+ outdir);
+ if (test_definition->numberOfTests() == 0)
+ {
+ OGS_FATAL(
+ "No tests were constructed from the test definitions, "
+ "but reference solutions path was given.");
+ }
+
+ INFO("Cleanup possible output files before running ogs.");
+ BaseLib::removeFiles(test_definition->getOutputFiles());
+ }
+#ifdef USE_INSITU
+ auto isInsituConfigured = false;
+ //! \ogs_file_param{prj__insitu}
+ if (auto t = project_config.getConfigSubtreeOptional("insitu"))
+ {
+ InSituLib::Initialize(
+ //! \ogs_file_param{prj__insitu__scripts}
+ t->getConfigSubtree("scripts"),
+ BaseLib::extractPath(project_arg.getValue()));
+ isInsituConfigured = true;
+ }
+#else
+ project_config.ignoreConfigParameter("insitu");
+#endif
+
+ project_data = std::make_unique<ProjectData>(
+ project_config, BaseLib::getProjectDirectory(), outdir);
+
+ INFO("Initialize processes.");
+ for (auto& p : project_data->getProcesses())
+ {
+ p->initialize();
+ }
+
+ // Check intermediately that config parsing went fine.
+ checkAndInvalidate(project_config);
+ BaseLib::ConfigTree::assertNoSwallowedErrors();
+
+ auto& time_loop = project_data->getTimeLoop();
+ time_loop.initialize();
+}
+
+bool Simulation::executeSimulation()
+{
+ INFO("Solve processes.");
+ auto& time_loop = project_data->getTimeLoop();
+ return time_loop.loop();
+}
+
+std::optional<ApplicationsLib::TestDefinition> Simulation::getTestDefinition()
+{
+ return test_definition;
+}
+
+Simulation::~Simulation()
+{
+#ifdef USE_INSITU
+ if (isInsituConfigured)
+ {
+ InSituLib::Finalize();
+ }
+#endif
+#if defined(USE_PETSC)
+ controller->Finalize(1);
+#endif
+}
diff --git a/Applications/ApplicationsLib/Simulation.h b/Applications/ApplicationsLib/Simulation.h
index 7a70a417de5ba8278af3cda54765b03e9657dda1..cc44306af9bd8b0d65add7d0dd165587e3946a85 100644
--- a/Applications/ApplicationsLib/Simulation.h
+++ b/Applications/ApplicationsLib/Simulation.h
@@ -1,5 +1,6 @@
/**
- * \brief Implementation of class Simulation
+ * \brief Declaration of class Simulation
+ * \file
*
* \copyright
* Copyright (c) 2012-2022, OpenGeoSys Community (http://www.opengeosys.org)
@@ -9,135 +10,31 @@
*
*/
-#include <spdlog/spdlog.h>
-
#ifdef USE_PETSC
#include <vtkMPIController.h>
#include <vtkSmartPointer.h>
#endif
-// BaseLib
#include "Applications/ApplicationsLib/LinearSolverLibrarySetup.h"
-#include "Applications/ApplicationsLib/ProjectData.h"
#include "Applications/ApplicationsLib/TestDefinition.h"
-#include "Applications/InSituLib/Adaptor.h"
-#include "BaseLib/ConfigTreeUtil.h"
-#include "BaseLib/DateTools.h"
-#include "BaseLib/FileTools.h"
-#include "BaseLib/RunTime.h"
-#include "InfoLib/CMakeInfo.h"
-#include "InfoLib/GitInfo.h"
-#include "NumLib/NumericsConfig.h"
-#include "ProcessLib/TimeLoop.h"
+
+class ProjectData;
class Simulation final
{
public:
- Simulation(int argc, char* argv[])
- : linear_solver_library_setup(argc, argv),
-#if defined(USE_PETSC)
- controller(vtkSmartPointer<vtkMPIController>::New()),
-#endif
- test_definition{std::nullopt}
- {
-#if defined(USE_PETSC)
- controller->Initialize(&argc, &argv, 1);
- vtkMPIController::SetGlobalController(controller);
-
- { // Can be called only after MPI_INIT.
- int mpi_rank;
- MPI_Comm_rank(PETSC_COMM_WORLD, &mpi_rank);
- spdlog::set_pattern(fmt::format("[{}] %^%l:%$ %v", mpi_rank));
- }
-#endif
- }
+ Simulation(int argc, char* argv[]);
void initializeDataStructures(
std::string&& project, std::vector<std::string>&& xml_patch_file_names,
bool reference_path_is_set, std::string&& reference_path, bool nonfatal,
- std::string&& outdir)
- {
- auto project_config = BaseLib::makeConfigTree(
- project, !nonfatal, "OpenGeoSysProject", xml_patch_file_names);
-
- BaseLib::setProjectDirectory(BaseLib::extractPath(project));
-
- if (!reference_path_is_set)
- { // Ignore the test_definition section.
- project_config.ignoreConfigParameter("test_definition");
- }
- else
- {
- test_definition = ApplicationsLib::TestDefinition(
- //! \ogs_file_param{prj__test_definition}
- project_config.getConfigSubtree("test_definition"),
- reference_path, outdir);
- if (test_definition->numberOfTests() == 0)
- {
- OGS_FATAL(
- "No tests were constructed from the test definitions, "
- "but reference solutions path was given.");
- }
+ std::string&& outdir);
- INFO("Cleanup possible output files before running ogs.");
- BaseLib::removeFiles(test_definition->getOutputFiles());
- }
-#ifdef USE_INSITU
- auto isInsituConfigured = false;
- //! \ogs_file_param{prj__insitu}
- if (auto t = project_config.getConfigSubtreeOptional("insitu"))
- {
- InSituLib::Initialize(
- //! \ogs_file_param{prj__insitu__scripts}
- t->getConfigSubtree("scripts"),
- BaseLib::extractPath(project_arg.getValue()));
- isInsituConfigured = true;
- }
-#else
- project_config.ignoreConfigParameter("insitu");
-#endif
-
- project_data = std::make_unique<ProjectData>(
- project_config, BaseLib::getProjectDirectory(), outdir);
-
- INFO("Initialize processes.");
- for (auto& p : project_data->getProcesses())
- {
- p->initialize();
- }
-
- // Check intermediately that config parsing went fine.
- checkAndInvalidate(project_config);
- BaseLib::ConfigTree::assertNoSwallowedErrors();
-
- auto& time_loop = project_data->getTimeLoop();
- time_loop.initialize();
- }
+ bool executeSimulation();
- bool executeSimulation()
- {
- INFO("Solve processes.");
- auto& time_loop = project_data->getTimeLoop();
- return time_loop.loop();
- }
+ std::optional<ApplicationsLib::TestDefinition> getTestDefinition();
- std::optional<ApplicationsLib::TestDefinition> getTestDefinition()
- {
- return test_definition;
- }
-
- ~Simulation()
- {
-#ifdef USE_INSITU
- if (isInsituConfigured)
- {
- InSituLib::Finalize();
- }
-#endif
-#if defined(USE_PETSC)
- controller->Finalize(1);
-#endif
- }
+ ~Simulation();
private:
ApplicationsLib::LinearSolverLibrarySetup linear_solver_library_setup;