From 5582838da1a24d7188ab4584a57775f1f117d464 Mon Sep 17 00:00:00 2001 From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com> Date: Wed, 3 Jul 2024 15:13:28 -0700 Subject: [PATCH] Change radiation_model to rrtmgp_model - Config fixes following changes to ClimaAtmos idealized_insolation > insolation - new options: timevarying, rcemipii, idealized - Update atmosphere component to match new insolation structure Update ClimaLand compat to 0.13 ClimaCoupler update to 0.1.1 --- .buildkite/pipeline.yml | 2 + config/benchmark_configs/climaatmos.yml | 2 +- .../benchmark_configs/climaatmos_diagedmf.yml | 2 +- .../climaatmos_diagedmf_io.yml | 2 +- ...gpu_amip_target_topo_diagedmf_shortrun.yml | 2 +- .../target_params_in_slab_test2.yml | 2 +- .../target_params_in_slab_test3.yml | 2 +- experiments/ClimaEarth/Manifest.toml | 269 +++++++++--------- experiments/ClimaEarth/Project.toml | 4 +- .../components/atmosphere/climaatmos.jl | 24 +- .../ClimaEarth/user_io/user_diagnostics.jl | 8 +- perf/Project.toml | 4 +- 12 files changed, 168 insertions(+), 155 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index e7c532d4cb..a8433211eb 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -44,11 +44,13 @@ steps: - "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.status()'" - echo "--- Instantiate ClimaEarth env" + - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.develop(path=\".\")'" - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'" - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.precompile()'" - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.status()'" - echo "--- Instantiate perf env" + - "julia --project=perf/ -e 'using Pkg; Pkg.develop(path=\".\")'" - "julia --project=perf/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'" - "julia --project=perf/ -e 'using Pkg; Pkg.precompile()'" - "julia --project=perf/ -e 'using Pkg; Pkg.status()'" diff --git a/config/benchmark_configs/climaatmos.yml b/config/benchmark_configs/climaatmos.yml index d4c3784256..a0a58737e5 100644 --- a/config/benchmark_configs/climaatmos.yml +++ b/config/benchmark_configs/climaatmos.yml @@ -8,7 +8,7 @@ dt_save_to_sol: "Inf" dz_bottom: 30.0 dz_top: 3000.0 h_elem: 30 -idealized_insolation: false +insolation: "timevarying" implicit_diffusion: true moist: equil output_default_diagnostics: false diff --git a/config/benchmark_configs/climaatmos_diagedmf.yml b/config/benchmark_configs/climaatmos_diagedmf.yml index b3208c3f5a..c659b0d45b 100644 --- a/config/benchmark_configs/climaatmos_diagedmf.yml +++ b/config/benchmark_configs/climaatmos_diagedmf.yml @@ -14,7 +14,7 @@ edmfx_sgs_diffusive_flux: true edmfx_sgs_mass_flux: true edmfx_upwinding: first_order h_elem: 30 -idealized_insolation: false +insolation: "timevarying" implicit_diffusion: true moist: equil ode_algo: ARS343 diff --git a/config/benchmark_configs/climaatmos_diagedmf_io.yml b/config/benchmark_configs/climaatmos_diagedmf_io.yml index 847d21d37f..cdeb49caf0 100644 --- a/config/benchmark_configs/climaatmos_diagedmf_io.yml +++ b/config/benchmark_configs/climaatmos_diagedmf_io.yml @@ -14,7 +14,7 @@ edmfx_sgs_diffusive_flux: true edmfx_sgs_mass_flux: true edmfx_upwinding: first_order h_elem: 30 -idealized_insolation: false +insolation: "timevarying" implicit_diffusion: true moist: equil ode_algo: ARS343 diff --git a/config/ci_configs/gpu_amip_target_topo_diagedmf_shortrun.yml b/config/ci_configs/gpu_amip_target_topo_diagedmf_shortrun.yml index fd5e182296..4942634994 100644 --- a/config/ci_configs/gpu_amip_target_topo_diagedmf_shortrun.yml +++ b/config/ci_configs/gpu_amip_target_topo_diagedmf_shortrun.yml @@ -10,7 +10,7 @@ dt_save_state_to_disk: "1days" dt_save_to_sol: "1days" energy_check: false hourly_checkpoint: true -idealized_insolation: false +insolation: "timevarying" land_albedo_type: "map_temporal" mode_name: "amip" mono_surface: false diff --git a/config/ci_configs/target_params_in_slab_test2.yml b/config/ci_configs/target_params_in_slab_test2.yml index e7c2eb31d3..0d00da9679 100644 --- a/config/ci_configs/target_params_in_slab_test2.yml +++ b/config/ci_configs/target_params_in_slab_test2.yml @@ -8,7 +8,7 @@ dt_rad: "6hours" dt_save_to_sol: "3600secs" energy_check: true h_elem: 6 -idealized_insolation: false +insolation: "timevarying" mode_name: "slabplanet" moist: "equil" mono_surface: true diff --git a/config/ci_configs/target_params_in_slab_test3.yml b/config/ci_configs/target_params_in_slab_test3.yml index e7c2eb31d3..0d00da9679 100644 --- a/config/ci_configs/target_params_in_slab_test3.yml +++ b/config/ci_configs/target_params_in_slab_test3.yml @@ -8,7 +8,7 @@ dt_rad: "6hours" dt_save_to_sol: "3600secs" energy_check: true h_elem: 6 -idealized_insolation: false +insolation: "timevarying" mode_name: "slabplanet" moist: "equil" mono_surface: true diff --git a/experiments/ClimaEarth/Manifest.toml b/experiments/ClimaEarth/Manifest.toml index d0501096f1..4824074df4 100644 --- a/experiments/ClimaEarth/Manifest.toml +++ b/experiments/ClimaEarth/Manifest.toml @@ -2,12 +2,12 @@ julia_version = "1.10.3" manifest_format = "2.0" -project_hash = "21c747b53577d075d3bfa396efb04bb9b1e1c965" +project_hash = "04e30818cc020522de4d9492d204d9b140037181" [[deps.ADTypes]] -git-tree-sha1 = "3a6511b6e54550bcbc986c560921a8cd7761fcd8" +git-tree-sha1 = "7a6b285f217ba92b5b474b783b4c2e8cf8218aaa" uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -version = "1.5.1" +version = "1.5.3" weakdeps = ["ChainRulesCore", "EnzymeCore"] [deps.ADTypes.extensions] @@ -91,9 +91,9 @@ version = "0.4.0" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "ed2ec3c9b483842ae59cd273834e5b46206d6dda" +git-tree-sha1 = "5c9b74c973181571deb6442d41e5c902e6b9f38e" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "7.11.0" +version = "7.12.0" [deps.ArrayInterface.extensions] ArrayInterfaceBandedMatricesExt = "BandedMatrices" @@ -119,9 +119,9 @@ version = "7.11.0" [[deps.ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "600078184f7de14b3e60efe13fc0ba5c59f6dca5" +git-tree-sha1 = "ce2ca959f932f5dad70697dd93133d1167cf1e4e" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.10.0" +version = "1.10.2" weakdeps = ["SparseArrays"] [deps.ArrayLayouts.extensions] @@ -137,10 +137,10 @@ version = "0.2.0" uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" [[deps.AtmosphericProfilesLibrary]] -deps = ["Dierckx", "LinearAlgebra"] -git-tree-sha1 = "5c63ec6a9d190d2c10bb2045a8ccbe3a45cf7b88" +deps = ["Interpolations", "LinearAlgebra"] +git-tree-sha1 = "4f5654bb77c179b6021c21c25ad336fe886258f6" uuid = "86bc3604-9858-485a-bdbe-831ec50de11d" -version = "0.1.5" +version = "0.1.7" [[deps.Atomix]] deps = ["UnsafeAtomics"] @@ -150,9 +150,9 @@ version = "0.1.0" [[deps.Automa]] deps = ["PrecompileTools", "TranscodingStreams"] -git-tree-sha1 = "588e0d680ad1d7201d4c6a804dcb1cd9cba79fbb" +git-tree-sha1 = "014bc22d6c400a7703c0f5dc1fdc302440cf88be" uuid = "67c07d97-cdcb-5c2c-af73-a7f9c32a568b" -version = "1.0.3" +version = "1.0.4" [[deps.AxisAlgorithms]] deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"] @@ -192,9 +192,9 @@ version = "0.1.9" [[deps.BitTwiddlingConvenienceFunctions]] deps = ["Static"] -git-tree-sha1 = "0c5f81f47bbbcf4aea7b2959135713459170798b" +git-tree-sha1 = "f21cfd4950cb9f0587d5067e69405ad2acd27b87" uuid = "62783981-4cbd-42fc-bca8-16325de8dc4b" -version = "0.1.5" +version = "0.1.6" [[deps.BlockArrays]] deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra"] @@ -227,9 +227,9 @@ version = "0.1.3" [[deps.CPUSummary]] deps = ["CpuId", "IfElse", "PrecompileTools", "Static"] -git-tree-sha1 = "585a387a490f1c4bd88be67eea15b93da5e85db7" +git-tree-sha1 = "5a97e67919535d6841172016c9530fd69494e5ec" uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9" -version = "0.2.5" +version = "0.2.6" [[deps.CRC32c]] uuid = "8bf52ea8-c179-5cab-976a-9e18b702a9bc" @@ -260,9 +260,9 @@ weakdeps = ["ChainRulesCore", "EnzymeCore", "SpecialFunctions"] [[deps.CUDA_Driver_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"] -git-tree-sha1 = "c48f9da18efd43b6b7adb7ee1f93fe5f2926c339" +git-tree-sha1 = "97df9d4d6be8ac6270cb8fd3b8fc413690820cbd" uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc" -version = "0.9.0+0" +version = "0.9.1+1" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] @@ -272,9 +272,9 @@ version = "0.3.4" [[deps.CUDA_Runtime_jll]] deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] -git-tree-sha1 = "bcba305388e16aa5c879e896726db9e71b4942c6" +git-tree-sha1 = "afea94249b821dc754a8ca6695d3daed851e1f5a" uuid = "76a88914-d11a-5bdc-97e0-2f5a05c973a2" -version = "0.14.0+1" +version = "0.14.1+0" [[deps.Cairo]] deps = ["Cairo_jll", "Colors", "Glib_jll", "Graphics", "Libdl", "Pango_jll"] @@ -312,9 +312,9 @@ weakdeps = ["SparseArrays"] [[deps.ClimaAnalysis]] deps = ["NCDatasets", "OrderedCollections", "Reexport", "Statistics"] -git-tree-sha1 = "69c740df5906f48a5739588d7dadf772311d8b7d" +git-tree-sha1 = "9282a8cf3086039a2e7e76c35d423fbfa2bde630" uuid = "29b5916a-a76c-4e73-9657-3c8fd22e65e6" -version = "0.5.4" +version = "0.5.5" weakdeps = ["CairoMakie", "GeoMakie"] [deps.ClimaAnalysis.extensions] @@ -323,9 +323,9 @@ weakdeps = ["CairoMakie", "GeoMakie"] [[deps.ClimaAtmos]] deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DocStringExtensions", "FastGaussQuadrature", "Insolation", "Interpolations", "IntervalSets", "Krylov", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "YAML"] -git-tree-sha1 = "8dc04dbc4f24af8b640e661b352e2033f56b8438" +git-tree-sha1 = "ed4497dad2d963c1f98e403dc01c97993c5b9d61" uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" -version = "0.26.2" +version = "0.27.0" [[deps.ClimaComms]] git-tree-sha1 = "2ca8c9ca6131a7be8ca262e6db79bc7aa94ab597" @@ -374,15 +374,15 @@ version = "0.1.0" [[deps.ClimaDiagnostics]] deps = ["Accessors", "ClimaComms", "ClimaCore", "Dates", "NCDatasets", "SciMLBase"] -git-tree-sha1 = "aff194804df0fcfcf69a80c58978b84777272619" +git-tree-sha1 = "228ff3bc4dbd7329ef054f9bfbbe34075234ca25" uuid = "1ecacbb8-0713-4841-9a07-eb5aa8a2d53f" -version = "0.2.2" +version = "0.2.3" [[deps.ClimaLand]] -deps = ["Adapt", "ArtifactWrappers", "ClimaComms", "ClimaCore", "ClimaUtilities", "DataFrames", "Dates", "DocStringExtensions", "Insolation", "Interpolations", "IntervalSets", "LazyArtifacts", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities"] -git-tree-sha1 = "68023b27d41822ee69440814d9c7b913107bd5cf" +deps = ["Adapt", "ArtifactWrappers", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaUtilities", "DataFrames", "Dates", "DocStringExtensions", "Insolation", "Interpolations", "IntervalSets", "LazyArtifacts", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities"] +git-tree-sha1 = "e32c06fbe43a9678300fe106cfbc355ab7f5cd06" uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532" -version = "0.12.4" +version = "0.13.0" [deps.ClimaLand.extensions] CreateParametersExt = "ClimaParams" @@ -399,9 +399,9 @@ version = "0.12.4" [[deps.ClimaParams]] deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "0b5afc75bd3aa7c30d76c2d33b8361f961e86237" +git-tree-sha1 = "b9ab261e1e35437b5a2afdd86c734f40b89fc641" uuid = "5c42b081-d73a-476f-9059-fd94b934656c" -version = "0.10.8" +version = "0.10.9" [[deps.ClimaTimeSteppers]] deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"] @@ -421,9 +421,9 @@ version = "0.7.32" [[deps.ClimaUtilities]] deps = ["Artifacts", "Dates"] -git-tree-sha1 = "9641bc5261562817fad2472f85325d8ae3047ac8" +git-tree-sha1 = "2e171face2f5ee218ebaa9aee7b5e14a28b14366" uuid = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513" -version = "0.1.9" +version = "0.1.10" weakdeps = ["Adapt", "CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Interpolations", "NCDatasets"] [deps.ClimaUtilities.extensions] @@ -437,15 +437,15 @@ weakdeps = ["Adapt", "CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", [[deps.CloseOpenIntervals]] deps = ["Static", "StaticArrayInterface"] -git-tree-sha1 = "70232f82ffaab9dc52585e0dd043b5e0c6b714f1" +git-tree-sha1 = "05ba0d07cd4fd8b7a39541e31a7b0254704ea581" uuid = "fb6a15b2-703c-40df-9091-08a04967cfa9" -version = "0.1.12" +version = "0.1.13" [[deps.CloudMicrophysics]] -deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "QuadGK", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "fa8eb6554284dd04c861f0f91aef12df66f84b3f" +deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "HCubature", "LazyArtifacts", "QuadGK", "RootSolvers", "SpecialFunctions", "Thermodynamics"] +git-tree-sha1 = "5d20d3452be63e6c6da766052ddce072e23b425e" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.20.2" +version = "0.22.1" [deps.CloudMicrophysics.extensions] EmulatorModelsExt = ["DataFrames", "MLJ"] @@ -456,9 +456,9 @@ version = "0.20.2" [[deps.CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] -git-tree-sha1 = "59939d8a997469ee05c4b4944560a820f9ba0d73" +git-tree-sha1 = "b8fe8546d52ca154ac556809e10c75e6e7430ac8" uuid = "944b1d66-785c-5afd-91f1-9de20f533193" -version = "0.7.4" +version = "0.7.5" [[deps.ColorBrewer]] deps = ["Colors", "JSON", "Test"] @@ -494,6 +494,11 @@ git-tree-sha1 = "362a287c3aa50601b0bc359053d5c2468f0e7ce0" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" version = "0.12.11" +[[deps.Combinatorics]] +git-tree-sha1 = "08c8b6831dc00bfea825826be0bc8336fc369860" +uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa" +version = "1.0.2" + [[deps.CommonDataModel]] deps = ["CFTime", "DataStructures", "Dates", "Preferences", "Printf", "Statistics"] git-tree-sha1 = "d6fb5bf939a2753c74984b11434ea25d6c397a58" @@ -542,9 +547,9 @@ version = "0.2.3" [[deps.ConcurrentUtilities]] deps = ["Serialization", "Sockets"] -git-tree-sha1 = "6cbbd4d241d7e6579ab354737f4dd95ca43946e1" +git-tree-sha1 = "ea32b83ca4fefa1768dc84e504cc0a94fb1ab8d1" uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb" -version = "2.4.1" +version = "2.4.2" [[deps.ConstructionBase]] deps = ["LinearAlgebra"] @@ -613,9 +618,9 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" [[deps.DelaunayTriangulation]] deps = ["EnumX", "ExactPredicates", "Random"] -git-tree-sha1 = "1755070db557ec2c37df2664c75600298b0c1cfc" +git-tree-sha1 = "078c716cbb032242df18b960e8b1fec6b1b0b9f9" uuid = "927a84f5-c5f4-47a5-9785-b46e178433df" -version = "1.0.3" +version = "1.0.5" [[deps.DelimitedFiles]] deps = ["Mmap"] @@ -637,9 +642,9 @@ version = "0.1.0+0" [[deps.DiffEqBase]] deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "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 = "2c6b7bf16fd850c551a765e313e7522ba455cbfd" +git-tree-sha1 = "d1e8a4642e28b0945bde6e2e1ac569b9e0abd728" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" -version = "6.151.4" +version = "6.151.5" [deps.DiffEqBase.extensions] DiffEqBaseCUDAExt = "CUDA" @@ -691,9 +696,9 @@ version = "1.15.1" [[deps.DifferentiationInterface]] deps = ["ADTypes", "Compat", "DocStringExtensions", "FillArrays", "LinearAlgebra", "PackageExtensionCompat", "SparseArrays", "SparseMatrixColorings"] -git-tree-sha1 = "23c6df13ad8fcffde4b0596d798911d2e309fc2c" +git-tree-sha1 = "695217e97ee1ce0248f4a56c14af88ba33c585fd" uuid = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63" -version = "0.5.5" +version = "0.5.7" [deps.DifferentiationInterface.extensions] DifferentiationInterfaceChainRulesCoreExt = "ChainRulesCore" @@ -858,9 +863,9 @@ version = "3.3.10+0" [[deps.FastBroadcast]] deps = ["ArrayInterface", "LinearAlgebra", "Polyester", "Static", "StaticArrayInterface", "StrideArraysCore"] -git-tree-sha1 = "2be93e36303143c6fffd07e2222bbade35194d9e" +git-tree-sha1 = "bd19de6fe8a3b18888f35e79832f97544684caa7" uuid = "7034ab61-46d4-4ed7-9d0f-46aef9175898" -version = "0.3.3" +version = "0.3.4" [[deps.FastClosures]] git-tree-sha1 = "acebe244d53ee1b461970f8910c235b259e772ef" @@ -1007,10 +1012,10 @@ deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[deps.GLFW_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"] -git-tree-sha1 = "ff38ba61beff76b8f4acad8ab0c97ef73bb670cb" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll", "xkbcommon_jll"] +git-tree-sha1 = "3f74912a156096bd8fdbef211eff66ab446e7297" uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89" -version = "3.3.9+0" +version = "3.4.0+0" [[deps.GMP_jll]] deps = ["Artifacts", "Libdl"] @@ -1019,9 +1024,9 @@ version = "6.2.1+6" [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "Serialization", "Statistics"] -git-tree-sha1 = "c154546e322a9c73364e8a60430b0f79b812d320" +git-tree-sha1 = "04661708f5301394a1f1be86a07a89e835900db6" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "10.2.0" +version = "10.2.3" [[deps.GPUArraysCore]] deps = ["Adapt"] @@ -1060,15 +1065,15 @@ version = "0.4.2" [[deps.GeoInterface]] deps = ["Extents"] -git-tree-sha1 = "801aef8228f7f04972e596b09d4dba481807c913" +git-tree-sha1 = "9fff8990361d5127b770e3454488360443019bb3" uuid = "cf35fbd7-0cd7-5166-be24-54bfbe79505f" -version = "1.3.4" +version = "1.3.5" [[deps.GeoInterfaceMakie]] deps = ["GeoInterface", "GeometryBasics", "MakieCore"] -git-tree-sha1 = "b6c01b714e37cb6e5102f30544e8185a33f528c1" +git-tree-sha1 = "3f87fd8414194dd25ea5d0371c3950985e3c8d86" uuid = "0edc0954-3250-4c18-859d-ec71c1660c08" -version = "0.1.6" +version = "0.1.8" [[deps.GeoInterfaceRecipes]] deps = ["GeoInterface", "RecipesBase"] @@ -1146,9 +1151,9 @@ version = "1.3.14+0" [[deps.Graphs]] deps = ["ArnoldiMethod", "Compat", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"] -git-tree-sha1 = "334d300809ae0a68ceee3444c6e99ded412bf0b3" +git-tree-sha1 = "ebd18c326fa6cee1efb7da9a3b45cf69da2ed4d9" uuid = "86223c79-3864-5bf0-83f7-82e725a168b6" -version = "1.11.1" +version = "1.11.2" [[deps.GridLayoutBase]] deps = ["GeometryBasics", "InteractiveUtils", "Observables"] @@ -1161,6 +1166,12 @@ git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2" uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe" version = "1.0.2" +[[deps.HCubature]] +deps = ["Combinatorics", "DataStructures", "LinearAlgebra", "QuadGK", "StaticArrays"] +git-tree-sha1 = "10f37537bbd83e52c63abf6393f209dbd641fedc" +uuid = "19dc6840-f33b-545b-b366-655c7e3ffd49" +version = "1.6.0" + [[deps.HDF5]] deps = ["Compat", "HDF5_jll", "Libdl", "MPIPreferences", "Mmap", "Preferences", "Printf", "Random", "Requires", "UUIDs"] git-tree-sha1 = "e856eef26cf5bf2b0f95f8f4fc37553c72c8641c" @@ -1191,15 +1202,15 @@ version = "2.8.1+1" [[deps.HostCPUFeatures]] deps = ["BitTwiddlingConvenienceFunctions", "IfElse", "Libdl", "Static"] -git-tree-sha1 = "eb8fed28f4994600e29beef49744639d985a04b2" +git-tree-sha1 = "8e070b599339d622e9a081d17230d74a5c473293" uuid = "3e5b6fbb-0976-4d2c-9146-d79de83f2fb0" -version = "0.1.16" +version = "0.1.17" [[deps.Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "ca0f6bf568b4bfc807e7537f081c81e35ceca114" +git-tree-sha1 = "1d334207121865ac8c1c97eb7f42d0339e4635bf" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" -version = "2.10.0+0" +version = "2.11.0+0" [[deps.HypergeometricFunctions]] deps = ["DualNumbers", "LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"] @@ -1282,9 +1293,9 @@ weakdeps = ["ClimaParams"] [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "be50fe8df3acbffa0274a744f1a99d29c45a57f4" +git-tree-sha1 = "14eb2b542e748570b56446f4c50fbfb2306ebc45" uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2024.1.0+0" +version = "2024.2.0+0" [[deps.InteractiveUtils]] deps = ["Markdown"] @@ -1355,9 +1366,9 @@ version = "1.0.0" [[deps.JLD2]] deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "PrecompileTools", "Reexport", "Requires", "TranscodingStreams", "UUIDs", "Unicode"] -git-tree-sha1 = "bdbe8222d2f5703ad6a7019277d149ec6d78c301" +git-tree-sha1 = "84642bc18a79d715b39d3724b03cbdd2e7d48c62" uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -version = "0.4.48" +version = "0.4.49" [[deps.JLFzf]] deps = ["Pipe", "REPL", "Random", "fzf_jll"] @@ -1415,9 +1426,9 @@ version = "0.6.0" [[deps.KernelAbstractions]] deps = ["Adapt", "Atomix", "InteractiveUtils", "LinearAlgebra", "MacroTools", "PrecompileTools", "Requires", "SparseArrays", "StaticArrays", "UUIDs", "UnsafeAtomics", "UnsafeAtomicsLLVM"] -git-tree-sha1 = "b8fcefe4418e4a7a2c3aaac883fecddd8efbe286" +git-tree-sha1 = "d0448cebd5919e06ca5edc7a264631790de810ec" uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c" -version = "0.9.21" +version = "0.9.22" weakdeps = ["EnzymeCore"] [deps.KernelAbstractions.extensions] @@ -1502,9 +1513,9 @@ version = "1.3.1" [[deps.Latexify]] deps = ["Format", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "OrderedCollections", "Requires"] -git-tree-sha1 = "e0b5cd21dc1b44ec6e64f351976f961e6f31d6c4" +git-tree-sha1 = "5b0d630f3020b82c0775a51d05895852f8506f50" uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" -version = "0.16.3" +version = "0.16.4" [deps.Latexify.extensions] DataFramesExt = "DataFrames" @@ -1516,9 +1527,9 @@ version = "0.16.3" [[deps.LayoutPointers]] deps = ["ArrayInterface", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface"] -git-tree-sha1 = "62edfee3211981241b57ff1cedf4d74d79519277" +git-tree-sha1 = "a9eaadb366f5493a5654e843864c13d8b107548c" uuid = "10f19ff3-798f-405d-979b-55457f8fc047" -version = "0.1.15" +version = "0.1.17" [[deps.LazyArrays]] deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "MacroTools", "MatrixFactorizations", "SparseArrays"] @@ -1716,9 +1727,9 @@ version = "1.0.3" [[deps.LoopVectorization]] deps = ["ArrayInterface", "CPUSummary", "CloseOpenIntervals", "DocStringExtensions", "HostCPUFeatures", "IfElse", "LayoutPointers", "LinearAlgebra", "OffsetArrays", "PolyesterWeave", "PrecompileTools", "SIMDTypes", "SLEEFPirates", "Static", "StaticArrayInterface", "ThreadingUtilities", "UnPack", "VectorizationBase"] -git-tree-sha1 = "8f6786d8b2b3248d79db3ad359ce95382d5a6df8" +git-tree-sha1 = "8084c25a250e00ae427a379a5b607e7aed96a2dd" uuid = "bdcacae8-1622-11e9-2a5c-532679323890" -version = "0.12.170" +version = "0.12.171" weakdeps = ["ChainRulesCore", "ForwardDiff", "SpecialFunctions"] [deps.LoopVectorization.extensions] @@ -1733,9 +1744,9 @@ version = "1.9.4+0" [[deps.MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] -git-tree-sha1 = "80b2833b56d466b3858d565adcd16a4a05f2089b" +git-tree-sha1 = "f046ccd0c6db2832a9f639e2c669c6fe867e5f4f" uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2024.1.0+0" +version = "2024.2.0+0" [[deps.MPI]] deps = ["Distributed", "DocStringExtensions", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "PkgVersion", "PrecompileTools", "Requires", "Serialization", "Sockets"] @@ -1928,9 +1939,9 @@ version = "1.2.0" [[deps.NonlinearSolve]] deps = ["ADTypes", "ArrayInterface", "ConcreteStructs", "DiffEqBase", "FastBroadcast", "FastClosures", "FiniteDiff", "ForwardDiff", "LazyArrays", "LineSearches", "LinearAlgebra", "LinearSolve", "MaybeInplace", "PrecompileTools", "Preferences", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SimpleNonlinearSolve", "SparseArrays", "SparseDiffTools", "StaticArraysCore", "SymbolicIndexingInterface", "TimerOutputs"] -git-tree-sha1 = "40325dcea1cb84a108efe05966bbb1f4b98e5eea" +git-tree-sha1 = "3adb1e5945b5a6b1eaee754077f25ccc402edd7f" uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec" -version = "3.13.0" +version = "3.13.1" [deps.NonlinearSolve.extensions] NonlinearSolveBandedMatricesExt = "BandedMatrices" @@ -1964,9 +1975,9 @@ uuid = "510215fc-4207-5dde-b226-833fc4488ee2" version = "0.5.5" [[deps.OffsetArrays]] -git-tree-sha1 = "e64b4f5ea6b7389f6f046d13d4896a8f9c1ba71e" +git-tree-sha1 = "1a27764e945a152f7ca7efa04de513d473e9542e" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.14.0" +version = "1.14.1" weakdeps = ["Adapt"] [deps.OffsetArrays.extensions] @@ -2147,10 +2158,10 @@ uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" version = "1.4.1" [[deps.Plots]] -deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"] -git-tree-sha1 = "442e1e7ac27dd5ff8825c3fa62fbd1e86397974b" +deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "TOML", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"] +git-tree-sha1 = "082f0c4b70c202c37784ce4bfbc33c9f437685bf" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.40.4" +version = "1.40.5" [deps.Plots.extensions] FileIOExt = "FileIO" @@ -2168,15 +2179,15 @@ version = "1.40.4" [[deps.Polyester]] deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Requires", "Static", "StaticArrayInterface", "StrideArraysCore", "ThreadingUtilities"] -git-tree-sha1 = "b3e2bae88cf07baf0a051fe09666b8ef97aefe93" +git-tree-sha1 = "9ff799e8fb8ed6717710feee3be3bc20645daa97" uuid = "f517fe37-dbe3-4b94-8317-1923a5111588" -version = "0.7.14" +version = "0.7.15" [[deps.PolyesterWeave]] deps = ["BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "Static", "ThreadingUtilities"] -git-tree-sha1 = "240d7170f5ffdb285f9427b92333c3463bf65bf6" +git-tree-sha1 = "645bed98cd47f72f67316fd42fc47dee771aefcd" uuid = "1d0040c9-8b98-4ee7-8388-3f51789ca0ad" -version = "0.2.1" +version = "0.2.2" [[deps.PolygonOps]] git-tree-sha1 = "77b3d3605fc1cd0b42d95eba87dfcd2bf67d5ff6" @@ -2282,9 +2293,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] deps = ["Adapt", "Artifacts", "ClimaComms", "DocStringExtensions", "Random"] -git-tree-sha1 = "9a507a71e305f4b15e9d9f9c65e1752f6e20bcc4" +git-tree-sha1 = "866d94b4cf46fe3a0ffd35d1414a3a4181c9db08" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.16.0" +version = "0.17.0" weakdeps = ["CUDA", "ClimaParams"] [deps.RRTMGP.extensions] @@ -2336,9 +2347,9 @@ version = "0.6.12" [[deps.RecursiveArrayTools]] deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "SparseArrays", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"] -git-tree-sha1 = "3400ce27995422fb88ffcd3af9945565aad947f0" +git-tree-sha1 = "b450d967a770fb13d0e26358f58375e20361cf9c" uuid = "731186ca-8d62-57ce-b412-fbd966d074cd" -version = "3.23.1" +version = "3.26.0" [deps.RecursiveArrayTools.extensions] RecursiveArrayToolsFastBroadcastExt = "FastBroadcast" @@ -2427,9 +2438,9 @@ version = "0.1.0" [[deps.SLEEFPirates]] deps = ["IfElse", "Static", "VectorizationBase"] -git-tree-sha1 = "3aac6d68c5e57449f5b9b865c9ba50ac2970c4cf" +git-tree-sha1 = "456f610ca2fbd1c14f5fcf31c6bfadc55e7d66e0" uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa" -version = "0.6.42" +version = "0.6.43" [[deps.SQLite_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] @@ -2439,9 +2450,9 @@ version = "3.45.3+0" [[deps.SciMLBase]] deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"] -git-tree-sha1 = "7a6c5c8c38d2e37f45d4686c3598c20c1aebf48e" +git-tree-sha1 = "281e82f2ae2b73262fed9e7a518711eb7feb7e59" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.41.3" +version = "2.42.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2470,9 +2481,9 @@ version = "0.3.8" [[deps.SciMLStructures]] deps = ["ArrayInterface"] -git-tree-sha1 = "6ab4beaf88dcdd2639bead916f2347f81dcacd0e" +git-tree-sha1 = "cfdd1200d150df1d3c055cc72ee6850742e982d7" uuid = "53ae85a6-f571-4167-b2af-e1d143709226" -version = "1.3.0" +version = "1.4.1" [[deps.Scratch]] deps = ["Dates"] @@ -2482,9 +2493,9 @@ version = "1.2.1" [[deps.SentinelArrays]] deps = ["Dates", "Random"] -git-tree-sha1 = "90b4f68892337554d31cdcdbe19e48989f26c7e6" +git-tree-sha1 = "ff11acffdb082493657550959d4feb4b6149e73a" uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c" -version = "1.4.3" +version = "1.4.5" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -2529,9 +2540,9 @@ version = "1.1.0" [[deps.SimpleNonlinearSolve]] deps = ["ADTypes", "ArrayInterface", "ConcreteStructs", "DiffEqBase", "DiffResults", "DifferentiationInterface", "FastClosures", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "MaybeInplace", "PrecompileTools", "Reexport", "SciMLBase", "Setfield", "StaticArraysCore"] -git-tree-sha1 = "913754ccbbc78720a4542b56a6bdfbab1c84c8f2" +git-tree-sha1 = "58b144f34e44252b2de0acb5a9dbbb7ea5cd75d7" uuid = "727e6d20-b764-4bd8-a329-72de5adea6c7" -version = "1.10.0" +version = "1.10.1" [deps.SimpleNonlinearSolve.extensions] SimpleNonlinearSolveChainRulesCoreExt = "ChainRulesCore" @@ -2627,9 +2638,9 @@ version = "0.8.10" [[deps.StaticArrayInterface]] deps = ["ArrayInterface", "Compat", "IfElse", "LinearAlgebra", "PrecompileTools", "Requires", "SparseArrays", "Static", "SuiteSparse"] -git-tree-sha1 = "5d66818a39bb04bf328e92bc933ec5b4ee88e436" +git-tree-sha1 = "8963e5a083c837531298fc41599182a759a87a6d" uuid = "0d7ed370-da01-4f52-bd93-41d350b8b718" -version = "1.5.0" +version = "1.5.1" weakdeps = ["OffsetArrays", "StaticArrays"] [deps.StaticArrayInterface.extensions] @@ -2638,9 +2649,9 @@ weakdeps = ["OffsetArrays", "StaticArrays"] [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] -git-tree-sha1 = "6e00379a24597be4ae1ee6b2d882e15392040132" +git-tree-sha1 = "eeafab08ae20c62c44c8399ccb9354a04b80db50" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.9.5" +version = "1.9.7" weakdeps = ["ChainRulesCore", "Statistics"] [deps.StaticArrays.extensions] @@ -2682,9 +2693,9 @@ weakdeps = ["ChainRulesCore", "InverseFunctions"] [[deps.StrideArraysCore]] deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"] -git-tree-sha1 = "25349bf8f63aa36acbff5e3550a86e9f5b0ef682" +git-tree-sha1 = "f35f6ab602df8413a50c4a25ca14de821e8605fb" uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da" -version = "0.5.6" +version = "0.5.7" [[deps.StringEncodings]] deps = ["Libiconv_jll"] @@ -2738,9 +2749,9 @@ weakdeps = ["ClimaParams"] [[deps.SymbolicIndexingInterface]] deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"] -git-tree-sha1 = "a5f6f138b740c9d93d76f0feddd3092e6ef002b7" +git-tree-sha1 = "9c490ee01823dc443da25bf9225827e3cdd2d7e9" uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5" -version = "0.3.22" +version = "0.3.26" [[deps.TOML]] deps = ["Dates"] @@ -2830,9 +2841,9 @@ uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" version = "0.5.24" [[deps.TranscodingStreams]] -git-tree-sha1 = "d73336d81cafdc277ff45558bb7eaa2b04a8e472" +git-tree-sha1 = "60df3f8126263c0d6b357b9a1017bb94f53e3582" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" -version = "0.10.10" +version = "0.11.0" weakdeps = ["Random", "Test"] [deps.TranscodingStreams.extensions] @@ -2840,9 +2851,9 @@ weakdeps = ["Random", "Test"] [[deps.TriangularSolve]] deps = ["CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "LoopVectorization", "Polyester", "Static", "VectorizationBase"] -git-tree-sha1 = "66c68a20907800c0b7c04ff8a6164115e8747de2" +git-tree-sha1 = "be986ad9dac14888ba338c2554dcfec6939e1393" uuid = "d5829a12-d9aa-46ab-831f-fb7c9ab06edf" -version = "0.2.0" +version = "0.2.1" [[deps.Tricks]] git-tree-sha1 = "eae1bb484cd63b36999ee58be2de6c178105112f" @@ -2896,9 +2907,9 @@ weakdeps = ["ConstructionBase", "InverseFunctions"] [[deps.UnitfulLatexify]] deps = ["LaTeXStrings", "Latexify", "Unitful"] -git-tree-sha1 = "e2d817cc500e960fdbafcf988ac8436ba3208bfd" +git-tree-sha1 = "975c354fcd5f7e1ddcc1f1a23e6e091d99e99bc8" uuid = "45397f5d-5981-4c77-b2b3-fc36d6e9b728" -version = "1.6.3" +version = "1.6.4" [[deps.Unrolled]] deps = ["MacroTools"] @@ -2918,9 +2929,9 @@ version = "0.2.1" [[deps.UnsafeAtomicsLLVM]] deps = ["LLVM", "UnsafeAtomics"] -git-tree-sha1 = "d9f5962fecd5ccece07db1ff006fb0b5271bdfdd" +git-tree-sha1 = "bf2c553f25e954a9b38c9c0593a59bb13113f9e5" uuid = "d80eeb9a-aca5-4d75-85e5-170c8b632249" -version = "0.1.4" +version = "0.1.5" [[deps.Unzip]] git-tree-sha1 = "ca0969166a028236229f63514992fc073799bb78" @@ -2935,9 +2946,9 @@ version = "0.4.6" [[deps.VectorizationBase]] deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "IfElse", "LayoutPointers", "Libdl", "LinearAlgebra", "SIMDTypes", "Static", "StaticArrayInterface"] -git-tree-sha1 = "e863582a41c5731f51fd050563ae91eb33cf09be" +git-tree-sha1 = "e7f5b81c65eb858bed630fe006837b935518aca5" uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" -version = "0.21.68" +version = "0.21.70" [[deps.VertexSafeGraphs]] deps = ["Graphs"] @@ -2971,15 +2982,15 @@ version = "1.0.0" [[deps.XML2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"] -git-tree-sha1 = "52ff2af32e591541550bd753c0da8b9bc92bb9d9" +git-tree-sha1 = "d9717ce3518dc68a99e6b96300813760d887a01d" uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" -version = "2.12.7+0" +version = "2.13.1+0" [[deps.XSLT_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"] -git-tree-sha1 = "91844873c4085240b95e795f692c4cec4d805f8a" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "XML2_jll", "Zlib_jll"] +git-tree-sha1 = "a54ee957f4c86b526460a720dbc882fa5edcbefc" uuid = "aed1982a-8fda-507f-9586-7b0439959a61" -version = "1.1.34+0" +version = "1.1.41+0" [[deps.XZ_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -3067,9 +3078,9 @@ version = "0.1.1+0" [[deps.Xorg_libxcb_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"] -git-tree-sha1 = "b4bfde5d5b652e22b9c790ad00af08b6d042b97d" +git-tree-sha1 = "bcd466676fef0878338c61e655629fa7bbc69d8e" uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b" -version = "1.15.0+0" +version = "1.17.0+0" [[deps.Xorg_libxkbfile_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"] diff --git a/experiments/ClimaEarth/Project.toml b/experiments/ClimaEarth/Project.toml index 24496bf836..65c8981771 100644 --- a/experiments/ClimaEarth/Project.toml +++ b/experiments/ClimaEarth/Project.toml @@ -58,9 +58,9 @@ ArgParse = "1.1" ArtifactWrappers = "0.2" AtmosphericProfilesLibrary = "0.1" ClimaAnalysis = "0.5.4" -ClimaAtmos = "0.26" +ClimaAtmos = "0.27" ClimaCorePlots = "0.2" -ClimaLand = "0.12" +ClimaLand = "0.13" ClimaParams = "0.10" ClimaTimeSteppers = "0.7" ClimaUtilities = "0.1" diff --git a/experiments/ClimaEarth/components/atmosphere/climaatmos.jl b/experiments/ClimaEarth/components/atmosphere/climaatmos.jl index 9141a9e8bb..4809a9321e 100644 --- a/experiments/ClimaEarth/components/atmosphere/climaatmos.jl +++ b/experiments/ClimaEarth/components/atmosphere/climaatmos.jl @@ -83,11 +83,11 @@ function CA.set_surface_albedo!(Y, p, t, ::CA.CouplerAlbedo) if t == 0 FT = eltype(Y) # set initial insolation initial conditions - !p.radiation.idealized_insolation && CA.set_insolation_variables!(Y, p, t) + !(p.atmos.insolation isa CA.IdealizedInsolation) && CA.set_insolation_variables!(Y, p, t, p.atmos.insolation) # set surface albedo to 0.38 @warn "Setting surface albedo to 0.38 at the beginning of the simulation" - p.radiation.radiation_model.direct_sw_surface_albedo .= FT(0.38) - p.radiation.radiation_model.diffuse_sw_surface_albedo .= FT(0.38) + p.radiation.rrtmgp_model.direct_sw_surface_albedo .= FT(0.38) + p.radiation.rrtmgp_model.diffuse_sw_surface_albedo .= FT(0.38) else nothing end @@ -116,7 +116,7 @@ function Interfacer.get_field(atmos_sim::ClimaAtmosSimulation, ::Val{:radiative_ nz_faces = length(CC.Spaces.vertical_topology(face_space).mesh.faces) (; face_lw_flux_dn, face_lw_flux_up, face_sw_flux_dn, face_sw_flux_up) = - atmos_sim.integrator.p.radiation.radiation_model + atmos_sim.integrator.p.radiation.rrtmgp_model LWd_TOA = CC.Fields.level(CC.Fields.array2field(FT.(face_lw_flux_dn), face_space), nz_faces - CC.Utilities.half) LWu_TOA = CC.Fields.level(CC.Fields.array2field(FT.(face_lw_flux_up), face_space), nz_faces - CC.Utilities.half) @@ -191,7 +191,7 @@ function Interfacer.update_field!(sim::ClimaAtmosSimulation, ::Val{:surface_temp # note that this field is also being updated internally by the surface thermo state in ClimaAtmos # if turbulent fluxes are calculated, to ensure consistency. In case the turbulent fluxes are not # calculated, we update the field here. - sim.integrator.p.radiation.radiation_model.surface_temperature .= CC.Fields.field2array(csf.T_S) + sim.integrator.p.radiation.rrtmgp_model.surface_temperature .= CC.Fields.field2array(csf.T_S) end # extensions required by FluxCalculator (partitioned fluxes) Interfacer.get_field(sim::ClimaAtmosSimulation, ::Val{:height_int}) = @@ -208,17 +208,17 @@ function Interfacer.update_field!(atmos_sim::ClimaAtmosSimulation, ::Val{:co2}, @warn("Gray radiation model initialized, skipping CO2 update", maxlog = 1) return else - atmos_sim.integrator.p.radiation.radiation_model.volume_mixing_ratio_co2 .= Statistics.mean(parent(field)) + atmos_sim.integrator.p.radiation.rrtmgp_model.volume_mixing_ratio_co2 .= Statistics.mean(parent(field)) end end # extensions required by the Interfacer function Interfacer.update_field!(sim::ClimaAtmosSimulation, ::Val{:surface_direct_albedo}, field) - sim.integrator.p.radiation.radiation_model.direct_sw_surface_albedo .= + sim.integrator.p.radiation.rrtmgp_model.direct_sw_surface_albedo .= reshape(CC.Fields.field2array(field), 1, length(parent(field))) end function Interfacer.update_field!(sim::ClimaAtmosSimulation, ::Val{:surface_diffuse_albedo}, field) - sim.integrator.p.radiation.radiation_model.diffuse_sw_surface_albedo .= + sim.integrator.p.radiation.rrtmgp_model.diffuse_sw_surface_albedo .= reshape(CC.Fields.field2array(field), 1, length(parent(field))) end @@ -260,8 +260,8 @@ function FieldExchanger.update_sim!(atmos_sim::ClimaAtmosSimulation, csf, turbul t = atmos_sim.integrator.t !isempty(atmos_sim.integrator.p.radiation) && - !p.radiation.idealized_insolation && - CA.set_insolation_variables!(u, p, t) + !(p.atmos.insolation isa CA.IdealizedInsolation) && + CA.set_insolation_variables!(u, p, t, p.atmos.insolation) if hasradiation(atmos_sim.integrator) Interfacer.update_field!(atmos_sim, Val(:surface_direct_albedo), csf.surface_direct_albedo) @@ -479,13 +479,13 @@ function FluxCalculator.water_albedo_from_atmosphere!( p = atmos_sim.integrator.p t = atmos_sim.integrator.t - radiation_model = atmos_sim.integrator.p.radiation.radiation_model + rrtmgp_model = atmos_sim.integrator.p.radiation.rrtmgp_model FT = eltype(Y) λ = FT(0) # spectral wavelength (not used for now) # update for current zenith angle bottom_coords = CC.Fields.coordinate_field(CC.Spaces.level(Y.c, 1)) - μ = CC.Fields.array2field(radiation_model.cos_zenith, axes(bottom_coords)) + μ = CC.Fields.array2field(rrtmgp_model.cos_zenith, axes(bottom_coords)) FT = eltype(atmos_sim.integrator.u) α_model = CA.RegressionFunctionAlbedo{FT}() diff --git a/experiments/ClimaEarth/user_io/user_diagnostics.jl b/experiments/ClimaEarth/user_io/user_diagnostics.jl index 3768e3191e..701e0e44ab 100644 --- a/experiments/ClimaEarth/user_io/user_diagnostics.jl +++ b/experiments/ClimaEarth/user_io/user_diagnostics.jl @@ -58,19 +58,19 @@ function Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:toa_fluxes nz_faces = length(face_space.grid.vertical_grid.topology.mesh.faces) LWd_TOA = CC.Fields.level( - CC.Fields.array2field(FT.(atmos_sim.integrator.p.radiation.radiation_model.face_lw_flux_dn), face_space), + CC.Fields.array2field(FT.(atmos_sim.integrator.p.radiation.rrtmgp_model.face_lw_flux_dn), face_space), nz_faces - CC.Utilities.half, ) LWu_TOA = CC.Fields.level( - CC.Fields.array2field(FT.(atmos_sim.integrator.p.radiation.radiation_model.face_lw_flux_up), face_space), + CC.Fields.array2field(FT.(atmos_sim.integrator.p.radiation.rrtmgp_model.face_lw_flux_up), face_space), nz_faces - CC.Utilities.half, ) SWd_TOA = CC.Fields.level( - CC.Fields.array2field(FT.(atmos_sim.integrator.p.radiation.radiation_model.face_sw_flux_dn), face_space), + CC.Fields.array2field(FT.(atmos_sim.integrator.p.radiation.rrtmgp_model.face_sw_flux_dn), face_space), nz_faces - CC.Utilities.half, ) SWu_TOA = CC.Fields.level( - CC.Fields.array2field(FT.(atmos_sim.integrator.p.radiation.radiation_model.face_sw_flux_up), face_space), + CC.Fields.array2field(FT.(atmos_sim.integrator.p.radiation.rrtmgp_model.face_sw_flux_up), face_space), nz_faces - CC.Utilities.half, ) diff --git a/perf/Project.toml b/perf/Project.toml index c6d3df013f..9117033b58 100644 --- a/perf/Project.toml +++ b/perf/Project.toml @@ -49,9 +49,9 @@ YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6" ArgParse = "1.1" ArtifactWrappers = "0.2" AtmosphericProfilesLibrary = "0.1" -ClimaAtmos = "0.26" +ClimaAtmos = "0.27" ClimaCorePlots = "0.2" -ClimaLand = "0.12" +ClimaLand = "0.13" ClimaParams = "0.10" ClimaTimeSteppers = "0.7" Colors = "0.12"