Merge branch 'BenchmarkMohrCoulombAbboSloanNew' into 'master'

Adjust preconditioner in PETSc benchmark MohrCoulombAbboSloan

See merge request ogs/ogs!5402

Author: Dmitri Naumov

ProcessLib/TimeLoop.cpp

@@ -531,6 +531,7 @@ bool TimeLoop::executeTimeStep()
 bool TimeLoop::calculateNextTimeStep()
 {
     const double prev_dt = _dt();
+    // keep a copy of _current_time to check if a new point in time is computed
     auto const current_time = _current_time;
 
     const std::size_t timesteps = _accepted_steps + 1;
@@ -548,11 +549,17 @@ bool TimeLoop::calculateNextTimeStep()
         outputSolutions(timesteps, current_time(), &Output::doOutput);
     }
 
+    // check if the newly computed time point (=_current_time + _dt()) differs
+    // from the previously computed time point (current_time) saved at the
+    // beginning of the method
     if (current_time == (_current_time + _dt()))
     {
-        ERR("Time step size of {} is too small.\n"
-            "Time stepping stops at step {:d} and at time of {}.",
-            _dt, timesteps, _current_time);
+        DBUG("current time == previous time + dt : {:a} == {:a} + {:a} = {:a}",
+             current_time(), _current_time(), _dt(), _current_time() + _dt());
+        ERR("The time increment {} results in exactly the same time {} as the "
+            "last rejected time step.\n"
+            "Time stepping stops at time step {:d} and time {}.",
+            _dt, current_time, timesteps, _current_time);
         return false;
     }
 

Tests/Data/Mechanics/MohrCoulombAbboSloan/PetscMpi/slope_hexa.prj

@@ -282,7 +282,7 @@
             </eigen>
             <petsc>
                 <prefix>gw</prefix>
-                <parameters>-gw_ksp_type bcgs -gw_pc_type jacobi -gw_ksp_rtol 1.e-16 -gw_ksp_max_it 10000</parameters>
+                <parameters>-gw_ksp_type bcgs -gw_pc_type sor -gw_ksp_rtol 1.e-16 -gw_ksp_max_it 10000</parameters>
             </petsc>
         </linear_solver>
     </linear_solvers>

Tests/Data/Mechanics/MohrCoulombAbboSloan/PetscMpi/slope_t_5_000000.pvtu

@@ -2,8 +2,8 @@
 <VTKFile type="PUnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64" compressor="vtkZLibDataCompressor">
   <PUnstructuredGrid GhostLevel="1">
     <FieldData>
-      <DataArray type="Int8" Name="OGS_VERSION" NumberOfTuples="18" format="binary" RangeMin="45" RangeMax="103">
-        AQAAAAAAAAAAgAAAAAAAABIAAAAAAAAAGgAAAAAAAAA=eF4z0zPVM9Y1MtNNT0xMTU0xSkwBACleBQs=
+      <DataArray type="Int8" Name="OGS_VERSION" NumberOfTuples="19" format="binary" RangeMin="45" RangeMax="103">
+        AQAAAAAAAAAAgAAAAAAAABMAAAAAAAAAGwAAAAAAAAA=eF4z0zPVM9U1MjXXTTcxTzU0MDFLAgAoqQRZ
       </DataArray>
     </FieldData>
     <PPointData>