From 898be6305b1c3c163ce7fa73be0e85a0d2979701 Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Thu, 15 Feb 2024 10:23:30 -0800 Subject: [PATCH 1/5] Test RRTMGP before release --- examples/Manifest.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/Manifest.toml b/examples/Manifest.toml index 0247ccb470..fd2073f4bb 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -2057,7 +2057,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] deps = ["Adapt", "Artifacts", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "3493869e9bbe529dfd8dada02b455847bdb46f27" +git-tree-sha1 = "ef8bd48fef527361dca693c961271da6e424ff01" +repo-rev = "main" +repo-url = "https://github.com/CliMA/RRTMGP.jl.git" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" version = "0.11.0" weakdeps = ["CLIMAParameters"] From ee69adf1f04b61ebc8bdc0a3ca08d0dd3008cf36 Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Thu, 15 Feb 2024 11:01:09 -0800 Subject: [PATCH 2/5] update interface --- .../radiation/RRTMGPInterface.jl | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/parameterized_tendencies/radiation/RRTMGPInterface.jl b/src/parameterized_tendencies/radiation/RRTMGPInterface.jl index e8eff73260..537aaa450d 100644 --- a/src/parameterized_tendencies/radiation/RRTMGPInterface.jl +++ b/src/parameterized_tendencies/radiation/RRTMGPInterface.jl @@ -579,7 +579,7 @@ function RRTMGPModel( src_lw = flux_lw = fluxb_lw = bcs_lw = nothing else if radiation_mode isa GrayRadiation - nbnd_lw = ngpt_lw = 1 + nbnd_lw = 1 else local lookup_lw, idx_gases data_loader(joinpath("lookup_tables", "clearsky_lw.nc")) do ds @@ -587,9 +587,8 @@ function RRTMGPModel( end lookups = (; lookups..., lookup_lw, idx_gases) - nbnd_lw = lookup_lw.n_bnd - ngpt_lw = lookup_lw.n_gpt - ngas = lookup_lw.n_gases + nbnd_lw = RRTMGP.LookUpTables.get_n_bnd(lookup_lw) + ngas = RRTMGP.LookUpTables.get_n_gases(lookup_lw) if !(radiation_mode isa ClearSkyRadiation) local lookup_lw_cld @@ -629,7 +628,7 @@ function RRTMGPModel( set_and_save!(sfc_emis, "surface_emissivity", t..., dict) name = "top_of_atmosphere_lw_flux_dn" if Symbol(name) in keys(dict) - inc_flux = DA{FT}(undef, ncol, ngpt_lw) + inc_flux = DA{FT}(undef, ncol) set_and_save!(transpose(inc_flux), name, t..., dict) else inc_flux = nothing @@ -641,7 +640,7 @@ function RRTMGPModel( src_sw = flux_sw = fluxb_sw = bcs_sw = nothing else if radiation_mode isa GrayRadiation - nbnd_sw = ngpt_sw = 1 + nbnd_sw = 1 else local lookup_sw, idx_gases data_loader(joinpath("lookup_tables", "clearsky_sw.nc")) do ds @@ -649,9 +648,8 @@ function RRTMGPModel( end lookups = (; lookups..., lookup_sw, idx_gases) - nbnd_sw = lookup_sw.n_bnd - ngpt_sw = lookup_sw.n_gpt - ngas = lookup_sw.n_gases + nbnd_sw = RRTMGP.LookUpTables.get_n_bnd(lookup_sw) + ngas = RRTMGP.LookUpTables.get_n_gases(lookup_sw) if !(radiation_mode isa ClearSkyRadiation) local lookup_sw_cld @@ -729,7 +727,7 @@ function RRTMGPModel( set_and_save!(similar(flux_lw2.flux_net), "face_clear_flux", t...) end if !(radiation_mode isa GrayRadiation) - @assert lookup_lw.n_gases == lookup_sw.n_gases + @assert RRTMGP.LookUpTables.get_n_gases(lookup_lw) == RRTMGP.LookUpTables.get_n_gases(lookup_sw) @assert lookup_lw.p_ref_min == lookup_sw.p_ref_min end end From 12a5b84b2412c0c0c95131d401f77cb4c45f7909 Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Thu, 15 Feb 2024 18:20:15 -0800 Subject: [PATCH 3/5] Update minor release for RRTMGP, Microphys, Thermo, Params --- .buildkite/JuliaManifest.toml | 7 ++ .dev/Manifest.toml | 15 ++- Project.toml | 10 +- docs/Manifest.toml | 89 +++++++------- examples/Manifest.toml | 111 +++++++++-------- examples/Project.toml | 1 - perf/Manifest.toml | 115 ++++++++++-------- perf/Project.toml | 1 - .../radiation/RRTMGPInterface.jl | 5 +- src/parameters/create_parameters.jl | 37 ++---- src/solver/type_getters.jl | 3 +- test/Project.toml | 1 - 12 files changed, 204 insertions(+), 191 deletions(-) create mode 100644 .buildkite/JuliaManifest.toml diff --git a/.buildkite/JuliaManifest.toml b/.buildkite/JuliaManifest.toml new file mode 100644 index 0000000000..49def1130b --- /dev/null +++ b/.buildkite/JuliaManifest.toml @@ -0,0 +1,7 @@ +# This file is machine-generated - editing it directly is not advised + +julia_version = "1.10.0" +manifest_format = "2.0" +project_hash = "da39a3ee5e6b4b0d3255bfef95601890afd80709" + +[deps] diff --git a/.dev/Manifest.toml b/.dev/Manifest.toml index 11fe56d4b5..bd304b9d79 100644 --- a/.dev/Manifest.toml +++ b/.dev/Manifest.toml @@ -16,9 +16,14 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[deps.CSTParser]] deps = ["Tokenize"] -git-tree-sha1 = "1dd0361befc505b9c6db4b5ab7eb874837de0569" +git-tree-sha1 = "b1d309487c04e92253b55c1f803b1d6f0e136920" uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f" -version = "3.4.0" +version = "3.4.1" + +[[deps.Combinatorics]] +git-tree-sha1 = "08c8b6831dc00bfea825826be0bc8336fc369860" +uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa" +version = "1.0.2" [[deps.CommonMark]] deps = ["Crayons", "JSON", "PrecompileTools", "URIs"] @@ -78,10 +83,10 @@ uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.4" [[deps.JuliaFormatter]] -deps = ["CSTParser", "CommonMark", "DataStructures", "Glob", "Pkg", "PrecompileTools", "Tokenize"] -git-tree-sha1 = "8f5295e46f594ad2d8652f1098488a77460080cd" +deps = ["CSTParser", "Combinatorics", "CommonMark", "DataStructures", "Glob", "Pkg", "PrecompileTools", "Tokenize"] +git-tree-sha1 = "40f1eb7837b7b75d07c062790942406b9a010725" uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899" -version = "1.0.45" +version = "1.0.49" [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] diff --git a/Project.toml b/Project.toml index 5bb1b7bc5a..731ea14be4 100644 --- a/Project.toml +++ b/Project.toml @@ -46,12 +46,12 @@ ArgParse = "1" ArtifactWrappers = "0.2" Artifacts = "1" AtmosphericProfilesLibrary = "0.1" -CLIMAParameters = "0.8.4" +CLIMAParameters = "0.9" CPUSummary = "0.2" ClimaComms = "0.5.6" ClimaCore = "0.12" ClimaTimeSteppers = "0.7.14" -CloudMicrophysics = "0.15.2" +CloudMicrophysics = "0.16" Colors = "0.12" Dates = "1" Dierckx = "0.5" @@ -69,15 +69,15 @@ NCDatasets = "0.13.1, =0.14.1" NVTX = "0.3" Pkg = "1.8" Printf = "1" -RRTMGP = "0.11" +RRTMGP = "0.12" Random = "1" RootSolvers = "0.2, 0.3, 0.4" SciMLBase = "1, 2" StaticArrays = "1" Statistics = "1" StatsBase = "0.33, 0.34" -SurfaceFluxes = "0.9.1" -Thermodynamics = "0.11" +SurfaceFluxes = "0.9" +Thermodynamics = "0.12" YAML = "0.4" julia = "1.7" diff --git a/docs/Manifest.toml b/docs/Manifest.toml index b7d9e285c1..bf626bf35e 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -58,9 +58,9 @@ version = "1.1.1" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra", "Requires", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "bbec08a37f8722786d87bedf84eae19c020c4efa" +git-tree-sha1 = "c5aeb516a84459e0318a02507d2261edad97eb75" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "7.7.0" +version = "7.7.1" [deps.ArrayInterface.extensions] ArrayInterfaceBandedMatricesExt = "BandedMatrices" @@ -188,9 +188,9 @@ version = "0.1.2" [[deps.CLIMAParameters]] deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "cf4f5ee75576ae855eca7da064540ce40b9a04c1" +git-tree-sha1 = "10473c458cd10f3808a438492447ca10d4dde7d0" uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" -version = "0.8.6" +version = "0.9.0" [[deps.CPUSummary]] deps = ["CpuId", "IfElse", "PrecompileTools", "Static"] @@ -251,9 +251,9 @@ version = "0.5.6" [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "Unrolled"] -git-tree-sha1 = "541bf25a8adc3c7ddf8d45a96149964f5cfbb074" +git-tree-sha1 = "c9f8744c0ca7fd0f3f1833625ab4aa8edba28149" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.11.9" +version = "0.12.0" weakdeps = ["Krylov"] [deps.ClimaCore.extensions] @@ -273,9 +273,9 @@ version = "0.1.12" [[deps.CloudMicrophysics]] deps = ["CLIMAParameters", "DocStringExtensions", "ForwardDiff", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "0c0be34fad945b95fd3c94cca9003bacae990ccf" +git-tree-sha1 = "71cfda20196c7a81f3798de59f3830c78f4c17b0" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.15.2" +version = "0.16.0" [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] @@ -395,9 +395,9 @@ version = "0.1.0+0" [[deps.DiffEqBase]] deps = ["ArrayInterface", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"] -git-tree-sha1 = "fefc2eeabecb745f1b1e1f91634381f7c81bd75d" +git-tree-sha1 = "3089c8295ab6d7c728cd6929121c1b4567457306" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" -version = "6.146.1" +version = "6.147.0" [deps.DiffEqBase.extensions] DiffEqBaseChainRulesCoreExt = "ChainRulesCore" @@ -425,9 +425,9 @@ version = "6.146.1" [[deps.DiffEqCallbacks]] deps = ["DataStructures", "DiffEqBase", "ForwardDiff", "Functors", "LinearAlgebra", "Markdown", "NLsolve", "Parameters", "RecipesBase", "RecursiveArrayTools", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "cf334da651a6e42c50e1477d6ab978f1b8be3057" +git-tree-sha1 = "ee954c8b9d348b7a8a6aec5f28288bf5adecd4ee" uuid = "459566f4-90b8-5000-8ac3-15dfb0a30def" -version = "2.36.1" +version = "2.37.0" [deps.DiffEqCallbacks.weakdeps] OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" @@ -694,6 +694,12 @@ git-tree-sha1 = "e4591176488495bf44d7456bd73179d87d5e6eab" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" version = "1.14.3+1" +[[deps.Hwloc_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "ca0f6bf568b4bfc807e7537f081c81e35ceca114" +uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" +version = "2.10.0+0" + [[deps.IOCapture]] deps = ["Logging", "Random"] git-tree-sha1 = "8b72179abc660bfab5e28472e019392b97d0985c" @@ -713,9 +719,9 @@ version = "1.4.0" [[deps.Insolation]] deps = ["Artifacts", "Dates", "DelimitedFiles", "Interpolations"] -git-tree-sha1 = "2aaf998568ab59643cefb0fc17eba42f9d5bef37" +git-tree-sha1 = "e5bd2e08d94737b3acd1c1c4e6ab737d2494571c" uuid = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8" -version = "0.9.0" +version = "0.9.1" weakdeps = ["CLIMAParameters"] [deps.Insolation.extensions] @@ -744,13 +750,14 @@ version = "0.15.1" Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" [[deps.IntervalSets]] -git-tree-sha1 = "581191b15bcb56a2aa257e9c160085d0f128a380" +git-tree-sha1 = "dba9ddf07f77f60450fe5d2e2beb9854d9a49bd0" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.7.9" -weakdeps = ["Random", "Statistics"] +version = "0.7.10" +weakdeps = ["Random", "RecipesBase", "Statistics"] [deps.IntervalSets.extensions] IntervalSetsRandomExt = "Random" + IntervalSetsRecipesBaseExt = "RecipesBase" IntervalSetsStatisticsExt = "Statistics" [[deps.InvertedIndices]] @@ -987,10 +994,10 @@ version = "0.20.19" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" [[deps.MPICH_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "2ee75365ca243c1a39d467e35ffd3d4d32eef11e" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "656036b9ed6f942d35e536e249600bc31d0f9df8" uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4" -version = "4.1.2+1" +version = "4.2.0+0" [[deps.MPIPreferences]] deps = ["Libdl", "Preferences"] @@ -999,10 +1006,10 @@ uuid = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267" version = "0.1.10" [[deps.MPItrampoline_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "8eeb3c73bbc0ca203d0dc8dad4008350bbe5797b" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "77c3bd69fdb024d75af38713e883d0f249ce19c2" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" -version = "5.3.1+1" +version = "5.3.2+0" [[deps.MacroTools]] deps = ["Markdown", "Random"] @@ -1032,9 +1039,9 @@ version = "2.28.2+1" [[deps.MicrosoftMPI_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "b01beb91d20b0d1312a9471a36017b5b339d26de" +git-tree-sha1 = "f12a29c4400ba812841c6ace3f4efbb6dbb3ba01" uuid = "9237b28f-5490-5468-be7b-bb81f5f5e6cf" -version = "10.1.4+1" +version = "10.1.4+2" [[deps.Missings]] deps = ["DataAPI"] @@ -1246,9 +1253,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] deps = ["Adapt", "Artifacts", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "3493869e9bbe529dfd8dada02b455847bdb46f27" +git-tree-sha1 = "411d7064df9a123db8d2878539b7cc86158ed215" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.11.0" +version = "0.12.0" weakdeps = ["CLIMAParameters"] [deps.RRTMGP.extensions] @@ -1288,9 +1295,9 @@ version = "1.3.4" [[deps.RecursiveArrayTools]] deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "SparseArrays", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"] -git-tree-sha1 = "2bd309f5171a628efdf5309361cd8a779b9e63a9" +git-tree-sha1 = "09c906ce9fa905d40e0706cdb62422422091c22f" uuid = "731186ca-8d62-57ce-b412-fbd966d074cd" -version = "3.8.0" +version = "3.8.1" [deps.RecursiveArrayTools.extensions] RecursiveArrayToolsFastBroadcastExt = "FastBroadcast" @@ -1329,9 +1336,9 @@ version = "1.3.0" [[deps.RootSolvers]] deps = ["ForwardDiff"] -git-tree-sha1 = "833d9914e748ca9329b762a82ec912897975f8d8" +git-tree-sha1 = "a87fd671f7a298de98f2f3c5a9cd9890714eb9dd" uuid = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" -version = "0.4.1" +version = "0.4.2" [[deps.RuntimeGeneratedFunctions]] deps = ["ExprTools", "SHA", "Serialization"] @@ -1350,9 +1357,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"] -git-tree-sha1 = "850d187a1123683aa7e593d474155e132584fb78" +git-tree-sha1 = "a123011b1711f3449bc4e5d66746be5725af92fd" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.24.0" +version = "2.26.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -1513,18 +1520,18 @@ version = "7.2.1+1" [[deps.SurfaceFluxes]] deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] -git-tree-sha1 = "6431256ee7c06ed2900fd46688f355e5a43e90eb" +git-tree-sha1 = "3ded2d347cab67d1727b4d25bb5c99fb4982a868" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" -version = "0.9.1" +version = "0.9.2" weakdeps = ["CLIMAParameters"] [deps.SurfaceFluxes.extensions] CreateParametersExt = "CLIMAParameters" [[deps.SymbolicIndexingInterface]] -git-tree-sha1 = "b3103f4f50a3843e66297a2456921377c78f5e31" +git-tree-sha1 = "dc7186d456f9ff2bef0cb754a59758920f0b2382" uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5" -version = "0.3.5" +version = "0.3.6" [[deps.TOML]] deps = ["Dates"] @@ -1571,9 +1578,9 @@ version = "1.0.1" [[deps.Thermodynamics]] deps = ["DocStringExtensions", "KernelAbstractions", "Random", "RootSolvers"] -git-tree-sha1 = "090a50e507242bd6c85267645186260fe89a1cfe" +git-tree-sha1 = "b484b3da3984316967a00089ed6597e59dc03464" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -version = "0.11.7" +version = "0.12.1" weakdeps = ["CLIMAParameters"] [deps.Thermodynamics.extensions] @@ -1684,9 +1691,9 @@ version = "5.8.0+1" [[deps.libzip_jll]] deps = ["Artifacts", "Bzip2_jll", "GnuTLS_jll", "JLLWrappers", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "9a6ac803f3c17fe7cf66430a8bfc7186800f08a4" +git-tree-sha1 = "3282b7d16ae7ac3e57ec2f3fa8fafb564d8f9f7f" uuid = "337d8026-41b4-5cde-a456-74a10e5b31d1" -version = "1.9.2+0" +version = "1.10.1+0" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] diff --git a/examples/Manifest.toml b/examples/Manifest.toml index fd2073f4bb..d2c29c1aa6 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.0" manifest_format = "2.0" -project_hash = "8e6d90a0dd2d3579f7420e75b5539b6ce7802850" +project_hash = "3c8f1d185eb1ecef18f6d875a0af69a59ca1d8c5" [[deps.ADTypes]] git-tree-sha1 = "41c37aa88889c171f1300ceac1313c06e891d245" @@ -64,9 +64,9 @@ version = "1.1.1" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra", "Requires", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "bbec08a37f8722786d87bedf84eae19c020c4efa" +git-tree-sha1 = "c5aeb516a84459e0318a02507d2261edad97eb75" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "7.7.0" +version = "7.7.1" [deps.ArrayInterface.extensions] ArrayInterfaceBandedMatricesExt = "BandedMatrices" @@ -200,9 +200,9 @@ version = "0.1.2" [[deps.CLIMAParameters]] deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "cf4f5ee75576ae855eca7da064540ce40b9a04c1" +git-tree-sha1 = "10473c458cd10f3808a438492447ca10d4dde7d0" uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" -version = "0.8.6" +version = "0.9.0" [[deps.CPUSummary]] deps = ["CpuId", "IfElse", "PrecompileTools", "Static"] @@ -364,9 +364,9 @@ version = "0.1.12" [[deps.CloudMicrophysics]] deps = ["CLIMAParameters", "DocStringExtensions", "ForwardDiff", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "0c0be34fad945b95fd3c94cca9003bacae990ccf" +git-tree-sha1 = "71cfda20196c7a81f3798de59f3830c78f4c17b0" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.15.2" +version = "0.16.0" [[deps.CodeTracking]] deps = ["InteractiveUtils", "UUIDs"] @@ -548,9 +548,9 @@ version = "0.1.0+0" [[deps.DiffEqBase]] deps = ["ArrayInterface", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"] -git-tree-sha1 = "eaf775818162923a0d509b10ca9ef809adfb43e8" +git-tree-sha1 = "3089c8295ab6d7c728cd6929121c1b4567457306" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" -version = "6.146.2" +version = "6.147.0" [deps.DiffEqBase.extensions] DiffEqBaseChainRulesCoreExt = "ChainRulesCore" @@ -578,9 +578,9 @@ version = "6.146.2" [[deps.DiffEqCallbacks]] deps = ["DataStructures", "DiffEqBase", "ForwardDiff", "Functors", "LinearAlgebra", "Markdown", "NLsolve", "Parameters", "RecipesBase", "RecursiveArrayTools", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "cf334da651a6e42c50e1477d6ab978f1b8be3057" +git-tree-sha1 = "ee954c8b9d348b7a8a6aec5f28288bf5adecd4ee" uuid = "459566f4-90b8-5000-8ac3-15dfb0a30def" -version = "2.36.1" +version = "2.37.0" [deps.DiffEqCallbacks.weakdeps] OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" @@ -1013,9 +1013,9 @@ version = "1.14.3+1" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "abbbb9ec3afd783a7cbd82ef01dcd088ea051398" +git-tree-sha1 = "ac7b73d562b8f4287c3b67b4c66a5395a19c1ae8" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.10.1" +version = "1.10.2" [[deps.HarfBuzz_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] @@ -1023,6 +1023,12 @@ git-tree-sha1 = "129acf094d168394e80ee1dc4bc06ec835e510a3" uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566" version = "2.8.1+1" +[[deps.Hwloc_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "ca0f6bf568b4bfc807e7537f081c81e35ceca114" +uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" +version = "2.10.0+0" + [[deps.HypergeometricFunctions]] deps = ["DualNumbers", "LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"] git-tree-sha1 = "f218fe3736ddf977e0e772bc9a586b2383da2685" @@ -1088,9 +1094,9 @@ version = "1.4.0" [[deps.Insolation]] deps = ["Artifacts", "Dates", "DelimitedFiles", "Interpolations"] -git-tree-sha1 = "2aaf998568ab59643cefb0fc17eba42f9d5bef37" +git-tree-sha1 = "e5bd2e08d94737b3acd1c1c4e6ab737d2494571c" uuid = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8" -version = "0.9.0" +version = "0.9.1" weakdeps = ["CLIMAParameters"] [deps.Insolation.extensions] @@ -1128,13 +1134,14 @@ uuid = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253" version = "0.20.9" [[deps.IntervalSets]] -git-tree-sha1 = "581191b15bcb56a2aa257e9c160085d0f128a380" +git-tree-sha1 = "dba9ddf07f77f60450fe5d2e2beb9854d9a49bd0" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.7.9" -weakdeps = ["Random", "Statistics"] +version = "0.7.10" +weakdeps = ["Random", "RecipesBase", "Statistics"] [deps.IntervalSets.extensions] IntervalSetsRandomExt = "Random" + IntervalSetsRecipesBaseExt = "RecipesBase" IntervalSetsStatisticsExt = "Statistics" [[deps.InvertedIndices]] @@ -1165,9 +1172,9 @@ version = "1.0.0" [[deps.JET]] deps = ["InteractiveUtils", "JuliaInterpreter", "LoweredCodeUtils", "MacroTools", "Pkg", "PrecompileTools", "Preferences", "Revise", "Test"] -git-tree-sha1 = "9afd2f990fe4236c6e7c44f0e32dc981586fd737" +git-tree-sha1 = "6ff76fc594051832ce91078686bc0d3def6d42c5" uuid = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" -version = "0.8.28" +version = "0.8.29" [[deps.JLD2]] deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "PrecompileTools", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] @@ -1516,10 +1523,10 @@ version = "0.20.19" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" [[deps.MPICH_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "2ee75365ca243c1a39d467e35ffd3d4d32eef11e" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "656036b9ed6f942d35e536e249600bc31d0f9df8" uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4" -version = "4.1.2+1" +version = "4.2.0+0" [[deps.MPIPreferences]] deps = ["Libdl", "Preferences"] @@ -1528,10 +1535,10 @@ uuid = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267" version = "0.1.10" [[deps.MPItrampoline_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "8eeb3c73bbc0ca203d0dc8dad4008350bbe5797b" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "77c3bd69fdb024d75af38713e883d0f249ce19c2" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" -version = "5.3.1+1" +version = "5.3.2+0" [[deps.MacroTools]] deps = ["Markdown", "Random"] @@ -1567,9 +1574,9 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[deps.MathOptInterface]] deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "DataStructures", "ForwardDiff", "JSON", "LinearAlgebra", "MutableArithmetics", "NaNMath", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays", "SpecialFunctions", "Test", "Unicode"] -git-tree-sha1 = "8b40681684df46785a0012d352982e22ac3be59e" +git-tree-sha1 = "569a003f93d7c64068d3afaab908d21f67a22cd5" uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" -version = "1.25.2" +version = "1.25.3" [[deps.MathTeXEngine]] deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "UnicodeFun"] @@ -1595,9 +1602,9 @@ version = "0.3.2" [[deps.MicrosoftMPI_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "b01beb91d20b0d1312a9471a36017b5b339d26de" +git-tree-sha1 = "f12a29c4400ba812841c6ace3f4efbb6dbb3ba01" uuid = "9237b28f-5490-5468-be7b-bb81f5f5e6cf" -version = "10.1.4+1" +version = "10.1.4+2" [[deps.Missings]] deps = ["DataAPI"] @@ -1635,9 +1642,9 @@ version = "0.4.4" [[deps.MutableArithmetics]] deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "806eea990fb41f9b36f1253e5697aa645bf6a9f8" +git-tree-sha1 = "302fd161eb1c439e4115b51ae456da4e9984f130" uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" -version = "1.4.0" +version = "1.4.1" [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] @@ -2057,11 +2064,11 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] deps = ["Adapt", "Artifacts", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "ef8bd48fef527361dca693c961271da6e424ff01" +git-tree-sha1 = "411d7064df9a123db8d2878539b7cc86158ed215" repo-rev = "main" repo-url = "https://github.com/CliMA/RRTMGP.jl.git" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.11.0" +version = "0.12.0" weakdeps = ["CLIMAParameters"] [deps.RRTMGP.extensions] @@ -2177,9 +2184,9 @@ version = "0.4.0+0" [[deps.RootSolvers]] deps = ["ForwardDiff"] -git-tree-sha1 = "833d9914e748ca9329b762a82ec912897975f8d8" +git-tree-sha1 = "a87fd671f7a298de98f2f3c5a9cd9890714eb9dd" uuid = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" -version = "0.4.1" +version = "0.4.2" [[deps.RoundingEmulator]] git-tree-sha1 = "40b9edad2e5287e05bd413a38f61a8ff55b9557b" @@ -2203,9 +2210,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"] -git-tree-sha1 = "850d187a1123683aa7e593d474155e132584fb78" +git-tree-sha1 = "a123011b1711f3449bc4e5d66746be5725af92fd" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.24.0" +version = "2.26.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2347,9 +2354,9 @@ weakdeps = ["ChainRulesCore"] [[deps.StableHashTraits]] deps = ["Compat", "PikaParser", "SHA", "Tables", "TupleTools"] -git-tree-sha1 = "60c334d923094a5fa4c2f65899b212261d429323" +git-tree-sha1 = "10dc702932fe05a0e09b8e5955f00794ea1e8b12" uuid = "c5dd0088-6c3f-4803-b00e-f31a60c170fa" -version = "1.1.7" +version = "1.1.8" [[deps.StackViews]] deps = ["OffsetArrays"] @@ -2409,9 +2416,9 @@ version = "0.34.2" [[deps.StatsFuns]] deps = ["HypergeometricFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] -git-tree-sha1 = "f625d686d5a88bcd2b15cd81f18f98186fdc0c9a" +git-tree-sha1 = "cef0472124fab0695b58ca35a77c6fb942fdab8a" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "1.3.0" +version = "1.3.1" [deps.StatsFuns.extensions] StatsFunsChainRulesCoreExt = "ChainRulesCore" @@ -2456,18 +2463,18 @@ version = "7.2.1+1" [[deps.SurfaceFluxes]] deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] -git-tree-sha1 = "6431256ee7c06ed2900fd46688f355e5a43e90eb" +git-tree-sha1 = "3ded2d347cab67d1727b4d25bb5c99fb4982a868" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" -version = "0.9.1" +version = "0.9.2" weakdeps = ["CLIMAParameters"] [deps.SurfaceFluxes.extensions] CreateParametersExt = "CLIMAParameters" [[deps.SymbolicIndexingInterface]] -git-tree-sha1 = "b3103f4f50a3843e66297a2456921377c78f5e31" +git-tree-sha1 = "dc7186d456f9ff2bef0cb754a59758920f0b2382" uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5" -version = "0.3.5" +version = "0.3.6" [[deps.TOML]] deps = ["Dates"] @@ -2524,9 +2531,9 @@ version = "1.0.1" [[deps.Thermodynamics]] deps = ["DocStringExtensions", "KernelAbstractions", "Random", "RootSolvers"] -git-tree-sha1 = "090a50e507242bd6c85267645186260fe89a1cfe" +git-tree-sha1 = "b484b3da3984316967a00089ed6597e59dc03464" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -version = "0.11.7" +version = "0.12.1" weakdeps = ["CLIMAParameters"] [deps.Thermodynamics.extensions] @@ -2926,9 +2933,9 @@ version = "1.18.0+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "93284c28274d9e75218a416c65ec49d0e0fcdf3d" +git-tree-sha1 = "873b4f805771d3e4bafe63af759a26ea8ca84d14" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.40+0" +version = "1.6.42+0" [[deps.libsixel_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "libpng_jll"] @@ -2944,9 +2951,9 @@ version = "1.3.7+1" [[deps.libzip_jll]] deps = ["Artifacts", "Bzip2_jll", "GnuTLS_jll", "JLLWrappers", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "9a6ac803f3c17fe7cf66430a8bfc7186800f08a4" +git-tree-sha1 = "3282b7d16ae7ac3e57ec2f3fa8fafb564d8f9f7f" uuid = "337d8026-41b4-5cde-a456-74a10e5b31d1" -version = "1.9.2+0" +version = "1.10.1+0" [[deps.mtdev_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] diff --git a/examples/Project.toml b/examples/Project.toml index 68710cda74..3e6f1bf24f 100644 --- a/examples/Project.toml +++ b/examples/Project.toml @@ -72,7 +72,6 @@ ClimaCorePlots = "0.2" ClimaCoreSpectra = "0.1" ClimaCoreTempestRemap = "0.3" ClimaCoreVTK = "0.7" -CloudMicrophysics = "0.15.2" ForwardDiff = "0.10" Glob = "1" JET = "0.7, 0.8" diff --git a/perf/Manifest.toml b/perf/Manifest.toml index 594d01a3c7..6c6a11394b 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.0" manifest_format = "2.0" -project_hash = "1d8f4a8a2026ad716fd7e6ca64b9174c978e2ab8" +project_hash = "9d918023d68058ca24fe2bb946d5f6395f5daef8" [[deps.ADTypes]] git-tree-sha1 = "41c37aa88889c171f1300ceac1313c06e891d245" @@ -64,9 +64,9 @@ version = "1.1.1" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra", "Requires", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "bbec08a37f8722786d87bedf84eae19c020c4efa" +git-tree-sha1 = "c5aeb516a84459e0318a02507d2261edad97eb75" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "7.7.0" +version = "7.7.1" [deps.ArrayInterface.extensions] ArrayInterfaceBandedMatricesExt = "BandedMatrices" @@ -205,9 +205,9 @@ version = "0.1.2" [[deps.CLIMAParameters]] deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "cf4f5ee75576ae855eca7da064540ce40b9a04c1" +git-tree-sha1 = "10473c458cd10f3808a438492447ca10d4dde7d0" uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" -version = "0.8.6" +version = "0.9.0" [[deps.CPUSummary]] deps = ["CpuId", "IfElse", "PrecompileTools", "Static"] @@ -369,9 +369,9 @@ version = "0.1.12" [[deps.CloudMicrophysics]] deps = ["CLIMAParameters", "DocStringExtensions", "ForwardDiff", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "0c0be34fad945b95fd3c94cca9003bacae990ccf" +git-tree-sha1 = "71cfda20196c7a81f3798de59f3830c78f4c17b0" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.15.2" +version = "0.16.0" [[deps.CodeTracking]] deps = ["InteractiveUtils", "UUIDs"] @@ -497,9 +497,9 @@ version = "4.1.1" [[deps.Cthulhu]] deps = ["CodeTracking", "FoldingTrees", "InteractiveUtils", "JuliaSyntax", "PrecompileTools", "Preferences", "REPL", "TypedSyntax", "UUIDs", "Unicode", "WidthLimitedIO"] -git-tree-sha1 = "80d3f983c8553237a55eb87181364734462dfc9e" +git-tree-sha1 = "50304028b5365257e6d1d92f7971c6a1507f6d0c" uuid = "f68482b8-f384-11e8-15f7-abe071a5a75f" -version = "2.10.2" +version = "2.11.0" [[deps.CubedSphere]] deps = ["Elliptic", "FFTW", "Printf", "ProgressBars", "SpecialFunctions", "TaylorSeries", "Test"] @@ -559,9 +559,9 @@ version = "0.1.0+0" [[deps.DiffEqBase]] deps = ["ArrayInterface", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"] -git-tree-sha1 = "eaf775818162923a0d509b10ca9ef809adfb43e8" +git-tree-sha1 = "3089c8295ab6d7c728cd6929121c1b4567457306" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" -version = "6.146.2" +version = "6.147.0" [deps.DiffEqBase.extensions] DiffEqBaseChainRulesCoreExt = "ChainRulesCore" @@ -589,9 +589,9 @@ version = "6.146.2" [[deps.DiffEqCallbacks]] deps = ["DataStructures", "DiffEqBase", "ForwardDiff", "Functors", "LinearAlgebra", "Markdown", "NLsolve", "Parameters", "RecipesBase", "RecursiveArrayTools", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "cf334da651a6e42c50e1477d6ab978f1b8be3057" +git-tree-sha1 = "ee954c8b9d348b7a8a6aec5f28288bf5adecd4ee" uuid = "459566f4-90b8-5000-8ac3-15dfb0a30def" -version = "2.36.1" +version = "2.37.0" [deps.DiffEqCallbacks.weakdeps] OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" @@ -1054,9 +1054,9 @@ version = "1.14.3+1" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "abbbb9ec3afd783a7cbd82ef01dcd088ea051398" +git-tree-sha1 = "ac7b73d562b8f4287c3b67b4c66a5395a19c1ae8" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.10.1" +version = "1.10.2" [[deps.HarfBuzz_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] @@ -1064,6 +1064,12 @@ git-tree-sha1 = "129acf094d168394e80ee1dc4bc06ec835e510a3" uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566" version = "2.8.1+1" +[[deps.Hwloc_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "ca0f6bf568b4bfc807e7537f081c81e35ceca114" +uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" +version = "2.10.0+0" + [[deps.HypergeometricFunctions]] deps = ["DualNumbers", "LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"] git-tree-sha1 = "f218fe3736ddf977e0e772bc9a586b2383da2685" @@ -1129,9 +1135,9 @@ version = "1.4.0" [[deps.Insolation]] deps = ["Artifacts", "Dates", "DelimitedFiles", "Interpolations"] -git-tree-sha1 = "2aaf998568ab59643cefb0fc17eba42f9d5bef37" +git-tree-sha1 = "e5bd2e08d94737b3acd1c1c4e6ab737d2494571c" uuid = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8" -version = "0.9.0" +version = "0.9.1" weakdeps = ["CLIMAParameters"] [deps.Insolation.extensions] @@ -1169,13 +1175,14 @@ uuid = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253" version = "0.20.9" [[deps.IntervalSets]] -git-tree-sha1 = "581191b15bcb56a2aa257e9c160085d0f128a380" +git-tree-sha1 = "dba9ddf07f77f60450fe5d2e2beb9854d9a49bd0" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.7.9" -weakdeps = ["Random", "Statistics"] +version = "0.7.10" +weakdeps = ["Random", "RecipesBase", "Statistics"] [deps.IntervalSets.extensions] IntervalSetsRandomExt = "Random" + IntervalSetsRecipesBaseExt = "RecipesBase" IntervalSetsStatisticsExt = "Statistics" [[deps.InvertedIndices]] @@ -1206,9 +1213,9 @@ version = "1.0.0" [[deps.JET]] deps = ["InteractiveUtils", "JuliaInterpreter", "LoweredCodeUtils", "MacroTools", "Pkg", "PrecompileTools", "Preferences", "Revise", "Test"] -git-tree-sha1 = "9afd2f990fe4236c6e7c44f0e32dc981586fd737" +git-tree-sha1 = "6ff76fc594051832ce91078686bc0d3def6d42c5" uuid = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" -version = "0.8.28" +version = "0.8.29" [[deps.JLD2]] deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "PrecompileTools", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] @@ -1568,10 +1575,10 @@ version = "0.20.19" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" [[deps.MPICH_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "2ee75365ca243c1a39d467e35ffd3d4d32eef11e" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "656036b9ed6f942d35e536e249600bc31d0f9df8" uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4" -version = "4.1.2+1" +version = "4.2.0+0" [[deps.MPIPreferences]] deps = ["Libdl", "Preferences"] @@ -1580,10 +1587,10 @@ uuid = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267" version = "0.1.10" [[deps.MPItrampoline_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "8eeb3c73bbc0ca203d0dc8dad4008350bbe5797b" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "77c3bd69fdb024d75af38713e883d0f249ce19c2" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" -version = "5.3.1+1" +version = "5.3.2+0" [[deps.MacroTools]] deps = ["Markdown", "Random"] @@ -1619,9 +1626,9 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[deps.MathOptInterface]] deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "DataStructures", "ForwardDiff", "JSON", "LinearAlgebra", "MutableArithmetics", "NaNMath", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays", "SpecialFunctions", "Test", "Unicode"] -git-tree-sha1 = "8b40681684df46785a0012d352982e22ac3be59e" +git-tree-sha1 = "569a003f93d7c64068d3afaab908d21f67a22cd5" uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" -version = "1.25.2" +version = "1.25.3" [[deps.MathTeXEngine]] deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "UnicodeFun"] @@ -1647,9 +1654,9 @@ version = "0.3.2" [[deps.MicrosoftMPI_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "b01beb91d20b0d1312a9471a36017b5b339d26de" +git-tree-sha1 = "f12a29c4400ba812841c6ace3f4efbb6dbb3ba01" uuid = "9237b28f-5490-5468-be7b-bb81f5f5e6cf" -version = "10.1.4+1" +version = "10.1.4+2" [[deps.Missings]] deps = ["DataAPI"] @@ -1687,9 +1694,9 @@ version = "0.4.4" [[deps.MutableArithmetics]] deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "806eea990fb41f9b36f1253e5697aa645bf6a9f8" +git-tree-sha1 = "302fd161eb1c439e4115b51ae456da4e9984f130" uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" -version = "1.4.0" +version = "1.4.1" [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] @@ -2121,9 +2128,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] deps = ["Adapt", "Artifacts", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "3493869e9bbe529dfd8dada02b455847bdb46f27" +git-tree-sha1 = "411d7064df9a123db8d2878539b7cc86158ed215" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.11.0" +version = "0.12.0" weakdeps = ["CLIMAParameters"] [deps.RRTMGP.extensions] @@ -2245,9 +2252,9 @@ version = "0.4.0+0" [[deps.RootSolvers]] deps = ["ForwardDiff"] -git-tree-sha1 = "833d9914e748ca9329b762a82ec912897975f8d8" +git-tree-sha1 = "a87fd671f7a298de98f2f3c5a9cd9890714eb9dd" uuid = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" -version = "0.4.1" +version = "0.4.2" [[deps.RoundingEmulator]] git-tree-sha1 = "40b9edad2e5287e05bd413a38f61a8ff55b9557b" @@ -2271,9 +2278,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"] -git-tree-sha1 = "850d187a1123683aa7e593d474155e132584fb78" +git-tree-sha1 = "a123011b1711f3449bc4e5d66746be5725af92fd" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.24.0" +version = "2.26.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2427,9 +2434,9 @@ weakdeps = ["ChainRulesCore"] [[deps.StableHashTraits]] deps = ["Compat", "PikaParser", "SHA", "Tables", "TupleTools"] -git-tree-sha1 = "60c334d923094a5fa4c2f65899b212261d429323" +git-tree-sha1 = "10dc702932fe05a0e09b8e5955f00794ea1e8b12" uuid = "c5dd0088-6c3f-4803-b00e-f31a60c170fa" -version = "1.1.7" +version = "1.1.8" [[deps.StackViews]] deps = ["OffsetArrays"] @@ -2489,9 +2496,9 @@ version = "0.34.2" [[deps.StatsFuns]] deps = ["HypergeometricFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] -git-tree-sha1 = "f625d686d5a88bcd2b15cd81f18f98186fdc0c9a" +git-tree-sha1 = "cef0472124fab0695b58ca35a77c6fb942fdab8a" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "1.3.0" +version = "1.3.1" [deps.StatsFuns.extensions] StatsFunsChainRulesCoreExt = "ChainRulesCore" @@ -2536,18 +2543,18 @@ version = "7.2.1+1" [[deps.SurfaceFluxes]] deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] -git-tree-sha1 = "6431256ee7c06ed2900fd46688f355e5a43e90eb" +git-tree-sha1 = "3ded2d347cab67d1727b4d25bb5c99fb4982a868" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" -version = "0.9.1" +version = "0.9.2" weakdeps = ["CLIMAParameters"] [deps.SurfaceFluxes.extensions] CreateParametersExt = "CLIMAParameters" [[deps.SymbolicIndexingInterface]] -git-tree-sha1 = "b3103f4f50a3843e66297a2456921377c78f5e31" +git-tree-sha1 = "dc7186d456f9ff2bef0cb754a59758920f0b2382" uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5" -version = "0.3.5" +version = "0.3.6" [[deps.TOML]] deps = ["Dates"] @@ -2604,9 +2611,9 @@ version = "1.0.1" [[deps.Thermodynamics]] deps = ["DocStringExtensions", "KernelAbstractions", "Random", "RootSolvers"] -git-tree-sha1 = "090a50e507242bd6c85267645186260fe89a1cfe" +git-tree-sha1 = "b484b3da3984316967a00089ed6597e59dc03464" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -version = "0.11.7" +version = "0.12.1" weakdeps = ["CLIMAParameters"] [deps.Thermodynamics.extensions] @@ -3018,9 +3025,9 @@ version = "1.18.0+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "93284c28274d9e75218a416c65ec49d0e0fcdf3d" +git-tree-sha1 = "873b4f805771d3e4bafe63af759a26ea8ca84d14" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.40+0" +version = "1.6.42+0" [[deps.libsixel_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "libpng_jll"] @@ -3036,9 +3043,9 @@ version = "1.3.7+1" [[deps.libzip_jll]] deps = ["Artifacts", "Bzip2_jll", "GnuTLS_jll", "JLLWrappers", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "9a6ac803f3c17fe7cf66430a8bfc7186800f08a4" +git-tree-sha1 = "3282b7d16ae7ac3e57ec2f3fa8fafb564d8f9f7f" uuid = "337d8026-41b4-5cde-a456-74a10e5b31d1" -version = "1.9.2+0" +version = "1.10.1+0" [[deps.mtdev_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] diff --git a/perf/Project.toml b/perf/Project.toml index d7982fe2bc..e6d8740433 100644 --- a/perf/Project.toml +++ b/perf/Project.toml @@ -78,7 +78,6 @@ ClimaCorePlots = "0.2" ClimaCoreSpectra = "0.1" ClimaCoreTempestRemap = "0.3" ClimaCoreVTK = "0.7" -CloudMicrophysics = "0.15.2" DiffEqNoiseProcess = "5" ForwardDiff = "0.10" Glob = "1" diff --git a/src/parameterized_tendencies/radiation/RRTMGPInterface.jl b/src/parameterized_tendencies/radiation/RRTMGPInterface.jl index 537aaa450d..f54edb3dc0 100644 --- a/src/parameterized_tendencies/radiation/RRTMGPInterface.jl +++ b/src/parameterized_tendencies/radiation/RRTMGPInterface.jl @@ -640,7 +640,7 @@ function RRTMGPModel( src_sw = flux_sw = fluxb_sw = bcs_sw = nothing else if radiation_mode isa GrayRadiation - nbnd_sw = 1 + nbnd_sw = 1 else local lookup_sw, idx_gases data_loader(joinpath("lookup_tables", "clearsky_sw.nc")) do ds @@ -727,7 +727,8 @@ function RRTMGPModel( set_and_save!(similar(flux_lw2.flux_net), "face_clear_flux", t...) end if !(radiation_mode isa GrayRadiation) - @assert RRTMGP.LookUpTables.get_n_gases(lookup_lw) == RRTMGP.LookUpTables.get_n_gases(lookup_sw) + @assert RRTMGP.LookUpTables.get_n_gases(lookup_lw) == + RRTMGP.LookUpTables.get_n_gases(lookup_sw) @assert lookup_lw.p_ref_min == lookup_sw.p_ref_min end end diff --git a/src/parameters/create_parameters.jl b/src/parameters/create_parameters.jl index fa83f2ec32..231248b9a0 100644 --- a/src/parameters/create_parameters.jl +++ b/src/parameters/create_parameters.jl @@ -50,24 +50,13 @@ function create_parameter_set(config::AtmosConfig) thermodynamics_params = ThermodynamicsParameters(toml_dict) TP = typeof(thermodynamics_params) - # TODO: update to the RRTMGP package extension - rrtmgp_name_map = (; - :gravitational_acceleration => :grav, - :molar_mass_dry_air => :molmass_dryair, - :molar_mass_water => :molmass_water, - :gas_constant => :gas_constant, - :adiabatic_exponent_dry_air => :kappa_d, - :stefan_boltzmann_constant => :Stefan, - :avogadro_constant => :avogad, - ) - parameters = CP.get_parameter_values(toml_dict, rrtmgp_name_map, "RRTMGP") - rrtmgp_params = RRTMGPParameters{FT}(; parameters...) + rrtmgp_params = RRTMGPParameters(toml_dict) RP = typeof(rrtmgp_params) insolation_params = InsolationParameters(toml_dict) IP = typeof(insolation_params) - water_params = CM.Parameters.WaterProperties(FT, toml_dict) + water_params = CM.Parameters.WaterProperties(toml_dict) WP = typeof(water_params) surface_fluxes_params = @@ -80,27 +69,21 @@ function create_parameter_set(config::AtmosConfig) toml_dict["precipitation_timescale"]["value"] = FT(CA.time_to_seconds(parsed_args["dt"])) end - # Force logging because CloudMicrophysics doesn't - CP.get_parameter_values( - toml_dict, - "precipitation_timescale", - "CloudMicrophysics", - ) precip_model = parsed_args["precip_model"] microphysics_params = if precip_model == nothing || precip_model == "nothing" nothing elseif precip_model == "0M" - CM.Parameters.Parameters0M(FT, toml_dict) + CM.Parameters.Parameters0M(toml_dict) elseif precip_model == "1M" (; - cl = CM.Parameters.CloudLiquid(FT, toml_dict), - ci = CM.Parameters.CloudIce(FT, toml_dict), - pr = CM.Parameters.Rain(FT, toml_dict), - ps = CM.Parameters.Snow(FT, toml_dict), - ce = CM.Parameters.CollisionEff(FT, toml_dict), - tv = CM.Parameters.Blk1MVelType(FT, toml_dict), - aps = CM.Parameters.AirProperties(FT, toml_dict), + cl = CM.Parameters.CloudLiquid(toml_dict), + ci = CM.Parameters.CloudIce(toml_dict), + pr = CM.Parameters.Rain(toml_dict), + ps = CM.Parameters.Snow(toml_dict), + ce = CM.Parameters.CollisionEff(toml_dict), + tv = CM.Parameters.Blk1MVelType(toml_dict), + aps = CM.Parameters.AirProperties(toml_dict), ) else error("Invalid precip_model $(precip_model)") diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl index cff432073b..77e7d21add 100644 --- a/src/solver/type_getters.jl +++ b/src/solver/type_getters.jl @@ -702,8 +702,7 @@ function get_simulation(config::AtmosConfig) CP.log_parameter_information( config.toml_dict, joinpath(output_dir, "$(job_id)_parameters.toml"), - # Strict logging temporarily disabled for compatibility with CloudMicrophysics overrides - # strict = true, + strict = true, ) YAML.write_file(joinpath(output_dir, "$job_id.yml"), config.parsed_args) diff --git a/test/Project.toml b/test/Project.toml index 655a00145f..05c4f7dbeb 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -72,7 +72,6 @@ ClimaCorePlots = "0.2" ClimaCoreSpectra = "0.1" ClimaCoreTempestRemap = "0.3" ClimaCoreVTK = "0.7" -CloudMicrophysics = "0.15.2" Dierckx = "0.5" DiffEqNoiseProcess = "5" ForwardDiff = "0.10" From 4ef9a5d73b9d2cb2a020adc3242d3e92ac0c838c Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Thu, 15 Feb 2024 18:27:55 -0800 Subject: [PATCH 4/5] rm manifest --- .buildkite/JuliaManifest.toml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .buildkite/JuliaManifest.toml diff --git a/.buildkite/JuliaManifest.toml b/.buildkite/JuliaManifest.toml deleted file mode 100644 index 49def1130b..0000000000 --- a/.buildkite/JuliaManifest.toml +++ /dev/null @@ -1,7 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -julia_version = "1.10.0" -manifest_format = "2.0" -project_hash = "da39a3ee5e6b4b0d3255bfef95601890afd80709" - -[deps] From 698bde093dc06e849eeb834285157f42ab6d68f0 Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Thu, 15 Feb 2024 18:58:19 -0800 Subject: [PATCH 5/5] fix microphys constr --- src/parameters/create_parameters.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parameters/create_parameters.jl b/src/parameters/create_parameters.jl index 231248b9a0..1af0c040af 100644 --- a/src/parameters/create_parameters.jl +++ b/src/parameters/create_parameters.jl @@ -82,7 +82,7 @@ function create_parameter_set(config::AtmosConfig) pr = CM.Parameters.Rain(toml_dict), ps = CM.Parameters.Snow(toml_dict), ce = CM.Parameters.CollisionEff(toml_dict), - tv = CM.Parameters.Blk1MVelType(toml_dict), + tv = CM.Parameters.Blk1MVelType(FT, toml_dict), aps = CM.Parameters.AirProperties(toml_dict), ) else