Skip to content

Commit 94e6751

Browse files
authored
Merge pull request #3711 from CliMA/gb/update-climacommon-to-2025_03_18
Update climacommon to 2025_03_18
2 parents d356713 + d767820 commit 94e6751

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

.buildkite/Manifest-v1.11.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -618,9 +618,9 @@ version = "1.9.1"
618618

619619
[[deps.DiffEqBase]]
620620
deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "FastPower", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "Setfield", "Static", "StaticArraysCore", "Statistics", "TruncatedStacktraces"]
621-
git-tree-sha1 = "b68847ddc7b8f3c77a84521b0fd50375274a380b"
621+
git-tree-sha1 = "85abd571c73edaa32101469858473ad32a755970"
622622
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
623-
version = "6.165.1"
623+
version = "6.167.0"
624624

625625
[deps.DiffEqBase.extensions]
626626
DiffEqBaseCUDAExt = "CUDA"
@@ -1237,9 +1237,9 @@ version = "0.9.18"
12371237

12381238
[[deps.JLD2]]
12391239
deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "PrecompileTools", "Requires", "TranscodingStreams"]
1240-
git-tree-sha1 = "91d501cb908df6f134352ad73cde5efc50138279"
1240+
git-tree-sha1 = "1059c071429b4753c0c869b75c859c44ba09a526"
12411241
uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
1242-
version = "0.5.11"
1242+
version = "0.5.12"
12431243

12441244
[[deps.JLLWrappers]]
12451245
deps = ["Artifacts", "Preferences"]
@@ -2139,9 +2139,9 @@ version = "0.1.0"
21392139

21402140
[[deps.SciMLBase]]
21412141
deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Moshi", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
2142-
git-tree-sha1 = "796073854427ce00c1cb454911bf52b76523c44c"
2142+
git-tree-sha1 = "b774e82af5c068939e1085d4ec058aadb79c5483"
21432143
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
2144-
version = "2.77.1"
2144+
version = "2.79.0"
21452145

21462146
[deps.SciMLBase.extensions]
21472147
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
@@ -2166,9 +2166,9 @@ version = "2.77.1"
21662166

21672167
[[deps.SciMLOperators]]
21682168
deps = ["Accessors", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "MacroTools"]
2169-
git-tree-sha1 = "6149620767866d4b0f0f7028639b6e661b6a1e44"
2169+
git-tree-sha1 = "1c4b7f6c3e14e6de0af66e66b86d525cae10ecb4"
21702170
uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
2171-
version = "0.3.12"
2171+
version = "0.3.13"
21722172
weakdeps = ["SparseArrays", "StaticArraysCore"]
21732173

21742174
[deps.SciMLOperators.extensions]

.buildkite/cpu_scaling_pipeline/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
agents:
2-
modules: "climacommon/2024_12_16"
2+
modules: "climacommon/2025_03_18"
33
queue: "new-central"
44
steps:
55
- label: "init :computer:"

.buildkite/gpu_pipeline/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: clima
33
slurm_mem: 8G
4-
modules: climacommon/2024_12_16 nsight-systems/2024.6.1
4+
modules: climacommon/2025_03_18 nsight-systems/2024.6.1
55

66
env:
77
JULIA_MPI_HAS_CUDA: "true"

.buildkite/longruns_gpu/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: clima
33
slurm_mem: 8G
4-
modules: climacommon/2024_12_16 nsight-systems/2024.6.1
4+
modules: climacommon/2025_03_18 nsight-systems/2024.6.1
55

66
env:
77
JULIA_MPI_HAS_CUDA: "true"

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: new-central
33
slurm_mem: 8G
4-
modules: climacommon/2024_12_16
4+
modules: climacommon/2025_03_18
55

66
env:
77
JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"

calibration/test/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: new-central
33
slurm_mem: 8G
4-
modules: climacommon/2025_01_27
4+
modules: climacommon/2025_03_18
55
env:
66
OPENBLAS_NUM_THREADS: 1
77
SLURM_KILL_BAD_EXIT: 1

src/solver/type_getters.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function get_atmos(config::AtmosConfig, params)
4141
)
4242
co2 = FixedCO2()
4343
end
44-
(isnothing(co2) && !with_rrtmgp) &&
44+
(!isnothing(co2) && !with_rrtmgp) &&
4545
@warn ("$(co2) does nothing if RRTMGP is not used")
4646

4747
disable_momentum_vertical_diffusion = forcing_type isa HeldSuarezForcing

0 commit comments

Comments
 (0)