Bugfix: time_step!(model, dt) (#410)

* Update time_step_ocean_sea_ice_model.jl

* Implement a simple test for callbacks

Author: glwagner

.buildkite/pipeline.yml

@@ -134,9 +134,9 @@ steps:
       slurm_gpus_per_task: 1
 
   - label: "Run simulation tests"
-    key: "test_simulations"
+    key: "test_ocean_sea_ice_model"
     env:
-      TEST_GROUP: "simulations"
+      TEST_GROUP: "ocean_sea_ice_model"
       GPU_TEST: "true"
     commands:
       - "julia --project -e 'using Pkg; Pkg.test()'"

src/OceanSeaIceModels/time_step_ocean_sea_ice_model.jl

@@ -10,7 +10,7 @@ using Oceananigans.Grids: φnode
 
 using Printf
 
-function time_step!(coupled_model::OceanSeaIceModel, Δt; callbacks=[], compute_tendencies=true, kw...)
+function time_step!(coupled_model::OceanSeaIceModel, Δt; callbacks=[], compute_tendencies=true)
     ocean = coupled_model.ocean
     sea_ice = coupled_model.sea_ice
     atmosphere = coupled_model.atmosphere
@@ -37,7 +37,7 @@ function time_step!(coupled_model::OceanSeaIceModel, Δt; callbacks=[], compute_
 
     # TODO after ice time-step:
     #  - Adjust ocean heat flux if the ice completely melts?
-    time_step!(ocean.model, Δt; kw...)
+    time_step!(ocean, Δt)
 
     # Time step the atmosphere
     time_step!(atmosphere, Δt)

src/OceanSimulations/ocean_simulation.jl

@@ -17,6 +17,8 @@ using Statistics: mean
 # Some defaults
 default_free_surface(grid) = SplitExplicitFreeSurface(grid; cfl=0.7)
 
+estimate_maximum_Δt(grid::RectilinearGrid) = 30minutes # ?
+
 function estimate_maximum_Δt(grid)
     arch = architecture(grid)
     Δx = mean(xspacings(grid))

test/runtests.jl

@@ -55,9 +55,8 @@ if test_group == :bathymetry || test_group == :all
     include("test_bathymetry.jl")
 end
 
-if test_group == :simulations || test_group == :all
-    CUDA.set_runtime_version!(v"12.2", local_toolkit = true) # Seems to help in finding the correct CUDA dataset
-    include("test_simulations.jl")
+if test_group == :ocean_sea_ice_model || test_group == :all
+    include("test_ocean_sea_ice_model.jl")
     include("test_diagnostics.jl")
 end
 

test/test_simulations.jl renamed to test/test_ocean_sea_ice_model.jl

@@ -11,6 +11,27 @@ using ClimaSeaIce.SeaIceThermodynamics: melting_temperature
 
     for arch in test_architectures
 
+        λ★, φ★ = 35.1, 50.1
+
+        grid = RectilinearGrid(arch, size = 200, x = λ★, y = φ★,
+                               z = (-400, 0), topology = (Flat, Flat, Bounded))
+
+        ocean = ocean_simulation(grid)
+        data = Int[]
+        pushdata(sim) = push!(data, iteration(sim))
+        add_callback!(ocean, pushdata)
+        backend = JRA55NetCDFBackend(4)
+        atmosphere = JRA55PrescribedAtmosphere(arch; backend)
+        radiation = Radiation(arch)
+        coupled_model = OceanSeaIceModel(ocean; atmosphere, radiation)
+        Δt = 60
+        for n = 1:3
+            time_step!(coupled_model, Δt)
+        end
+        @test data == [0, 1, 2, 3]
+
+        # TODO: do the same for a SeaIceSimulation, and eventually prognostic Atmos
+
         #####
         ##### Ocean and prescribed atmosphere
         #####
@@ -20,11 +41,10 @@ using ClimaSeaIce.SeaIceThermodynamics: melting_temperature
                             halo = (7, 7, 7),
                             z = (-6000, 0))
 
-        bottom_height = retrieve_bathymetry(grid; 
-                                            minimum_depth = 10,
-                                            dir = "./",
-                                            interpolation_passes = 20,
-                                            major_basins = 1)
+        bottom_height = regrid_bathymetry(grid; 
+                                          minimum_depth = 10,
+                                          interpolation_passes = 20,
+                                          major_basins = 1)
 
         grid = ImmersedBoundaryGrid(grid, GridFittedBottom(bottom_height); active_cells_map=true)