Fix ETA off-by-one, wall_time_avg restart bug, declaration ordering

Author: sbryngelson

src/post_process/m_start_up.fpp

@@ -152,7 +152,7 @@ contains
                     & int(ceiling(100._wp*(real(t_step - n_start)/(n_save)))), t_step, n_save, wall_time_avg, wall_time, eta_hh, &
                     & eta_mm, eta_ss
             else
-                eta_sec = wall_time_avg*real((t_step_stop - t_step)/t_step_save + 1, wp)
+                eta_sec = wall_time_avg*real((t_step_stop - t_step)/t_step_save, wp)
                 eta_hh = int(eta_sec)/3600
                 eta_mm = mod(int(eta_sec), 3600)/60
                 eta_ss = mod(int(eta_sec), 60)

src/simulation/m_start_up.fpp

@@ -609,10 +609,10 @@ contains
     !> Advance the simulation by one time step, handling CFL-based dt and time-stepper dispatch
     impure subroutine s_perform_time_step(t_step, time_avg)
 
-        integer                 :: i, eta_hh, eta_mm, eta_ss
-        real(wp)                :: eta_sec
         integer, intent(inout)  :: t_step
         real(wp), intent(inout) :: time_avg
+        integer                 :: i, eta_hh, eta_mm, eta_ss
+        real(wp)                :: eta_sec
 
         if (cfl_dt) then
             if (cfl_const_dt .and. t_step == 0) call s_compute_dt()

src/simulation/m_time_steppers.fpp

@@ -588,8 +588,8 @@ contains
         wall_time = abs(finish - start)
 
         if (cfl_dt) then
-            if (t_step >= 2) then
-                wall_time_avg = (wall_time + (t_step - 2)*wall_time_avg)/(t_step - 1)
+            if (t_step - t_step_start >= 2) then
+                wall_time_avg = (wall_time + (t_step - t_step_start - 2)*wall_time_avg)/(t_step - t_step_start - 1)
             else
                 wall_time_avg = 0._wp
             end if