Adapt to Oceananigans v0.97.0 (#574)

simone-silvestri · navidcy · web-flow · commit 456c59c11c45 · 2025-07-23T11:55:43.000+10:00
* Update Project.toml

* Update near_global_ocean_simulation.jl

* Update one_degree_simulation.jl

* changes

* add CUDA

* bump patch release

* using CUDA + record from Makie not CUDA

* use Oceananigans#ss/fix-indexing-bug

* some changes

* Rename docs/interface_fluxes.md to docs/src/interface_fluxes.md

---------

Co-authored-by: Navid C. Constantinou &lt;navidcy@users.noreply.github.com&gt;
diff --git a/Project.toml b/Project.toml
@@ -55,7 +55,7 @@ JLD2 = "0.4, 0.5"
 KernelAbstractions = "0.9"
 MPI = "0.20"
 NCDatasets = "0.12, 0.13, 0.14"
-Oceananigans = "0.96"
+Oceananigans = "0.97.1"
 OffsetArrays = "1.14"
 PrecompileTools = "1"
 PythonCall = "0.9"
diff --git a/README.md b/README.md
@@ -44,6 +44,7 @@ To illustrate how `OceanSeaIceModel` works we set up a simulation on a grid with
 using Oceananigans
 using Oceananigans.Units
 using Dates
+using CUDA
 import ClimaOcean
 
 arch = GPU()
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -1,7 +1,7 @@
 [deps]
 CFTime = "179af706-886a-5703-950a-314cd64e0468"
+CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
-ClimaOcean = "0376089a-ecfe-4b0e-a64f-9c555d74d754"
 DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244"
@@ -10,9 +10,7 @@ Oceananigans = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
 SeawaterPolynomials = "d496a93d-167e-4197-9f49-d3af4ff8fe40"
 
 [compat]
-CairoMakie = "0.10.12, 0.11, 0.12, 0.13"
-DataDeps = "0.7"
+CUDA = "5"
 Documenter = "1"
 DocumenterCitations = "1.3"
-Oceananigans = "0.96 - 0.99"
-SeawaterPolynomials = "0.3.5"
+Literate = "2.2"
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -38,6 +38,7 @@ The following script implements a near-global ocean simulation initialized from
 using Oceananigans
 using Oceananigans.Units
 using Dates
+using CUDA
 import ClimaOcean
 
 arch = GPU()
diff --git a/docs/src/interface_fluxes.md b/docs/src/interface_fluxes.md
diff --git a/examples/ecco_mixed_layer_depth.jl b/examples/ecco_mixed_layer_depth.jl
@@ -71,7 +71,7 @@ fig
 
 # And record a movie
 
-record(fig, "ecco_mld.mp4", 1:Nt-1, framerate=4) do nn
+CairoMakie.record(fig, "ecco_mld.mp4", 1:Nt-1, framerate=4) do nn
     @info "Drawing frame $nn of $Nt..."
     n[] = nn
 end
diff --git a/examples/inspect_JRA55_data.jl b/examples/inspect_JRA55_data.jl
@@ -72,7 +72,7 @@ snapshot_interval = 3hours  # JRE55 time-resolution
 rotation_period = 60days
 rotation_rate = 2π / rotation_period
 
-record(fig, "JRA55_data.mp4", 1:Nt, framerate=16) do nn
+CairoMakie.record(fig, "JRA55_data.mp4", 1:Nt, framerate=16) do nn
     @info nn/Nt
 
     n[] = nn
diff --git a/examples/mediterranean_simulation_with_ecco_restoring.jl b/examples/mediterranean_simulation_with_ecco_restoring.jl
@@ -17,12 +17,12 @@
 
 using CairoMakie
 using Oceananigans
-using Oceananigans: architecture
+using Oceananigans.Units
 using ClimaOcean
 using ClimaOcean.ECCO
-using Oceananigans.Units
 using Printf
 using Dates
+using CUDA
 
 # ## Grid Configuration for the Mediterranean Sea
 #
diff --git a/examples/near_global_ocean_simulation.jl b/examples/near_global_ocean_simulation.jl
@@ -9,7 +9,8 @@
 # ## Initial setup with package imports
 #
 # We begin by importing the necessary Julia packages for visualization (CairoMakie),
-# ocean modeling (Oceananigans, ClimaOcean), and handling dates and times (CFTime, Dates).
+# ocean modeling (Oceananigans, ClimaOcean), handling dates and times (CFTime, Dates),
+# and CUDA for running on CUDA-enabled GPUs.
 # These packages provide the foundational tools for setting up the simulation environment,
 # including grid setup, physical processes modeling, and data visualization.
 
@@ -20,6 +21,7 @@ using CairoMakie
 using CFTime
 using Dates
 using Printf
+using CUDA
 
 # ### Grid configuration
 #
@@ -250,7 +252,7 @@ nothing #hide
 
 # And now we make a movie:
 
-record(fig, "near_global_ocean_surface.mp4", 1:Nt, framerate = 8) do nn
+CairoMakie.record(fig, "near_global_ocean_surface.mp4", 1:Nt, framerate = 8) do nn
     n[] = nn
 end
 nothing #hide
diff --git a/examples/one_degree_simulation.jl b/examples/one_degree_simulation.jl
@@ -6,7 +6,7 @@
 # and initialized by temperature, salinity, sea ice concentration, and sea ice thickness
 # from the ECCO state estimate.
 #
-# For this example, we need Oceananigans, ClimaOcean, Dates, and
+# For this example, we need Oceananigans, ClimaOcean, Dates, CUDA, and
 # CairoMakie to visualize the simulation.
 
 using ClimaOcean
@@ -15,6 +15,7 @@ using Oceananigans.Units
 using Dates
 using Printf
 using Statistics
+using CUDA
 
 # ### Grid and Bathymetry
 
@@ -292,7 +293,7 @@ nothing #hide
 
 # And now a movie:
 
-record(fig, "one_degree_global_ocean_surface.mp4", 1:Nt, framerate = 8) do nn
+CairoMakie.record(fig, "one_degree_global_ocean_surface.mp4", 1:Nt, framerate = 8) do nn
     n[] = nn
 end
 nothing #hide
diff --git a/examples/single_column_os_papa_simulation.jl b/examples/single_column_os_papa_simulation.jl
@@ -322,7 +322,7 @@ Smax = maximum(interior(S))
 Smin = minimum(interior(S))
 xlims!(axSz, Smin - 0.2, Smax + 0.2)
 
-record(fig, "single_column_profiles.mp4", 1:Nt, framerate=24) do nn
+CairoMakie.record(fig, "single_column_profiles.mp4", 1:Nt, framerate=24) do nn
     @info "Drawing frame $nn of $Nt..."
     n[] = nn
 end
diff --git a/experiments/arctic_simulation.jl b/experiments/arctic_simulation.jl
@@ -11,7 +11,6 @@ using ClimaSeaIce.SeaIceThermodynamics: IceWaterThermalEquilibrium
 using Printf
 
 using CUDA
-CUDA.device!(1)
 arch = GPU()
 
 depth = 2000meters
diff --git a/experiments/one_degree_calibration/distributed_perfect_one_degree_model_calibration.jl b/experiments/one_degree_calibration/distributed_perfect_one_degree_model_calibration.jl
@@ -1,5 +1,4 @@
 using Oceananigans
-using Oceananigans.Architectures: arch_array
 using Oceananigans.Units
 using Oceananigans.Utils: WallTimeInterval
 using Oceananigans.BuoyancyFormulations: buoyancy
diff --git a/experiments/one_degree_calibration/gm_one_degree_model_calibration.jl b/experiments/one_degree_calibration/gm_one_degree_model_calibration.jl
@@ -1,5 +1,4 @@
 using Oceananigans
-using Oceananigans.Architectures: arch_array
 using Oceananigans.Units
 using Oceananigans.Grids: on_architecture
 using Oceananigans.Utils: WallTimeInterval
diff --git a/experiments/one_degree_calibration/inspect_one_degree_near_global_simulation.jl b/experiments/one_degree_calibration/inspect_one_degree_near_global_simulation.jl
@@ -126,7 +126,6 @@ Colorbar(fig[4, 4], hm_N2; vertical=true, tellheight=false, flipaxis=true, label
 
 display(fig)
 
-record(fig, "one_degree_near_global_simulation_$(closure_name).mp4", 1:Nt, framerate=24) do nn
+CairoMakie.record(fig, "one_degree_near_global_simulation_$(closure_name).mp4", 1:Nt, framerate=24) do nn
     n[] = nn
 end
-
diff --git a/experiments/one_degree_calibration/perfect_one_degree_model_calibration.jl b/experiments/one_degree_calibration/perfect_one_degree_model_calibration.jl
@@ -1,5 +1,4 @@
 using Oceananigans
-using Oceananigans.Architectures: arch_array
 using Oceananigans.Units
 using Oceananigans.Utils: WallTimeInterval
 using Oceananigans.BuoyancyFormulations: buoyancy
diff --git a/src/DataWrangling/JRA55/JRA55.jl b/src/DataWrangling/JRA55/JRA55.jl
@@ -5,7 +5,6 @@ export JRA55FieldTimeSeries, JRA55PrescribedAtmosphere, RepeatYearJRA55, MultiYe
 using Oceananigans
 using Oceananigans.Units
 
-using Oceananigans.Architectures: arch_array
 using Oceananigans.DistributedComputations
 using Oceananigans.DistributedComputations: child_architecture
 using Oceananigans.BoundaryConditions: fill_halo_regions!
