Skip to content

Commit 2a57aa3

Browse files
authored
Merge pull request #4060 from CliMA/js/td015
use TDv0.15, tag patch
2 parents f07953b + 3087f10 commit 2a57aa3

File tree

5 files changed

+68
-57
lines changed

5 files changed

+68
-57
lines changed

.buildkite/Manifest-v1.11.toml

Lines changed: 43 additions & 36 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 = "a0acaae5da2df8c0af06d0681eb7de5079d8cbce"
5+
project_hash = "12784bf0b21aee2b4075f2bb64383303b89e8560"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "27cecae79e5cc9935255f90c53bb831cc3c870d7"
@@ -95,15 +95,15 @@ version = "1.1.2"
9595

9696
[[deps.ArrayInterface]]
9797
deps = ["Adapt", "LinearAlgebra"]
98-
git-tree-sha1 = "dbd8c3bbbdbb5c2778f85f4422c39960eac65a42"
98+
git-tree-sha1 = "d2cd034553ee6ca084edaaf8ed6c9d50fd01555d"
9999
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
100-
version = "7.20.0"
100+
version = "7.21.0"
101101

102102
[deps.ArrayInterface.extensions]
103103
ArrayInterfaceBandedMatricesExt = "BandedMatrices"
104104
ArrayInterfaceBlockBandedMatricesExt = "BlockBandedMatrices"
105105
ArrayInterfaceCUDAExt = "CUDA"
106-
ArrayInterfaceCUDSSExt = "CUDSS"
106+
ArrayInterfaceCUDSSExt = ["CUDSS", "CUDA"]
107107
ArrayInterfaceChainRulesCoreExt = "ChainRulesCore"
108108
ArrayInterfaceChainRulesExt = "ChainRules"
109109
ArrayInterfaceGPUArraysCoreExt = "GPUArraysCore"
@@ -220,9 +220,9 @@ version = "1.3.2"
220220

221221
[[deps.BenchmarkTools]]
222222
deps = ["Compat", "JSON", "Logging", "Printf", "Profile", "Statistics", "UUIDs"]
223-
git-tree-sha1 = "e38fbc49a620f5d0b660d7f543db1009fe0f8336"
223+
git-tree-sha1 = "b6d3a24de30951b196b84a83b5680f15fdc7d621"
224224
uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
225-
version = "1.6.0"
225+
version = "1.6.1"
226226

227227
[[deps.BitTwiddlingConvenienceFunctions]]
228228
deps = ["Static"]
@@ -306,15 +306,15 @@ version = "5.8.5"
306306

307307
[[deps.CUDA_Compiler_jll]]
308308
deps = ["Artifacts", "CUDA_Driver_jll", "CUDA_Runtime_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
309-
git-tree-sha1 = "8c4f340dd6501a93c4b99b690797772e4a203099"
309+
git-tree-sha1 = "68bac021c5d511fe39c2f4306cc9623a6626dbb4"
310310
uuid = "d1e2174e-dfdc-576e-b43e-73b79eb1aca8"
311-
version = "0.2.1+0"
311+
version = "0.2.2+0"
312312

313313
[[deps.CUDA_Driver_jll]]
314314
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
315-
git-tree-sha1 = "e6a1d9f5518122c186fd27786b61d2053cfa1b0c"
315+
git-tree-sha1 = "2023be0b10c56d259ea84a94dbfc021aa452f2c6"
316316
uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc"
317-
version = "13.0.1+0"
317+
version = "13.0.2+0"
318318

319319
[[deps.CUDA_Runtime_Discovery]]
320320
deps = ["Libdl"]
@@ -324,9 +324,9 @@ version = "1.0.0"
324324

325325
[[deps.CUDA_Runtime_jll]]
326326
deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
327-
git-tree-sha1 = "e24c6de116c0735c37e83b8bc05ed60d4d359693"
327+
git-tree-sha1 = "92cd84e2b760e471d647153ea5efc5789fc5e8b2"
328328
uuid = "76a88914-d11a-5bdc-97e0-2f5a05c973a2"
329-
version = "0.19.1+0"
329+
version = "0.19.2+0"
330330

331331
[[deps.Cairo]]
332332
deps = ["Cairo_jll", "Colors", "Glib_jll", "Graphics", "Libdl", "Pango_jll"]
@@ -391,7 +391,7 @@ version = "0.5.20"
391391
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"]
392392
path = ".."
393393
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
394-
version = "0.31.5"
394+
version = "0.31.6"
395395

396396
[[deps.ClimaComms]]
397397
deps = ["Adapt", "Logging", "LoggingExtras"]
@@ -487,9 +487,9 @@ version = "0.1.13"
487487

488488
[[deps.CloudMicrophysics]]
489489
deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "LazyArtifacts", "LogExpFunctions", "RootSolvers", "SpecialFunctions", "StaticArrays", "Thermodynamics", "UnrolledUtilities"]
490-
git-tree-sha1 = "1f5b9fabe548def6571d3ffb2615cf3f4f34fee8"
490+
git-tree-sha1 = "eb2faa4027a1d2583f42b2a5d7b6a4b3363317d1"
491491
uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
492-
version = "0.27.4"
492+
version = "0.28.1"
493493

494494
[deps.CloudMicrophysics.extensions]
495495
EmulatorModelsExt = ["DataFrames", "MLJ"]
@@ -506,9 +506,9 @@ version = "1.3.9"
506506

507507
[[deps.ColorBrewer]]
508508
deps = ["Colors", "JSON"]
509-
git-tree-sha1 = "e771a63cc8b539eca78c85b0cabd9233d6c8f06f"
509+
git-tree-sha1 = "07da79661b919001e6863b81fc572497daa58349"
510510
uuid = "a2cac450-b92f-5266-8821-25eda20663c8"
511-
version = "0.4.1"
511+
version = "0.4.2"
512512

513513
[[deps.ColorSchemes]]
514514
deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "PrecompileTools", "Random"]
@@ -940,9 +940,9 @@ version = "1.3.7"
940940

941941
[[deps.ForwardDiff]]
942942
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"]
943-
git-tree-sha1 = "dc41303865a16274ecb8450c220021ce1e0cf05f"
943+
git-tree-sha1 = "ba6ce081425d0afb2bedd00d9884464f764a9225"
944944
uuid = "f6369f11-7733-5829-9624-2563aa707210"
945-
version = "1.2.1"
945+
version = "1.2.2"
946946
weakdeps = ["StaticArrays"]
947947

948948
[deps.ForwardDiff.extensions]
@@ -1265,9 +1265,9 @@ uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f"
12651265
version = "1.3.1"
12661266

12671267
[[deps.IrrationalConstants]]
1268-
git-tree-sha1 = "e2222959fbc6c19554dc15174c81bf7bf3aa691c"
1268+
git-tree-sha1 = "b2d91fe939cae05960e760110b328288867b5758"
12691269
uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
1270-
version = "0.2.4"
1270+
version = "0.2.6"
12711271

12721272
[[deps.Isoband]]
12731273
deps = ["isoband_jll"]
@@ -2139,9 +2139,9 @@ version = "1.3.4"
21392139

21402140
[[deps.RecursiveArrayTools]]
21412141
deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "LinearAlgebra", "RecipesBase", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
2142-
git-tree-sha1 = "96bef5b9ac123fff1b379acf0303cf914aaabdfd"
2142+
git-tree-sha1 = "51bdb23afaaa551f923a0e990f7c44a4451a26f1"
21432143
uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
2144-
version = "3.37.1"
2144+
version = "3.39.0"
21452145

21462146
[deps.RecursiveArrayTools.extensions]
21472147
RecursiveArrayToolsFastBroadcastExt = "FastBroadcast"
@@ -2396,9 +2396,9 @@ version = "1.11.0"
23962396

23972397
[[deps.SparseMatrixColorings]]
23982398
deps = ["ADTypes", "DocStringExtensions", "LinearAlgebra", "PrecompileTools", "Random", "SparseArrays"]
2399-
git-tree-sha1 = "9de43e0b9b976f1019bf7a879a686c4514520078"
2399+
git-tree-sha1 = "d3f3b7bb8a561b5ff20ee7cf9574841ee4e4e137"
24002400
uuid = "0a514795-09f3-496d-8182-132a7b665d35"
2401-
version = "0.4.21"
2401+
version = "0.4.22"
24022402

24032403
[deps.SparseMatrixColorings.extensions]
24042404
SparseMatrixColoringsCUDAExt = "CUDA"
@@ -2545,9 +2545,9 @@ version = "7.7.0+0"
25452545

25462546
[[deps.SurfaceFluxes]]
25472547
deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"]
2548-
git-tree-sha1 = "a03a545014be4f89d36d4a7d024b69427a105e9e"
2548+
git-tree-sha1 = "4a28939fa34ce9b45f693f33bbe956d1b2903ba2"
25492549
uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
2550-
version = "0.12.3"
2550+
version = "0.13.1"
25512551
weakdeps = ["ClimaParams"]
25522552

25532553
[deps.SurfaceFluxes.extensions]
@@ -2586,10 +2586,17 @@ uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
25862586
version = "1.10.0"
25872587

25882588
[[deps.TaylorSeries]]
2589-
deps = ["LinearAlgebra", "Markdown", "Requires", "SparseArrays"]
2590-
git-tree-sha1 = "31834a05c8a9d52d7f56b23ae7ad1c3b72a4f1bf"
2589+
deps = ["LinearAlgebra", "Markdown", "SparseArrays"]
2590+
git-tree-sha1 = "dbb2073ed3d0b356405abb7562bfb3326f9cb5fe"
25912591
uuid = "6aa5eb33-94cf-58f4-a9d0-e4b2c4fc25ea"
2592-
version = "0.13.2"
2592+
version = "0.20.9"
2593+
weakdeps = ["IntervalArithmetic", "JLD2", "RecursiveArrayTools", "StaticArrays"]
2594+
2595+
[deps.TaylorSeries.extensions]
2596+
TaylorSeriesIAExt = "IntervalArithmetic"
2597+
TaylorSeriesJLD2Ext = "JLD2"
2598+
TaylorSeriesRATExt = "RecursiveArrayTools"
2599+
TaylorSeriesSAExt = "StaticArrays"
25932600

25942601
[[deps.TempestRemap_jll]]
25952602
deps = ["Artifacts", "HDF5_jll", "JLLWrappers", "Libdl", "NetCDF_jll", "OpenBLAS32_jll"]
@@ -2615,9 +2622,9 @@ version = "1.0.2"
26152622

26162623
[[deps.Thermodynamics]]
26172624
deps = ["DocStringExtensions", "ForwardDiff", "KernelAbstractions", "Random", "RootSolvers"]
2618-
git-tree-sha1 = "e3a9fe706f095c6a176a76ea4613c57900898999"
2625+
git-tree-sha1 = "bae39665e42c36e2e6bf5b814631915ec7d90232"
26192626
uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
2620-
version = "0.14.2"
2627+
version = "0.15.0"
26212628
weakdeps = ["ClimaParams"]
26222629

26232630
[deps.Thermodynamics.extensions]
@@ -2904,10 +2911,10 @@ uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
29042911
version = "1.59.0+0"
29052912

29062913
[[deps.oneTBB_jll]]
2907-
deps = ["Artifacts", "JLLWrappers", "Libdl"]
2908-
git-tree-sha1 = "d5a767a3bb77135a99e433afe0eb14cd7f6914c3"
2914+
deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"]
2915+
git-tree-sha1 = "1350188a69a6e46f799d3945beef36435ed7262f"
29092916
uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e"
2910-
version = "2022.0.0+0"
2917+
version = "2022.0.0+1"
29112918

29122919
[[deps.p7zip_jll]]
29132920
deps = ["Artifacts", "Libdl"]

.buildkite/pipeline.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ steps:
195195
--config_file $CONFIG_PATH/plane_density_current_test.yml
196196
--job_id plane_density_current_test
197197
artifact_paths: "plane_density_current_test/output_active/*"
198-
198+
199199
- label: ":computer: Density current experiment (AMD)"
200200
command: >
201201
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
@@ -313,7 +313,7 @@ steps:
313313
artifact_paths: "baroclinic_wave_equil_conservation_source/output_active/*"
314314
agents:
315315
slurm_mem: 16GB
316-
316+
317317
- label: ":computer: baroclinic wave nonequil moist check conservation with sources"
318318
command: >
319319
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl --config_file $CONFIG_PATH/baroclinic_wave_nonequil_conservation_source.yml
@@ -356,7 +356,7 @@ steps:
356356
artifact_paths: "baroclinic_wave_equil/output_active/*"
357357
agents:
358358
slurm_constraint: icelake|cascadelake|skylake|epyc
359-
359+
360360
- label: ":computer: no lim baroclinic wave equilmoist (AMD)"
361361
command: >
362362
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
@@ -873,7 +873,7 @@ steps:
873873
artifact_paths: "prognostic_edmfx_rico_column/output_active/*"
874874
agents:
875875
slurm_mem: 20GB
876-
876+
877877
- label: ":umbrella: Prognostic EDMFX Rico in a column (implicit)"
878878
command: >
879879
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
@@ -939,6 +939,7 @@ steps:
939939
artifact_paths: "prognostic_edmfx_diurnal_scm_imp/output_active/*"
940940
agents:
941941
slurm_mem: 12GB
942+
soft_fail: true
942943

943944
- label: ":genie: Prognostic EDMFX Bomex in a box"
944945
command: >
@@ -1009,7 +1010,7 @@ steps:
10091010
artifact_paths: "prognostic_edmfx_bomex_column_sparse_autodiff/output_active/*"
10101011
agents:
10111012
slurm_mem: 20GB
1012-
1013+
10131014
- label: "Prognostic EDMFX Dycoms RF02 in a column sparse autodiff"
10141015
command: >
10151016
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
@@ -1019,7 +1020,7 @@ steps:
10191020
agents:
10201021
slurm_mem: 20GB
10211022
soft_fail: true
1022-
1023+
10231024
- label: "Prognostic EDMFX TRMM in a column sparse autodiff"
10241025
command: >
10251026
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
@@ -1049,7 +1050,7 @@ steps:
10491050
artifact_paths: "prognostic_edmfx_aquaplanet_sparse_autodiff/output_active/*"
10501051
agents:
10511052
slurm_mem: 20GB
1052-
1053+
10531054
- label: "AMIP Target EDOnly nonequil sparse autodiff"
10541055
command: >
10551056
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl

Project.toml

Lines changed: 4 additions & 4 deletions
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.5"
4+
version = "0.31.6"
55

66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -50,7 +50,7 @@ ClimaInterpolations = "0.1.0"
5050
ClimaParams = "1.0"
5151
ClimaTimeSteppers = "0.8.2"
5252
ClimaUtilities = "0.1.23"
53-
CloudMicrophysics = "0.27.4"
53+
CloudMicrophysics = "0.28"
5454
Dates = "1"
5555
ForwardDiff = "1"
5656
Insolation = "0.10.2"
@@ -68,8 +68,8 @@ SciMLBase = "~2.108, ~2.109, ~2.110, ~2.111, ~2.112"
6868
SparseMatrixColorings = "0.4.20"
6969
StaticArrays = "1.9"
7070
Statistics = "1"
71-
SurfaceFluxes = "0.12.3"
72-
Thermodynamics = "0.14.1"
71+
SurfaceFluxes = "0.12.3, 0.13"
72+
Thermodynamics = "0.14.1, 0.15"
7373
UnrolledUtilities = "0.1.9"
7474
YAML = "0.4"
7575
julia = "1.9"

reproducibility_tests/ref_counter.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
267
1+
268
22

33
# **README**
44
#
@@ -20,12 +20,15 @@
2020

2121

2222
#=
23+
268
24+
- Updated deps, specifically SurfaceFluxes.jl
25+
2326
267
2427
- Changed the pressure-gradient formulation to use the Exner function
2528
and virtual potential temperature.
2629
2730
266
28-
- No behavior change, but some new diagnostics are added, and the reference
31+
- No behavior change, but some new diagnostics are added, and the reference
2932
simulations don't have those diagnostics for plotting
3033
3134
265

0 commit comments

Comments
 (0)