Skip to content

Commit aec6dfe

Browse files
authored
Merge branch 'main' into ep/modify_dycoms_rf02
2 parents 9eb736a + 293d976 commit aec6dfe

File tree

5 files changed

+77
-42
lines changed

5 files changed

+77
-42
lines changed

.buildkite/Manifest-v1.11.toml

Lines changed: 67 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ manifest_format = "2.0"
55
project_hash = "04945e2a7116cfacb2d57340f477dbe23e208227"
66

77
[[deps.ADTypes]]
8-
git-tree-sha1 = "7927b9af540ee964cc5d1b73293f1eb0b761a3a1"
8+
git-tree-sha1 = "60665b326b75db6517939d0e1875850bc4a54368"
99
uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
10-
version = "1.16.0"
10+
version = "1.17.0"
1111
weakdeps = ["ChainRulesCore", "ConstructionBase", "EnzymeCore"]
1212

1313
[deps.ADTypes.extensions]
@@ -153,9 +153,9 @@ version = "0.1.7"
153153

154154
[[deps.Atomix]]
155155
deps = ["UnsafeAtomics"]
156-
git-tree-sha1 = "b5bb4dc6248fde467be2a863eb8452993e74d402"
156+
git-tree-sha1 = "29bb0eb6f578a587a49da16564705968667f5fa8"
157157
uuid = "a9b6321e-bd34-4604-b9c9-b65b8de01458"
158-
version = "1.1.1"
158+
version = "1.1.2"
159159

160160
[deps.Atomix.extensions]
161161
AtomixCUDAExt = "CUDA"
@@ -285,10 +285,10 @@ uuid = "4e9b3aee-d8a1-5a3d-ad8b-7d824db253f0"
285285
version = "1.0.1+0"
286286

287287
[[deps.CUDA]]
288-
deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "GPUToolbox", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics", "demumble_jll"]
289-
git-tree-sha1 = "b8ae59258f3d96ce75a00f9229e719356eb929d6"
288+
deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Compiler_jll", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "GPUToolbox", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics", "demumble_jll"]
289+
git-tree-sha1 = "27f69b3923e58730f0a71396070e9114fc0bba40"
290290
uuid = "052768ef-5323-5732-b1bb-66c8b64840ba"
291-
version = "5.8.2"
291+
version = "5.8.3"
292292

293293
[deps.CUDA.extensions]
294294
ChainRulesCoreExt = "ChainRulesCore"
@@ -302,23 +302,29 @@ version = "5.8.2"
302302
SparseMatricesCSR = "a0a7dd2c-ebf4-11e9-1f05-cf50bc540ca1"
303303
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
304304

305+
[[deps.CUDA_Compiler_jll]]
306+
deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
307+
git-tree-sha1 = "fdb9ddf3e08e2aca4c84b3252df2dea046caadee"
308+
uuid = "d1e2174e-dfdc-576e-b43e-73b79eb1aca8"
309+
version = "0.2.0+1"
310+
305311
[[deps.CUDA_Driver_jll]]
306312
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
307-
git-tree-sha1 = "18afa851ed10552e6df25dfaa7ef450104ae73d4"
313+
git-tree-sha1 = "12621de83838b5ce6a185050db5a184f4540679b"
308314
uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc"
309-
version = "0.13.1+0"
315+
version = "13.0.0+0"
310316

311317
[[deps.CUDA_Runtime_Discovery]]
312318
deps = ["Libdl"]
313-
git-tree-sha1 = "33576c7c1b2500f8e7e6baa082e04563203b3a45"
319+
git-tree-sha1 = "f9a521f52d236fe49f1028d69e549e7f2644bb72"
314320
uuid = "1af6417a-86b4-443c-805f-a4643ffb695f"
315-
version = "0.3.5"
321+
version = "1.0.0"
316322

317323
[[deps.CUDA_Runtime_jll]]
318324
deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
319-
git-tree-sha1 = "b5c173a64f9f4224a82fdc26fda8614cb2ecfa27"
325+
git-tree-sha1 = "cc727d90c9769db27945219f9ba149dbddc74f06"
320326
uuid = "76a88914-d11a-5bdc-97e0-2f5a05c973a2"
321-
version = "0.17.1+0"
327+
version = "0.19.0+0"
322328

323329
[[deps.Cairo]]
324330
deps = ["Cairo_jll", "Colors", "Glib_jll", "Graphics", "Libdl", "Pango_jll"]
@@ -340,9 +346,9 @@ version = "1.18.5+0"
340346

341347
[[deps.ChainRulesCore]]
342348
deps = ["Compat", "LinearAlgebra"]
343-
git-tree-sha1 = "06ee8d1aa558d2833aa799f6f0b31b30cada405f"
349+
git-tree-sha1 = "e4c6a16e77171a5f5e25e9646617ab1c276c5607"
344350
uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
345-
version = "1.25.2"
351+
version = "1.26.0"
346352
weakdeps = ["SparseArrays"]
347353

348354
[deps.ChainRulesCore.extensions]
@@ -366,7 +372,7 @@ version = "0.5.19"
366372
deps = ["Adapt", "ArgParse", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaInterpolations", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "ForwardDiff", "Insolation", "Interpolations", "LazyArtifacts", "LazyBroadcast", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "NullBroadcasts", "RRTMGP", "Random", "SciMLBase", "SparseMatrixColorings", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
367373
path = ".."
368374
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
369-
version = "0.31.1"
375+
version = "0.31.2"
370376

371377
[[deps.ClimaComms]]
372378
deps = ["Adapt", "Logging", "LoggingExtras"]
@@ -381,9 +387,9 @@ weakdeps = ["CUDA", "MPI"]
381387

382388
[[deps.ClimaCore]]
383389
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
384-
git-tree-sha1 = "b2fbb5a52601005cf4e7547032d5bf371a2f4a69"
390+
git-tree-sha1 = "f9c4a2b43410bff9f33301eeb7664350014ce593"
385391
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
386-
version = "0.14.38"
392+
version = "0.14.39"
387393
weakdeps = ["CUDA", "Krylov"]
388394

389395
[deps.ClimaCore.extensions]
@@ -442,9 +448,9 @@ weakdeps = ["BenchmarkTools", "CUDA", "OrderedCollections", "PrettyTables", "Sta
442448

443449
[[deps.ClimaUtilities]]
444450
deps = ["Artifacts", "ClimaComms", "Dates"]
445-
git-tree-sha1 = "4402148693a5096c28cb09e544ce92b049b33e41"
451+
git-tree-sha1 = "fe1a7b3143f11c017118d3c99f067a09cb622f81"
446452
uuid = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"
447-
version = "0.1.25"
453+
version = "0.1.26"
448454
weakdeps = ["Adapt", "CUDA", "ClimaCore", "ClimaCoreTempestRemap", "Interpolations", "NCDatasets"]
449455

450456
[deps.ClimaUtilities.extensions]
@@ -638,9 +644,9 @@ version = "1.9.1"
638644

639645
[[deps.DiffEqBase]]
640646
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", "SymbolicIndexingInterface", "TruncatedStacktraces"]
641-
git-tree-sha1 = "803ea1b97e06d9f4b0da348589d451c5a456e9f4"
647+
git-tree-sha1 = "1b1e070e57681d1176d99a5ec455717e24686612"
642648
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
643-
version = "6.182.1"
649+
version = "6.183.2"
644650

645651
[deps.DiffEqBase.extensions]
646652
DiffEqBaseCUDAExt = "CUDA"
@@ -690,9 +696,9 @@ version = "1.15.1"
690696

691697
[[deps.DiskArrays]]
692698
deps = ["ConstructionBase", "LRUCache", "Mmap", "OffsetArrays"]
693-
git-tree-sha1 = "16d93ff95ecc421463eaefd694e6746bb1c0919e"
699+
git-tree-sha1 = "bfde0790720fcac006a3d62149309a685fc3aa13"
694700
uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3"
695-
version = "0.4.14"
701+
version = "0.4.15"
696702

697703
[[deps.Distributed]]
698704
deps = ["Random", "Serialization", "Sockets"]
@@ -961,9 +967,10 @@ uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
961967
version = "1.6.1"
962968

963969
[[deps.GPUToolbox]]
964-
git-tree-sha1 = "15d8b0f5a6dca9bf8c02eeaf6687660dafa638d0"
970+
deps = ["LLVM"]
971+
git-tree-sha1 = "5bfe837129bf49e2e049b4f1517546055cc16a93"
965972
uuid = "096a3bc2-3ced-46d0-87f4-dd12716f4bfc"
966-
version = "0.2.0"
973+
version = "0.3.0"
967974

968975
[[deps.GaussQuadrature]]
969976
deps = ["SpecialFunctions"]
@@ -1241,9 +1248,9 @@ version = "1.0.0"
12411248

12421249
[[deps.JET]]
12431250
deps = ["CodeTracking", "InteractiveUtils", "JuliaInterpreter", "JuliaSyntax", "LoweredCodeUtils", "MacroTools", "Pkg", "PrecompileTools", "Preferences", "Test"]
1244-
git-tree-sha1 = "c5bc131290ca461230634d6a44a69f3c9a8d8577"
1251+
git-tree-sha1 = "c5afee875b8daa022c09cda641c314c325e7d545"
12451252
uuid = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
1246-
version = "0.9.19"
1253+
version = "0.9.20"
12471254

12481255
[deps.JET.extensions]
12491256
JETCthulhuExt = "Cthulhu"
@@ -1530,9 +1537,9 @@ version = "2.10.0"
15301537

15311538
[[deps.LittleCMS_jll]]
15321539
deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll"]
1533-
git-tree-sha1 = "fa7fd067dca76cadd880f1ca937b4f387975a9f5"
1540+
git-tree-sha1 = "8e6a74641caf3b84800f2ccd55dc7ab83893c10b"
15341541
uuid = "d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f"
1535-
version = "2.16.0+0"
1542+
version = "2.17.0+0"
15361543

15371544
[[deps.LogExpFunctions]]
15381545
deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"]
@@ -1958,6 +1965,22 @@ git-tree-sha1 = "7dbfb7f61c3aa5def7b7dad3fa344c1c2858a83b"
19581965
uuid = "9c32591e-4766-534b-9725-b71a8799265b"
19591966
version = "24.6.0+0"
19601967

1968+
[[deps.PreallocationTools]]
1969+
deps = ["Adapt", "ArrayInterface", "PrecompileTools"]
1970+
git-tree-sha1 = "520070df581845686c8c488b6dadce6b2c316856"
1971+
uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
1972+
version = "0.4.32"
1973+
1974+
[deps.PreallocationTools.extensions]
1975+
PreallocationToolsForwardDiffExt = "ForwardDiff"
1976+
PreallocationToolsReverseDiffExt = "ReverseDiff"
1977+
PreallocationToolsSparseConnectivityTracerExt = "SparseConnectivityTracer"
1978+
1979+
[deps.PreallocationTools.weakdeps]
1980+
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
1981+
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
1982+
SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
1983+
19611984
[[deps.PrecompileCI]]
19621985
deps = ["ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaParams", "PrecompileTools"]
19631986
path = "PrecompileCI"
@@ -1972,9 +1995,9 @@ version = "1.2.1"
19721995

19731996
[[deps.Preferences]]
19741997
deps = ["TOML"]
1975-
git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6"
1998+
git-tree-sha1 = "0f27480397253da18fe2c12a4ba4eb9eb208bf3d"
19761999
uuid = "21216c6a-2e73-6563-6e65-726566657250"
1977-
version = "1.4.3"
2000+
version = "1.5.0"
19782001

19792002
[[deps.PrettyTables]]
19802003
deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "Reexport", "StringManipulation", "Tables"]
@@ -2173,10 +2196,10 @@ uuid = "94e857df-77ce-4151-89e5-788b33177be4"
21732196
version = "0.1.0"
21742197

21752198
[[deps.SciMLBase]]
2176-
deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Moshi", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
2177-
git-tree-sha1 = "c056c723b68700fec386dfde8c577089df720c8e"
2199+
deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Moshi", "PreallocationTools", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
2200+
git-tree-sha1 = "4041803a2ec7b65fecf0596fe5dd4ef3111b0f2a"
21782201
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
2179-
version = "2.108.0"
2202+
version = "2.111.0"
21802203

21812204
[deps.SciMLBase.extensions]
21822205
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
@@ -2201,9 +2224,9 @@ version = "2.108.0"
22012224

22022225
[[deps.SciMLOperators]]
22032226
deps = ["Accessors", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "MacroTools"]
2204-
git-tree-sha1 = "7d3a1519dc4d433a6b20035eaff20bde8be77c66"
2227+
git-tree-sha1 = "aea915a39b547c48a18ee041120db1ae8df5a691"
22052228
uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
2206-
version = "1.4.0"
2229+
version = "1.5.0"
22072230
weakdeps = ["SparseArrays", "StaticArraysCore"]
22082231

22092232
[deps.SciMLOperators.extensions]
@@ -2478,10 +2501,14 @@ weakdeps = ["ClimaParams"]
24782501
CreateParametersExt = "ClimaParams"
24792502

24802503
[[deps.SymbolicIndexingInterface]]
2481-
deps = ["Accessors", "ArrayInterface", "PrettyTables", "RuntimeGeneratedFunctions", "StaticArraysCore"]
2482-
git-tree-sha1 = "59ca6eddaaa9849e7de9fd1153b6faf0b1db7b80"
2504+
deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"]
2505+
git-tree-sha1 = "93104ca226670c0cb92ba8bc6998852ad55a2d4c"
24832506
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
2484-
version = "0.3.42"
2507+
version = "0.3.43"
2508+
weakdeps = ["PrettyTables"]
2509+
2510+
[deps.SymbolicIndexingInterface.extensions]
2511+
SymbolicIndexingInterfacePrettyTablesExt = "PrettyTables"
24852512

24862513
[[deps.TOML]]
24872514
deps = ["Dates"]

NEWS.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ ClimaAtmos.jl Release Notes
44
main
55
-------
66

7+
v0.31.2
8+
-------
9+
710
### Add RWP diagnostic
811
PR [#3946](https://github.com/CliMA/ClimaAtmos.jl/pull/3946) adds rainwater path diagnostic variable.
912

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ClimaAtmos"
22
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
33
authors = ["Climate Modeling Alliance"]
4-
version = "0.31.1"
4+
version = "0.31.2"
55

66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

config/longrun_configs/longrun_aquaplanet_allsky_progedmf_0M.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
implicit_sgs_advection: true
22
implicit_sgs_mass_flux: true
3+
implicit_sgs_entr_detr: true
4+
implicit_sgs_nh_pressure: true
35
max_newton_iters_ode: 3
4-
dt: "20secs"
6+
dt: "30secs"
57
t_end: "60days"
68
dt_save_state_to_disk: "30days"
79
moist: "equil"

toml/longrun_aquaplanet_progedmf.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ value = 40000.0
44
[zd_viscous]
55
value = 40000.0
66

7+
[alpha_rayleigh_sgs_tracer]
8+
value = 1e-3
9+
710
[precipitation_timescale]
811
value = 600
912

0 commit comments

Comments
 (0)