Fix a bug for SpecifiedTimes time-step alignment (#3634)

* Fix a bug for SpecifiedTimes time-step alignment

* Add a simple test for aligning the time-step with SpecifiedTimes

* Approx not exact

* Resolve Manifest

* Update CUDA

Author: glwagner

Manifest.toml

@@ -1,8 +1,8 @@
 # This file is machine-generated - editing it directly is not advised
 
-julia_version = "1.10.3"
+julia_version = "1.10.0"
 manifest_format = "2.0"
-project_hash = "04d395caf937b0921325a77873167e8baa293a99"
+project_hash = "8d5da80dd05814164ee23c791edd5549b032a426"
 
 [[deps.AbstractFFTs]]
 deps = ["LinearAlgebra"]
@@ -103,9 +103,9 @@ version = "0.1.3"
 
 [[deps.CUDA]]
 deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics"]
-git-tree-sha1 = "abc3c845165c2d5c03ab61754a90c7f7cff0f6a4"
+git-tree-sha1 = "6e945e876652f2003e6ca74e19a3c45017d3e9f6"
 uuid = "052768ef-5323-5732-b1bb-66c8b64840ba"
-version = "5.4.1"
+version = "5.4.2"
 
     [deps.CUDA.extensions]
     ChainRulesCoreExt = "ChainRulesCore"
@@ -166,7 +166,7 @@ weakdeps = ["Dates", "LinearAlgebra"]
 [[deps.CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
-version = "1.1.1+0"
+version = "1.0.5+1"
 
 [[deps.ConstructionBase]]
 deps = ["LinearAlgebra"]
@@ -421,9 +421,9 @@ version = "0.2.1+0"
 
 [[deps.KernelAbstractions]]
 deps = ["Adapt", "Atomix", "InteractiveUtils", "LinearAlgebra", "MacroTools", "PrecompileTools", "Requires", "SparseArrays", "StaticArrays", "UUIDs", "UnsafeAtomics", "UnsafeAtomicsLLVM"]
-git-tree-sha1 = "db02395e4c374030c53dc28f3c1d33dec35f7272"
+git-tree-sha1 = "d0448cebd5919e06ca5edc7a264631790de810ec"
 uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
-version = "0.9.19"
+version = "0.9.22"
 
     [deps.KernelAbstractions.extensions]
     EnzymeExt = "EnzymeCore"
@@ -650,7 +650,7 @@ weakdeps = ["Adapt"]
 [[deps.OpenBLAS_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
 uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
-version = "0.3.23+4"
+version = "0.3.23+2"
 
 [[deps.OpenLibm_jll]]
 deps = ["Artifacts", "Libdl"]

src/Utils/schedules.jl

@@ -187,7 +187,10 @@ end
 
 initialize!(st::SpecifiedTimes, model) = st(model)
 
-align_time_step(schedule::SpecifiedTimes, clock, Δt) = min(Δt, next_actuation_time(schedule) - clock.time)
+function schedule_aligned_time_step(schedule::SpecifiedTimes, clock, Δt)
+    δt = next_actuation_time(schedule) - clock.time
+    return min(Δt, δt)
+end
 
 function specified_times_str(st)
     str_elems = ["$(prettytime(t)), " for t in st.times]
@@ -272,8 +275,9 @@ function (as::OrSchedule)(model)
     return any(actuations)
 end
 
-align_time_step(any_or_all_schedule::Union{OrSchedule, AndSchedule}, clock, Δt) =
-    minimum(align_time_step(clock, Δt, schedule) for schedule in any_or_all_schedule.schedules)
+schedule_aligned_time_step(any_or_all_schedule::Union{OrSchedule, AndSchedule}, clock, Δt) =
+    minimum(schedule_aligned_time_step(schedule, clock, Δt)
+            for schedule in any_or_all_schedule.schedules)
 
 #####
 ##### Show methods

test/test_schedules.jl

@@ -1,6 +1,7 @@
 include("dependencies_for_runtests.jl")
 
 using Oceananigans.Utils: TimeInterval, IterationInterval, WallTimeInterval, SpecifiedTimes
+using Oceananigans.Utils: schedule_aligned_time_step
 using Oceananigans.TimeSteppers: Clock
 using Oceananigans: initialize!
 
@@ -74,4 +75,9 @@ using Oceananigans: initialize!
     # Specified times includes iteration 0
     st = SpecifiedTimes(0, 2, 4)
     @test initialize!(st, fake_model_at_iter_0)
+
+    fake_clock = (; time=2.1) 
+    st = SpecifiedTimes(2.5)
+    @test 0.4 ≈ schedule_aligned_time_step(st, fake_clock, Inf)
 end
+