(0.95.3) Reset model clock and skip time_step!ing if next actuation time is tiny

src/Simulations/run.jl

@@ -7,7 +7,7 @@ using Oceananigans: AbstractModel, run_diagnostic!, write_output!
 import Oceananigans: initialize!
 import Oceananigans.OutputWriters: checkpoint_path, set!
 import Oceananigans.TimeSteppers: time_step!
-import Oceananigans.Utils: aligned_time_step
+import Oceananigans.Utils: aligned_time_step, next_actuation_time
 
 # Simulations are for running
 
@@ -21,6 +21,15 @@ function collect_scheduled_activities(sim)
     return tuple(writers..., callbacks...)
 end
 
+function next_actuation_time(sim::Simulation)
+    activities = collect_scheduled_activities(sim)
+    nearest_next_actuation_time = Inf
+    for activity in activities
+        nearest_next_actuation_time = min(nearest_next_actuation_time, next_actuation_time(activity.schedule))
+    end
+    return nearest_next_actuation_time
+end
+
 function schedule_aligned_Δt(sim, aligned_Δt)
     clock = sim.model.clock
     activities = collect_scheduled_activities(sim)
@@ -131,7 +140,12 @@ function time_step!(sim::Simulation)
 
     else # business as usual...
         Δt = aligned_time_step(sim, sim.Δt)
-        time_step!(sim.model, Δt, callbacks=model_callbacks)
+        if Δt > (sim.Δt / 1e10)
+            time_step!(sim.model, Δt, callbacks=model_callbacks)
+        else
+            println("Skipping aligned time step, which is of ", Δt)
+            sim.model.clock.time = next_actuation_time(sim)
+        end
     end
 
     # Callbacks and callback-like things

src/Utils/schedules.jl

@@ -61,9 +61,10 @@ function (schedule::TimeInterval)(model)
     end
 end
 
+next_actuation_time(schedule::TimeInterval) = schedule.previous_actuation_time + schedule.interval
+
 function aligned_time_step(schedule::TimeInterval, clock, Δt)
-    next_actuation_time = schedule.previous_actuation_time + schedule.interval
-    return min(Δt, next_actuation_time - clock.time)
+    return min(Δt, next_actuation_time(schedule::TimeInterval) - clock.time)
 end
 
 #####
@@ -90,6 +91,8 @@ IterationInterval(interval; offset=0) = IterationInterval(interval, offset)
 
 (schedule::IterationInterval)(model) = (model.clock.iteration - schedule.offset) % schedule.interval == 0
 
+next_actuation_time(schedule::IterationInterval) = Inf
+
 #####
 ##### WallTimeInterval
 #####