Merge branch 'master' into reconnection

This commit is contained in:
Grzegorz Kowal 2021-07-19 15:12:56 -03:00
commit c9358b1f91

View File

@ -640,8 +640,9 @@ module evolution
! round the time
!
if (dte <= 0.0d+00) dte = dtn
if (dtnext > 0.0d+00) dt = min(dtn, dte, dtnext)
if (error_control .and. dte > 0.0d+00) dtn = min(dtn, dte)
if (dtnext > 0.0d+00) dtn = min(dtn, dtnext)
dt = dtn
#ifdef PROFILE
! stop accounting time for new time step estimation