From 1280a9dab180e11e6c19f8f019abab0825f1670f Mon Sep 17 00:00:00 2001 From: "Gregory L. Wagner" Date: Thu, 24 Oct 2024 23:01:35 -0600 Subject: [PATCH] Fix bug with TracerAdvection and bump Oceananigans compat (#196) * Fix bug with TracerAdvection and bump Oceananigans compat; * Up compat for ClimaSeaIce * Alignment --- Project.toml | 6 +++--- src/OceanSimulations/OceanSimulations.jl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Project.toml b/Project.toml index ad67ba6b..96219a19 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "ClimaOcean" uuid = "0376089a-ecfe-4b0e-a64f-9c555d74d754" license = "MIT" authors = ["Climate Modeling Alliance and contributors"] -version = "0.2.1" +version = "0.2.2" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" @@ -31,7 +31,7 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" Adapt = "4" CFTime = "0.1" CUDA = "4, 5" -ClimaSeaIce = "0.1.2, 0.2" +ClimaSeaIce = "0.1.3" CubicSplines = "0.2" DataDeps = "0.7" Downloads = "1.6" @@ -39,7 +39,7 @@ ImageMorphology = "0.4" JLD2 = "0.4" KernelAbstractions = "0.9" NCDatasets = "0.12, 0.13, 0.14" -Oceananigans = "0.91.11, 0.92" +Oceananigans = "0.92" OrthogonalSphericalShellGrids = "0.1.2" Scratch = "1" SeawaterPolynomials = "0.3.4" diff --git a/src/OceanSimulations/OceanSimulations.jl b/src/OceanSimulations/OceanSimulations.jl index 1c0db238..dc04c53b 100644 --- a/src/OceanSimulations/OceanSimulations.jl +++ b/src/OceanSimulations/OceanSimulations.jl @@ -4,7 +4,7 @@ export ocean_simulation using Oceananigans using Oceananigans.Units -using Oceananigans.Advection: TracerAdvection +using Oceananigans.Advection: FluxFormAdvection using Oceananigans.Coriolis: ActiveCellEnstrophyConserving using Oceananigans.ImmersedBoundaries: immersed_peripheral_node, inactive_node @@ -32,9 +32,9 @@ default_momentum_advection() = VectorInvariant(; vorticity_scheme = WENO(; order vertical_scheme = Centered(), divergence_scheme = WENO()) -default_tracer_advection() = TracerAdvection(WENO(; order = 7), - WENO(; order = 7), - Centered()) +default_tracer_advection() = FluxFormAdvection(WENO(; order = 7), + WENO(; order = 7), + Centered()) @inline ϕ²(i, j, k, grid, ϕ) = @inbounds ϕ[i, j, k]^2 @inline spᶠᶜᶜ(i, j, k, grid, Φ) = @inbounds sqrt(Φ.u[i, j, k]^2 + ℑxyᶠᶜᵃ(i, j, k, grid, ϕ², Φ.v))