Simulation solver: slight improvement to our simulation worker.

opencor · Jan 11, 2018 · 3dfb15a · 3dfb15a
1 parent 54954f7
commit 3dfb15a
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/plugins/support/SimulationSupport/src/simulationworker.cpp b/src/plugins/support/SimulationSupport/src/simulationworker.cpp
@@ -288,13 +288,17 @@ void SimulationWorker::started()
         QMutex pausedMutex;
 
         forever {
-            // Reinitialise our solver, if we have an NLA solver
+            // Reinitialise our solver, if we have an NLA solver or if the model
+            // got reset and we are not
             // Note: indeed, with a solver such as CVODE, to solve an NLA system
             //       requires updating its internals...
 
-            if (nlaSolver)
+            if (nlaSolver || mReset) {
                 odeSolver->reinitialize(mCurrentPoint);
 
+                mReset = false;
+            }
+
             // Determine our next point and compute our model up to it
 
             ++pointCounter;
@@ -355,14 +359,6 @@ void SimulationWorker::started()
 
                 timer.start();
             }
-
-            // Reinitialise our solver, if (really) needed
-
-            if (mReset && !mStopped) {
-                odeSolver->reinitialize(mCurrentPoint);
-
-                mReset = false;
-            }
         }
 
         // Retrieve the total elapsed time, should no error have occurred