Merge pull request #25 from precice/fix-i24

Forbid solver-steered exit when preCICE is active, close #24
precice · Apr 13, 2021 · 08289b6 · 08289b6
2 parents 951159f + 38dde22
commit 08289b6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/replacement_files/driver_structure.cpp b/replacement_files/driver_structure.cpp
@@ -3400,7 +3400,7 @@ void CDriver::StartSolver() {
     cout << endl << "------------------------------ Begin Solver -----------------------------" << endl;
 
   // preCICE
-  while ((ExtIter < config_container[ZONE_0]->GetnExtIter() && precice_usage && precice->isCouplingOngoing()) ||
+  while ((precice_usage && precice->isCouplingOngoing()) ||
          (ExtIter < config_container[ZONE_0]->GetnExtIter() && !precice_usage)) {
     // preCICE implicit coupling: saveOldState()
     if (precice_usage && precice->isActionRequired(precice->getCowic())) {
@@ -3464,8 +3464,8 @@ void CDriver::StartSolver() {
     Output(ExtIter, suppress_output_by_preCICE);
 
     /*--- If the convergence criteria has been met, terminate the simulation. ---*/
-
-    if (StopCalc) break;
+    
+    if (!precice_usage && StopCalc) break;
 
     ExtIter++;
   }