Caching inpainting data + some updates to the one degree simulation

Project.toml

@@ -38,9 +38,9 @@ Downloads = "1.6"
 ImageMorphology = "0.4"
 JLD2 = "0.4, 0.5"
 KernelAbstractions = "0.9"
+Oceananigans = "0.93.3 - 0.94"
+OrthogonalSphericalShellGrids = "0.1.7"
 NCDatasets = "0.12, 0.13, 0.14"
-Oceananigans = "0.93.1"
-OrthogonalSphericalShellGrids = "0.1.2"
 Scratch = "1"
 SeawaterPolynomials = "0.3.4"
 StaticArrays = "1"

docs/Project.toml

@@ -12,3 +12,4 @@ CairoMakie = "0.10.12, 0.11, 0.12"
 DataDeps = "0.7"
 Documenter = "1"
 Oceananigans = "0.93.1"
+OrthogonalSphericalShellGrids = "0.1.7"

experiments/one_degree_simulation/one_degree_simulation.jl

@@ -12,16 +12,15 @@ z = exponential_z_faces(Nz=30, depth=6000)
 Nx = 120
 Ny = 60
 Nz = length(z) - 1
-
-grid = TripolarGrid(arch; z, size = (Nx, Ny, Nz), north_poles_latitude=55, first_pole_longitude=70)
-
-@show grid
+grid = TripolarGrid(arch; z, size=(Nx, Ny, Nz))
 
 bottom_height = regrid_bathymetry(grid;
                                   minimum_depth = 10,
                                   interpolation_passes = 5,
                                   major_basins = 3)
 
+grid = ImmersedBoundaryGrid(grid, GridFittedBottom(bottom_height))
+
 # Closure
 gm = Oceananigans.TurbulenceClosures.IsopycnalSkewSymmetricDiffusivity(κ_skew=1000, κ_symmetric=1000)
 catke = Oceananigans.TurbulenceClosures.CATKEVerticalDiffusivity()
@@ -45,7 +44,7 @@ set!(restoring_mask_field, restoring_mask)
 Fu = Forcing(sponge_layer, field_dependencies=:u, parameters=restoring_rate)
 Fv = Forcing(sponge_layer, field_dependencies=:v, parameters=restoring_rate)
 
-dates = DateTimeProlepticGregorian(1993, 1, 1) : Month(1) : DateTimeProlepticGregorian(1994, 1, 1)
+dates = DateTimeProlepticGregorian(1993, 11, 1) : Month(1) : DateTimeProlepticGregorian(1994, 11, 1)
 temperature = ECCOMetadata(:temperature, dates, ECCO4Monthly())
 salinity = ECCOMetadata(:salinity, dates, ECCO4Monthly())
 
@@ -68,17 +67,20 @@ atmosphere = JRA55_prescribed_atmosphere(arch; backend=JRA55NetCDFBackend(41))
 sea_ice = ClimaOcean.OceanSeaIceModels.MinimumTemperatureSeaIce()
 coupled_model = OceanSeaIceModel(ocean, sea_ice; atmosphere, radiation)
 
-simulation = Simulation(coupled_model; Δt=1, stop_iteration=10)
+simulation = Simulation(coupled_model; Δt=15minutes, stop_time=2*365days)
 
 wall_time = Ref(time_ns())
 
 function progress(sim)
     ocean = sim.model.ocean
     u, v, w = ocean.model.velocities
     T = ocean.model.tracers.T
-    Tmax = maximum(T)
-    Tmin = minimum(T)
-    umax = maximum(abs, u), maximum(abs, v), maximum(abs, w)
+    Tmax = maximum(interior(T))
+    Tmin = minimum(interior(T))
+    umax = (maximum(abs, interior(u)),
+            maximum(abs, interior(v)),
+            maximum(abs, interior(w)))
+
     step_time = 1e-9 * (time_ns() - wall_time[])
 
     @info @sprintf("Time: %s, n: %d, Δt: %s, max|u|: (%.2e, %.2e, %.2e) m s⁻¹, extrema(T): (%.2f, %.2f) ᵒC, wall time: %s \n",
@@ -90,6 +92,6 @@ function progress(sim)
      return nothing
 end
 
-add_callback!(simulation, progress, IterationInterval(1))
+add_callback!(simulation, progress, IterationInterval(10))
 
 run!(simulation)

src/DataWrangling/JRA55.jl

@@ -27,6 +27,7 @@ import Oceananigans.OutputReaders: new_backend, update_field_time_series!
 using Downloads: download
 
 download_jra55_cache::String = ""
+
 function __init__()
     global download_jra55_cache = @get_scratch!("JRA55")
 end

src/OceanSimulations/OceanSimulations.jl

@@ -44,7 +44,8 @@ default_free_surface(grid) = SplitExplicitFreeSurface(grid; cfl=0.7)
 
 # 70 substeps is a safe rule of thumb for an ocean at 1/4 - 1/10th of a degree
 # TODO: pass the cfl and a given Δt to calculate the number of substeps?
-default_free_surface(grid::TripolarGrid) = SplitExplicitFreeSurface(grid; substeps = 70)
+const TripolarOfSomeKind = Union{TripolarGrid, ImmersedBoundaryGrid{<:Any, <:Any, <:Any, <:Any, <:TripolarGrid}}
+default_free_surface(grid::TripolarOfSomeKind) = SplitExplicitFreeSurface(grid; substeps=70)
 
 function default_ocean_closure()
     mixing_length = CATKEMixingLength(Cᵇ=0.01)