Skip to content

Commit

Permalink
Merge branch 'main' into ss/new-zstar
Browse files Browse the repository at this point in the history
  • Loading branch information
simone-silvestri authored Jan 11, 2025
2 parents 309c68b + e02564d commit 1e179ef
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
env:
JULIA_VERSION: "1.10.6"
JULIA_MINOR_VERSION: "1.10"
SVERDRUP_HOME: "/data5/glwagner"
SVERDRUP_HOME: "/home/users/glwagner"
TARTARUS_HOME: "/storage5/buildkite-agent"
JULIA_PKG_SERVER_REGISTRY_PREFERENCE: eager
JULIA_NUM_PRECOMPILE_TASKS: 8
Expand Down
6 changes: 4 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Oceananigans"
uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
authors = ["Climate Modeling Alliance and contributors"]
version = "0.95.5"
version = "0.95.6"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand All @@ -12,6 +12,7 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
IncompleteLU = "40713840-3770-5561-ab4c-a76e7d0d7895"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
Expand Down Expand Up @@ -44,7 +45,7 @@ OceananigansMakieExt = ["MakieCore", "Makie"]

[compat]
Adapt = "4.1.1"
CUDA = "4.1.1, 5"
CUDA = "5"
Crayons = "4"
CubedSphere = "0.2, 0.3"
Dates = "1.9"
Expand All @@ -53,6 +54,7 @@ DocStringExtensions = "0.8, 0.9"
Enzyme = "0.13.14"
FFTW = "1"
Glob = "1.3"
GPUArrays = "10.3"
IncompleteLU = "0.2"
InteractiveUtils = "1.9"
IterativeSolvers = "0.9"
Expand Down

0 comments on commit 1e179ef

Please sign in to comment.