Skip to content

Commit

Permalink
Fix bug with TracerAdvection and bump Oceananigans compat (#196)
Browse files Browse the repository at this point in the history 
* Fix bug with TracerAdvection and bump Oceananigans compat;

* Up compat for ClimaSeaIce

* Alignment
  • Loading branch information
@glwagner
glwagner authored Oct 25, 2024
1 parent d56812f commit 1280a9d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -31,15 +31,15 @@ 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"
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"
Expand Down
8 changes: 4 additions & 4 deletions src/OceanSimulations/OceanSimulations.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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))
Expand Down

2 comments on commit 1280a9d

@glwagner
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/118033

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.2.2 -m "<description of version>" 1280a9dab180e11e6c19f8f019abab0825f1670f
git push origin v0.2.2

Please sign in to comment.