Skip to content

Allow Oceananigans v0.97 #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
giordano wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Allow Oceananigans v0.97 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
024d16a
Allow Oceananigans v0.97
giordano Aug 25, 2025
ecb3c02
Update also ClimaOcean
giordano Aug 26, 2025
5f76155
fix exponential coordinate
simone-silvestri Aug 26, 2025
e745054
from array to function
simone-silvestri Aug 26, 2025
a9b2fa6
more changes
simone-silvestri Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
[compat]
ArgParse = "1.2.0"
CUDA = "5.7.1"
ClimaOcean = "0.5.10"
ClimaOcean = "0.8.2"
Dates = "1"
HDF5_jll = "=1.14.3"
KernelAbstractions = "0.9.34"
MPI = "0.20.22"
Oceananigans = "=0.96.26"
Oceananigans = "0.97"
PrecompileTools = "1.2.1"
Printf = "1"
Profile = "1"
Expand Down
6 changes: 3 additions & 3 deletions simulations/ocean_climate_simulation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Nz = 20 # eventually we want to increase this to between 100-600
stop_time = 10days

# Grid setup
z_faces = exponential_z_faces(; Nz, depth=6000, h=30) # may need changing for very large Nz
z_faces = ExponentialCoordinate(Nz, -6000, 0) # may need changing for very large Nz
underlying_grid = TripolarGrid(arch; size=(Nx, Ny, Nz), halo=(7, 7, 7), z=z_faces)
bottom_height = regrid_bathymetry(underlying_grid) # adds Earth bathymetry from ETOPO1
grid = ImmersedBoundaryGrid(underlying_grid, GridFittedBottom(bottom_height))
Expand Down Expand Up @@ -84,8 +84,8 @@ atmosphere = JRA55PrescribedAtmosphere(arch; backend=JRA55NetCDFBackend(41))

# Coupled model and simulation
solver_stop_criteria = FixedIterations(5) # note: more iterations = more accurate
atmosphere_ocean_flux_formulation = SimilarityTheoryFluxes(; solver_stop_criteria)
interfaces = ComponentInterfaces(atmosphere, ocean; radiation, atmosphere_ocean_flux_formulation)
atmosphere_ocean_fluxes = SimilarityTheoryFluxes(; solver_stop_criteria)
interfaces = ComponentInterfaces(atmosphere, ocean; radiation, atmosphere_ocean_fluxes)
coupled_model = OceanSeaIceModel(ocean; atmosphere, radiation, interfaces)
simulation = Simulation(coupled_model; Δt, stop_time)

Expand Down
4 changes: 2 additions & 2 deletions src/data_free_ocean_climate_model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ function data_free_ocean_climate_model_init(

# Coupled model
solver_stop_criteria = FixedIterations(5) # note: more iterations = more accurate
atmosphere_ocean_flux_formulation = SimilarityTheoryFluxes(; solver_stop_criteria)
interfaces = ComponentInterfaces(atmosphere, ocean; radiation, atmosphere_ocean_flux_formulation)
atmosphere_ocean_fluxes = SimilarityTheoryFluxes(; solver_stop_criteria)
interfaces = ComponentInterfaces(atmosphere, ocean; radiation, atmosphere_ocean_fluxes)
coupled_model = @gbprofile "OceanSeaIceModel" OceanSeaIceModel(ocean; atmosphere, radiation, interfaces)

return coupled_model
Expand Down
6 changes: 3 additions & 3 deletions src/model_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function simple_latitude_longitude_grid(arch, resolution, Nz)
end

function simple_latitude_longitude_grid(arch, Nx, Ny, Nz; halo=(8, 8, 8))
z = exponential_z_faces(; Nz, depth=4000, h=30) # may need changing for very large Nz
z = ExponentialCoordinate(Nz, -4000, 0) # may need changing for very large Nz

grid = LatitudeLongitudeGrid(arch; size=(Nx, Ny, Nz), halo, z,
latitude = (-80, 80),
Expand Down Expand Up @@ -130,10 +130,10 @@ end

function gaussian_islands_tripolar_grid(arch::Architectures.AbstractArchitecture, Nx, Ny, Nz; halo=(8, 8, 8))
# Grid setup
z = exponential_z_faces(; Nz, depth=4000, h=30) # may need changing for very large Nz
z = ExponentialCoordinate(Nz, -4000, 0) # may need changing for very large Nz
underlying_grid = TripolarGrid(arch; size=(Nx, Ny, Nz), halo, z)

zb = z[1]
zb = z(1)
h = -zb + 100
gaussian_islands(λ, φ) = zb + h * (mtn₁(λ, φ) + mtn₂(λ, φ))

Expand Down
Loading