Skip to content

Commit 9c2becd

Browse files
juliasloan25juliasloan25
authored
Merge pull request #1441 from CliMA/ncc/fix-scalar-indexing-oceananigans-fieldtimeseries
Fix scalar indexing in Oceananigans.OutputReaders.FieldTimeSeries
2 parents 819fdbe + 2c6fb80 commit 9c2becd

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

‎experiments/ClimaEarth/Manifest-v1.11.toml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.11.5"
3+
julia_version = "1.11.6"
44
manifest_format = "2.0"
5-
project_hash = "6705e95e3707a2bb064c5bebf76d1e2134381fed"
5+
project_hash = "1737641f619518fb72348b12c54a63c19419f893"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "be7ae030256b8ef14a441726c4c37766b90b93a3"
@@ -476,9 +476,9 @@ version = "0.17.1"
476476

477477
[[deps.ClimaOcean]]
478478
deps = ["Adapt", "CFTime", "CUDA", "ClimaSeaIce", "CubicSplines", "DataDeps", "Dates", "DocStringExtensions", "Downloads", "ImageMorphology", "JLD2", "KernelAbstractions", "MPI", "NCDatasets", "Oceananigans", "OffsetArrays", "PrecompileTools", "Printf", "Scratch", "SeawaterPolynomials", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "ZipFile"]
479-
git-tree-sha1 = "537f8e721597a4730a12be4cbed7775ce49a290a"
479+
git-tree-sha1 = "909ce2b14c49b80b5e9d3fd7e2941f31c78fd69b"
480480
uuid = "0376089a-ecfe-4b0e-a64f-9c555d74d754"
481-
version = "0.7.1"
481+
version = "0.7.3"
482482

483483
[deps.ClimaOcean.extensions]
484484
ClimaOceanPythonCallExt = ["PythonCall", "CondaPkg"]
@@ -2151,13 +2151,14 @@ uuid = "510215fc-4207-5dde-b226-833fc4488ee2"
21512151
version = "0.5.5"
21522152

21532153
[[deps.Oceananigans]]
2154-
deps = ["Adapt", "CUDA", "Crayons", "CubedSphere", "Dates", "Distances", "DocStringExtensions", "FFTW", "GPUArrays", "Glob", "InteractiveUtils", "IterativeSolvers", "JLD2", "KernelAbstractions", "Krylov", "KrylovPreconditioners", "LinearAlgebra", "Logging", "MPI", "MuladdMacro", "OffsetArrays", "OrderedCollections", "Pkg", "Printf", "Random", "ReactantCore", "Rotations", "SeawaterPolynomials", "SparseArrays", "StaticArrays", "Statistics", "StructArrays"]
2155-
git-tree-sha1 = "af96495374438b175a677bbe7383a8ee3ce8cde4"
2154+
deps = ["Adapt", "Crayons", "CubedSphere", "Dates", "Distances", "DocStringExtensions", "FFTW", "GPUArrays", "GPUArraysCore", "Glob", "InteractiveUtils", "IterativeSolvers", "JLD2", "KernelAbstractions", "Krylov", "KrylovPreconditioners", "LinearAlgebra", "Logging", "MPI", "MuladdMacro", "OffsetArrays", "OrderedCollections", "Pkg", "Printf", "Random", "ReactantCore", "Rotations", "SeawaterPolynomials", "SparseArrays", "StaticArrays", "Statistics", "StructArrays"]
2155+
git-tree-sha1 = "d4cae4137e09b70431f46060119235bb719bb1c3"
21562156
uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
2157-
version = "0.96.35"
2157+
version = "0.97.1"
21582158

21592159
[deps.Oceananigans.extensions]
21602160
OceananigansAMDGPUExt = "AMDGPU"
2161+
OceananigansCUDAExt = "CUDA"
21612162
OceananigansEnzymeExt = "Enzyme"
21622163
OceananigansMakieExt = ["MakieCore", "Makie"]
21632164
OceananigansMetalExt = "Metal"
@@ -2167,6 +2168,7 @@ version = "0.96.35"
21672168

21682169
[deps.Oceananigans.weakdeps]
21692170
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
2171+
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
21702172
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
21712173
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
21722174
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"

‎experiments/ClimaEarth/Manifest.toml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.10.9"
3+
julia_version = "1.10.10"
44
manifest_format = "2.0"
5-
project_hash = "1754a7c9ed667b47a6df8199d5b5fe777a3ca462"
5+
project_hash = "8be0db6837f659a6beaaabe1167071904a205734"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "be7ae030256b8ef14a441726c4c37766b90b93a3"
@@ -473,9 +473,9 @@ version = "0.17.1"
473473

474474
[[deps.ClimaOcean]]
475475
deps = ["Adapt", "CFTime", "CUDA", "ClimaSeaIce", "CubicSplines", "DataDeps", "Dates", "DocStringExtensions", "Downloads", "ImageMorphology", "JLD2", "KernelAbstractions", "MPI", "NCDatasets", "Oceananigans", "OffsetArrays", "PrecompileTools", "Printf", "Scratch", "SeawaterPolynomials", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "ZipFile"]
476-
git-tree-sha1 = "537f8e721597a4730a12be4cbed7775ce49a290a"
476+
git-tree-sha1 = "909ce2b14c49b80b5e9d3fd7e2941f31c78fd69b"
477477
uuid = "0376089a-ecfe-4b0e-a64f-9c555d74d754"
478-
version = "0.7.1"
478+
version = "0.7.3"
479479

480480
[deps.ClimaOcean.extensions]
481481
ClimaOceanPythonCallExt = ["PythonCall", "CondaPkg"]
@@ -2136,13 +2136,14 @@ uuid = "510215fc-4207-5dde-b226-833fc4488ee2"
21362136
version = "0.5.5"
21372137

21382138
[[deps.Oceananigans]]
2139-
deps = ["Adapt", "CUDA", "Crayons", "CubedSphere", "Dates", "Distances", "DocStringExtensions", "FFTW", "GPUArrays", "Glob", "InteractiveUtils", "IterativeSolvers", "JLD2", "KernelAbstractions", "Krylov", "KrylovPreconditioners", "LinearAlgebra", "Logging", "MPI", "MuladdMacro", "OffsetArrays", "OrderedCollections", "Pkg", "Printf", "Random", "ReactantCore", "Rotations", "SeawaterPolynomials", "SparseArrays", "StaticArrays", "Statistics", "StructArrays"]
2140-
git-tree-sha1 = "af96495374438b175a677bbe7383a8ee3ce8cde4"
2139+
deps = ["Adapt", "Crayons", "CubedSphere", "Dates", "Distances", "DocStringExtensions", "FFTW", "GPUArrays", "GPUArraysCore", "Glob", "InteractiveUtils", "IterativeSolvers", "JLD2", "KernelAbstractions", "Krylov", "KrylovPreconditioners", "LinearAlgebra", "Logging", "MPI", "MuladdMacro", "OffsetArrays", "OrderedCollections", "Pkg", "Printf", "Random", "ReactantCore", "Rotations", "SeawaterPolynomials", "SparseArrays", "StaticArrays", "Statistics", "StructArrays"]
2140+
git-tree-sha1 = "d4cae4137e09b70431f46060119235bb719bb1c3"
21412141
uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
2142-
version = "0.96.35"
2142+
version = "0.97.1"
21432143

21442144
[deps.Oceananigans.extensions]
21452145
OceananigansAMDGPUExt = "AMDGPU"
2146+
OceananigansCUDAExt = "CUDA"
21462147
OceananigansEnzymeExt = "Enzyme"
21472148
OceananigansMakieExt = ["MakieCore", "Makie"]
21482149
OceananigansMetalExt = "Metal"
@@ -2152,6 +2153,7 @@ version = "0.96.35"
21522153

21532154
[deps.Oceananigans.weakdeps]
21542155
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
2156+
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
21552157
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
21562158
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
21572159
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
@@ -2214,7 +2216,7 @@ version = "2.5.4+0"
22142216
[[deps.OpenLibm_jll]]
22152217
deps = ["Artifacts", "Libdl"]
22162218
uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
2217-
version = "0.8.1+4"
2219+
version = "0.8.5+0"
22182220

22192221
[[deps.OpenMPI_jll]]
22202222
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"]

‎experiments/ClimaEarth/Project.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ ClimaAtmos = "0.27, 0.28, 0.29, 0.30, 0.31"
4040
ClimaCalibrate = "0.1"
4141
ClimaDiagnostics = "0.2.6"
4242
ClimaLand = "0.17.1"
43-
ClimaOcean = "0.7"
43+
ClimaOcean = "0.7.3"
4444
ClimaParams = "0.10"
4545
ClimaTimeSteppers = "0.7, 0.8"
4646
ClimaUtilities = "0.1"
4747
CUDA = "5"
4848
EnsembleKalmanProcesses = "2"
4949
Interpolations = "0.14, 0.15"
5050
JLD2 = "0.5"
51-
Oceananigans = "0.96"
51+
Oceananigans = "0.97.1"
5252
StaticArrays = "1"
5353
YAML = "0.4"

0 commit comments

Comments
 (0)