Merge branch 'HM_enabled_restart' into 'master'

Fixed the initial stress setting in HM

Closes #3105

See merge request ogs/ogs!3463

ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h

@@ -826,6 +826,15 @@ std::size_t HydroMechanicsLocalAssembler<
 
     if (name == "sigma_ip")
     {
+        if (_process_data.initial_stress != nullptr)
+        {
+            OGS_FATAL(
+                "Setting initial conditions for stress from integration "
+                "point data and from a parameter '{:s}' is not possible "
+                "simultaneously.",
+                _process_data.initial_stress->name);
+        }
+
         return setSigma(values);
     }
     if (name == "epsilon_ip")

ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp

@@ -50,7 +50,7 @@ HydroMechanicsProcess<DisplacementDim>::HydroMechanicsProcess(
         std::make_unique<IntegrationPointWriter>(
             "sigma_ip",
             static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
-            2 /*integration order*/, [this]() {
+            integration_order, [this]() {
                 // Result containing integration point data for each local
                 // assembler.
                 std::vector<std::vector<double>> result;
@@ -70,7 +70,7 @@ HydroMechanicsProcess<DisplacementDim>::HydroMechanicsProcess(
         std::make_unique<IntegrationPointWriter>(
             "epsilon_ip",
             static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
-            2 /*integration order*/, [this]() {
+            integration_order, [this]() {
                 // Result containing integration point data for each local
                 // assembler.
                 std::vector<std::vector<double>> result;