[App/Python] Use mesh module in simulator module

Applications/ApplicationsLib/Simulation.cpp

@@ -21,6 +21,7 @@
 #include "BaseLib/ConfigTreeUtil.h"
 #include "BaseLib/FileTools.h"
 #include "BaseLib/PrjProcessing.h"
+#include "MeshLib/Mesh.h"
 #include "NumLib/NumericsConfig.h"
 #include "ProcessLib/TimeLoop.h"
 
@@ -128,11 +129,21 @@ bool Simulation::executeTimeStep()
     auto& time_loop = project_data->getTimeLoop();
     if (time_loop.currentTime() < time_loop.endTime())
     {
-        return time_loop.executeTimeStep();
+        auto const result = time_loop.executeTimeStep();
+        if (time_loop.calculateNextTimeStep())
+        {
+            time_loop.outputLastTimeStep();
+        }
+        return result;
     }
     return false;
 }
 
+MeshLib::Mesh* Simulation::getMesh(std::string const& name)
+{
+    return project_data->getMesh(name);
+}
+
 bool Simulation::executeSimulation()
 {
     INFO("Solve processes.");

Applications/ApplicationsLib/Simulation.h

@@ -21,6 +21,10 @@
 #include "BaseLib/ExportSymbol.h"
 
 class ProjectData;
+namespace MeshLib
+{
+class Mesh;
+}
 
 class Simulation final
 {
@@ -39,6 +43,7 @@ public:
     OGS_EXPORT_SYMBOL bool executeTimeStep();
     OGS_EXPORT_SYMBOL bool executeSimulation();
     OGS_EXPORT_SYMBOL void outputLastTimeStep() const;
+    OGS_EXPORT_SYMBOL MeshLib::Mesh* getMesh(std::string const& name);
 
     OGS_EXPORT_SYMBOL std::optional<ApplicationsLib::TestDefinition>
     getTestDefinition() const;

Applications/Python/ogs.simulator/CMakeLists.txt

@@ -15,7 +15,7 @@ endif()
 target_link_libraries(
     simulator PRIVATE ApplicationsLib BaseLib CMakeInfoLib GitInfoLib tclap
 )
-target_include_directories(simulator PRIVATE ../../CLI)
+target_include_directories(simulator PRIVATE ../../CLI ../ogs.mesh)
 
 # Install into Python module root dir (enables 'import ogs.simulator')
 install(TARGETS simulator LIBRARY DESTINATION ogs)

Applications/Python/ogs.simulator/ogs_python_module.cpp

@@ -15,6 +15,7 @@
 #include <spdlog/spdlog.h>
 #include <tclap/CmdLine.h>
 
+#include "../ogs.mesh/OGSMesh.h"
 #include "Applications/ApplicationsLib/Simulation.h"
 #include "Applications/ApplicationsLib/TestDefinition.h"
 #include "BaseLib/DateTools.h"
@@ -139,6 +140,22 @@ int executeSimulation()
     return ogs_status;
 }
 
+int executeTimeStep()
+{
+    auto ogs_status = EXIT_SUCCESS;
+    try
+    {
+        bool solver_succeeded = simulation->executeTimeStep();
+        ogs_status = solver_succeeded ? EXIT_SUCCESS : EXIT_FAILURE;
+    }
+    catch (std::exception& e)
+    {
+        ERR("{}", e.what());
+        ogs_status = EXIT_FAILURE;
+    }
+    return ogs_status;
+}
+
 double currentTime()
 {
     return simulation->currentTime();
@@ -149,6 +166,11 @@ double endTime()
     return simulation->endTime();
 }
 
+OGSMesh getMesh(std::string const& name)
+{
+    return OGSMesh(simulation->getMesh(name));
+}
+
 void finalize()
 {
     simulation.reset(nullptr);
@@ -169,5 +191,7 @@ PYBIND11_MODULE(simulator, m)
     m.def("currentTime", &currentTime, "get current OGS time");
     m.def("endTime", &endTime, "get end OGS time");
     m.def("executeSimulation", &executeSimulation, "execute OGS simulation");
+    m.def("executeTimeStep", &executeTimeStep, "execute OGS time step");
+    m.def("getMesh", &getMesh, "get unstructured grid from ogs");
     m.def("finalize", &finalize, "finalize OGS simulation");
 }