Added possibility to continue simulation, this can be useful for issue #1

ikorotkin · ikorotkin · commit a042bb87f0ec · 2019-05-30T23:06:34.000+01:00
diff --git a/src/solver.cpp b/src/solver.cpp
@@ -44,15 +44,16 @@ void Solver::operator()(state_type &x)
     TimeIntegrator ti(m_rhs, m_jac, m_mass, m_opt, size);
 
     // Initial time
-    double t = 0.0;
+    double t = (m_t_last > 0) ? m_t_last : 0.0;
+    const double t0 = t;
 
     // Time step
     double dt[2];
-    dt[0] = m_opt.dt_init;
+    dt[0] = (m_dt_last > 0) ? m_dt_last : m_opt.dt_init;
     dt[1] = dt[0];
 
     // Initial output
-    if(m_opt.verbosity > 0)
+    if(m_opt.verbosity > 1)
     {
         std::cout << "Number of equations: " << size << std::endl;
         std::cout << "Float precision:     " << 8 * sizeof(float_type)
@@ -144,7 +145,7 @@ void Solver::operator()(state_type &x)
     bool final_time_step = false;
     int  step_counter    = 0;
 
-    while(t < (m_t1 + dt[0] * 0.5))
+    while(t < (t0 + m_t1 + dt[0] * 0.5))
     {
         step_counter++;
 
@@ -417,14 +418,14 @@ void Solver::operator()(state_type &x)
                 if(m_opt.verbosity > 0)
                     std::cout << '>';
             }
-        }
+        }  // SATS
 
         // Looks like the solver has reached the target time t1
-        if(t + dt[0] > m_t1)
+        if(t - t0 + dt[0] > m_t1)
         {
             final_time_step = true;
             // Adjust the last time step size
-            dt[0] = m_t1 - t;
+            dt[0] = m_t1 - (t - t0);
         }
 
         // Rewrite solution history
@@ -438,6 +439,9 @@ void Solver::operator()(state_type &x)
 
     }  // while t
 
+    m_t_last  = t;
+    m_dt_last = dt[1];
+
     if(m_opt.verbosity > 0)
         std::cout << "\nLinear algebra solver calls: " << calls << '\n';
 
diff --git a/src/solver.h b/src/solver.h
@@ -26,6 +26,9 @@ class Solver
 
     const double m_t1;
 
+    double m_dt_last = -1.0;  // Stores the last time step size
+    double m_t_last  = -1.0;  // Stores the final solution time
+
     void check_pardiso_error(MKL_INT err);
 
 public:
