make the timestepping 3D

CliMA · Jul 12, 2024 · 82638fc · 82638fc
1 parent 51ded28
commit 82638fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/sea_ice_model.jl b/src/sea_ice_model.jl
@@ -2,7 +2,7 @@ using Oceananigans.Fields: TracerFields
 using ClimaSeaIce.SeaIceThermodynamics: external_top_heat_flux
 using Oceananigans: tupleit
 
-struct SeaIceModel{GR, CL, TS, U, T, IT, IC, TD, D, STF, SMS, A} <: AbstractModel{TS}
+struct SeaIceModel{GR, TD, D, CL, TS, U, T, IT, IC, STF, SMS, A} <: AbstractModel{TS}
     grid :: GR
     clock :: CL
     timestepper :: TS

diff --git a/src/time_stepping.jl b/src/time_stepping.jl
@@ -41,10 +41,10 @@ end
                                     h_forcing,
                                     model_fields)
 
-    i, j = @index(Global, NTuple)
+    i, j, k = @index(Global, NTuple)
     h  = ice_thickness
 
-    Gh = ice_thickness_tendency(i, j, 1, grid, clock,
+    Gh = ice_thickness_tendency(i, j, k, grid, clock,
                                 velocities,
                                 advection,
                                 ice_thickness,
@@ -58,8 +58,8 @@ end
     # Update ice thickness, clipping negative values
 
     @inbounds begin
-        h⁺ = h[i, j, 1] + Δt * Gh
-        h[i, j, 1] = max(zero(grid), h⁺)
+        h⁺ = h[i, j, k] + Δt * Gh
+        h[i, j, k] = max(zero(grid), h⁺)
         # Belongs in update state?
         # That's certainly a simple model for ice concentration
         # consolidated_ice = h[i, j, 1] >= hᶜ[i, j, 1]