diff --git a/config/atmos_configs/climaatmos_diagedmf.yml b/config/atmos_configs/climaatmos_diagedmf.yml index c4ce8422e3..a9d25d26a5 100644 --- a/config/atmos_configs/climaatmos_diagedmf.yml +++ b/config/atmos_configs/climaatmos_diagedmf.yml @@ -1,7 +1,7 @@ # This inherits from config/common_configs/numerics_sphere_he16ze63.yml and config/longrun_configs/amip_target_diagedmf.yml in ClimaAtmos.jl aerosol_radiation: true approximate_linear_solve_iters: 2 -cloud_model: "quadrature_sgs" +cloud_model: "quadrature" co2_model: maunaloa dt: "120secs" dt_cloud_fraction: "1hours" diff --git a/config/atmos_configs/climaatmos_progedmf.yml b/config/atmos_configs/climaatmos_progedmf.yml index 3101a2a3ac..b3cee8c43f 100644 --- a/config/atmos_configs/climaatmos_progedmf.yml +++ b/config/atmos_configs/climaatmos_progedmf.yml @@ -1,6 +1,6 @@ aerosol_radiation: true approximate_linear_solve_iters: 2 -cloud_model: "quadrature_sgs" +cloud_model: "quadrature" co2_model: maunaloa dt: "120secs" dt_cloud_fraction: "1hours" diff --git a/config/atmos_configs/climaatmos_progedmf_1m.yml b/config/atmos_configs/climaatmos_progedmf_1m.yml index 4e9a8ada5e..de3126debb 100644 --- a/config/atmos_configs/climaatmos_progedmf_1m.yml +++ b/config/atmos_configs/climaatmos_progedmf_1m.yml @@ -1,6 +1,6 @@ aerosol_radiation: true approximate_linear_solve_iters: 2 -cloud_model: "quadrature_sgs" +cloud_model: "quadrature" co2_model: maunaloa dt: "120secs" dt_cloud_fraction: "1hours" diff --git a/config/atmos_configs/climaatmos_wx_diagedmf.yml b/config/atmos_configs/climaatmos_wx_diagedmf.yml index b08aa00787..5ff91c3150 100644 --- a/config/atmos_configs/climaatmos_wx_diagedmf.yml +++ b/config/atmos_configs/climaatmos_wx_diagedmf.yml @@ -43,6 +43,6 @@ toml: [toml/diagnostic_edmfx_era5_ic.toml] # moist: "nonequil" # toml: [toml/diagnostic_edmfx_1M.toml] -cloud_model: "quadrature_sgs" +cloud_model: "quadrature" use_itime: true deep_atmosphere: false diff --git a/config/atmos_configs/climaatmos_wx_progedmf.yml b/config/atmos_configs/climaatmos_wx_progedmf.yml index a84069a25d..64f3bb3e5d 100644 --- a/config/atmos_configs/climaatmos_wx_progedmf.yml +++ b/config/atmos_configs/climaatmos_wx_progedmf.yml @@ -49,6 +49,6 @@ moist: equil # moist: "nonequil" # toml: [toml/diagnostic_edmfx_1M.toml] -cloud_model: "quadrature_sgs" +cloud_model: "quadrature" use_itime: true -deep_atmosphere: false \ No newline at end of file +deep_atmosphere: false diff --git a/experiments/ClimaCore/Manifest-v1.11.toml b/experiments/ClimaCore/Manifest-v1.11.toml index a1f360a44b..ccff4bae13 100644 --- a/experiments/ClimaCore/Manifest-v1.11.toml +++ b/experiments/ClimaCore/Manifest-v1.11.toml @@ -5,9 +5,9 @@ manifest_format = "2.0" project_hash = "ad754c4de2c5018aafa70f420d0cb2fa7d55629c" [[deps.ADTypes]] -git-tree-sha1 = "8be2ae325471fc20b11c27bb34b518541d07dd3a" +git-tree-sha1 = "8b2b045b22740e4be20654175cc38291d48539db" uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -version = "1.19.0" +version = "1.20.0" weakdeps = ["ChainRulesCore", "ConstructionBase", "EnzymeCore"] [deps.ADTypes.extensions] @@ -33,9 +33,9 @@ version = "0.4.5" [[deps.Accessors]] deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "MacroTools"] -git-tree-sha1 = "3b86719127f50670efe356bc11073d84b4ed7a5d" +git-tree-sha1 = "856ecd7cebb68e5fc87abecd2326ad59f0f911f3" uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" -version = "0.1.42" +version = "0.1.43" [deps.Accessors.extensions] AxisKeysExt = "AxisKeys" @@ -123,9 +123,9 @@ version = "7.22.0" [[deps.ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra", "StaticArrays"] -git-tree-sha1 = "122a06c8266e00035bfa572887ab52c344526eb4" +git-tree-sha1 = "e0b47732a192dd59b9d079a06d04235e2f833963" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.12.1" +version = "1.12.2" weakdeps = ["SparseArrays"] [deps.ArrayLayouts.extensions] @@ -305,9 +305,9 @@ version = "0.6.10" [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"] -git-tree-sha1 = "ca717446978d2815b4fa23a62a2131861e44d1e8" +git-tree-sha1 = "a2acae071e36c1c69c94a83d1fb74b25e8b0fde0" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.14.42" +version = "0.14.43" [deps.ClimaCore.extensions] ClimaCoreCUDAExt = "CUDA" @@ -507,9 +507,9 @@ version = "1.11.0" [[deps.DelaunayTriangulation]] deps = ["AdaptivePredicates", "EnumX", "ExactPredicates", "Random"] -git-tree-sha1 = "783b21581a051ac91a3921ee37e26a23ed7f57a6" +git-tree-sha1 = "c55f5a9fd67bdbc8e089b5a3111fe4292986a8e8" uuid = "927a84f5-c5f4-47a5-9785-b46e178433df" -version = "1.6.5" +version = "1.6.6" [[deps.DiffEqBase]] deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "FastPower", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "Setfield", "Static", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "TruncatedStacktraces"] @@ -926,9 +926,9 @@ version = "0.1.0" [[deps.Glib_jll]] deps = ["Artifacts", "GettextRuntime_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE2_jll", "Zlib_jll"] -git-tree-sha1 = "50c11ffab2a3d50192a228c313f05b5b5dc5acb2" +git-tree-sha1 = "6b4d2dc81736fe3980ff0e8879a9fc7c33c44ddf" uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" -version = "2.86.0+0" +version = "2.86.2+0" [[deps.Graphics]] deps = ["Colors", "LinearAlgebra", "NaNMath"] @@ -1433,9 +1433,9 @@ uuid = "d125e4d3-2237-4719-b19c-fa641b8a4667" version = "0.1.8" [[deps.MappedArrays]] -git-tree-sha1 = "2dab0221fe2b0f2cb6754eaa743cc266339f527e" +git-tree-sha1 = "0ee4497a4e80dbd29c058fcee6493f5219556f40" uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" -version = "0.4.2" +version = "0.4.3" [[deps.Markdown]] deps = ["Base64"] @@ -1760,9 +1760,9 @@ version = "1.3.0" [[deps.QOI]] deps = ["ColorTypes", "FileIO", "FixedPointNumbers"] -git-tree-sha1 = "8b3fc30bc0390abdce15f8822c889f669baed73d" +git-tree-sha1 = "472daaa816895cb7aee81658d4e7aec901fa1106" uuid = "4b34888f-f399-49d4-9bb3-47ed5cae4e65" -version = "1.0.1" +version = "1.0.2" [[deps.QuadGK]] deps = ["DataStructures", "LinearAlgebra"] @@ -1940,9 +1940,9 @@ version = "2.112.0" [[deps.SciMLOperators]] deps = ["Accessors", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "MacroTools"] -git-tree-sha1 = "a1e12aee1eb7e6f957e8483eeebf9a98f3e135d6" +git-tree-sha1 = "9deb07bb4e6f95712bda5617a717caed701fbe4b" uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" -version = "1.13.0" +version = "1.14.0" weakdeps = ["SparseArrays", "StaticArraysCore"] [deps.SciMLOperators.extensions] @@ -2099,15 +2099,15 @@ weakdeps = ["SparseArrays"] [[deps.StatsAPI]] deps = ["LinearAlgebra"] -git-tree-sha1 = "9d72a13a3f4dd3795a195ac5a44d7d6ff5f552ff" +git-tree-sha1 = "178ed29fd5b2a2cfc3bd31c13375ae925623ff36" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.7.1" +version = "1.8.0" [[deps.StatsBase]] deps = ["AliasTables", "DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "064b532283c97daae49e544bb9cb413c26511f8c" +git-tree-sha1 = "be5733d4a2b03341bdcab91cea6caa7e31ced14b" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.34.8" +version = "0.34.9" [[deps.StatsFuns]] deps = ["HypergeometricFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] @@ -2174,10 +2174,10 @@ uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" version = "7.7.0+0" [[deps.SurfaceFluxes]] -deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] -git-tree-sha1 = "444e0bfdbf48aef97146dbd2400680d46daa420c" +deps = ["RootSolvers", "Thermodynamics"] +git-tree-sha1 = "eef0657172ea2da3c7a476d8c4e5655fd77fbaf0" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" -version = "0.14.0" +version = "0.14.1" [deps.SurfaceFluxes.extensions] CreateParametersExt = "ClimaParams" @@ -2219,9 +2219,9 @@ version = "1.10.0" [[deps.TaylorSeries]] deps = ["LinearAlgebra", "Markdown", "SparseArrays"] -git-tree-sha1 = "dbb2073ed3d0b356405abb7562bfb3326f9cb5fe" +git-tree-sha1 = "4a5ddc4036946d3a7900b5776b0872e36d848a29" uuid = "6aa5eb33-94cf-58f4-a9d0-e4b2c4fc25ea" -version = "0.20.9" +version = "0.20.10" weakdeps = ["IntervalArithmetic", "JLD2", "RecursiveArrayTools", "StaticArrays"] [deps.TaylorSeries.extensions] @@ -2243,9 +2243,9 @@ version = "1.11.0" [[deps.Thermodynamics]] deps = ["DocStringExtensions", "ForwardDiff", "KernelAbstractions", "Random", "RootSolvers"] -git-tree-sha1 = "bae39665e42c36e2e6bf5b814631915ec7d90232" +git-tree-sha1 = "5f41cdbbd9b482efa523e43346323656121862c5" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -version = "0.15.0" +version = "0.15.1" [deps.Thermodynamics.extensions] CreateParametersExt = "ClimaParams" @@ -2315,15 +2315,16 @@ version = "0.4.1" [[deps.Unitful]] deps = ["Dates", "LinearAlgebra", "Random"] -git-tree-sha1 = "83360bda12f61c250835830cc40b64f487cc2230" +git-tree-sha1 = "c25751629f5baaa27fef307f96536db62e1d754e" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.25.1" +version = "1.27.0" [deps.Unitful.extensions] ConstructionBaseUnitfulExt = "ConstructionBase" ForwardDiffExt = "ForwardDiff" InverseFunctionsUnitfulExt = "InverseFunctions" LatexifyExt = ["Latexify", "LaTeXStrings"] + NaNMathExt = "NaNMath" PrintfExt = "Printf" [deps.Unitful.weakdeps] @@ -2332,6 +2333,7 @@ version = "1.25.1" InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112" LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" + NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[deps.UnrolledUtilities]] @@ -2480,9 +2482,9 @@ version = "2.0.4+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "5cb3c5d039f880c0b3075803c8bf45cb95ae1e91" +git-tree-sha1 = "de8ab4f01cb2d8b41702bab9eaad9e8b7d352f73" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.51+0" +version = "1.6.53+0" [[deps.libsixel_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "libpng_jll"] diff --git a/experiments/ClimaCore/Manifest.toml b/experiments/ClimaCore/Manifest.toml index 3c7f7b4539..5071fe9137 100644 --- a/experiments/ClimaCore/Manifest.toml +++ b/experiments/ClimaCore/Manifest.toml @@ -5,9 +5,9 @@ manifest_format = "2.0" project_hash = "64dfae3f3aedb6050f0e3adb679ec45b4a536fac" [[deps.ADTypes]] -git-tree-sha1 = "8be2ae325471fc20b11c27bb34b518541d07dd3a" +git-tree-sha1 = "8b2b045b22740e4be20654175cc38291d48539db" uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -version = "1.19.0" +version = "1.20.0" weakdeps = ["ChainRulesCore", "ConstructionBase", "EnzymeCore"] [deps.ADTypes.extensions] @@ -33,9 +33,9 @@ version = "0.4.5" [[deps.Accessors]] deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "MacroTools"] -git-tree-sha1 = "3b86719127f50670efe356bc11073d84b4ed7a5d" +git-tree-sha1 = "856ecd7cebb68e5fc87abecd2326ad59f0f911f3" uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" -version = "0.1.42" +version = "0.1.43" [deps.Accessors.extensions] AxisKeysExt = "AxisKeys" @@ -123,9 +123,9 @@ version = "7.22.0" [[deps.ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra", "StaticArrays"] -git-tree-sha1 = "122a06c8266e00035bfa572887ab52c344526eb4" +git-tree-sha1 = "e0b47732a192dd59b9d079a06d04235e2f833963" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.12.1" +version = "1.12.2" weakdeps = ["SparseArrays"] [deps.ArrayLayouts.extensions] @@ -302,9 +302,9 @@ version = "0.6.10" [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"] -git-tree-sha1 = "ca717446978d2815b4fa23a62a2131861e44d1e8" +git-tree-sha1 = "a2acae071e36c1c69c94a83d1fb74b25e8b0fde0" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.14.42" +version = "0.14.43" [deps.ClimaCore.extensions] ClimaCoreCUDAExt = "CUDA" @@ -503,9 +503,9 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" [[deps.DelaunayTriangulation]] deps = ["AdaptivePredicates", "EnumX", "ExactPredicates", "Random"] -git-tree-sha1 = "783b21581a051ac91a3921ee37e26a23ed7f57a6" +git-tree-sha1 = "c55f5a9fd67bdbc8e089b5a3111fe4292986a8e8" uuid = "927a84f5-c5f4-47a5-9785-b46e178433df" -version = "1.6.5" +version = "1.6.6" [[deps.DiffEqBase]] deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "FastPower", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "Setfield", "Static", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "TruncatedStacktraces"] @@ -919,9 +919,9 @@ version = "0.1.0" [[deps.Glib_jll]] deps = ["Artifacts", "GettextRuntime_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE2_jll", "Zlib_jll"] -git-tree-sha1 = "50c11ffab2a3d50192a228c313f05b5b5dc5acb2" +git-tree-sha1 = "6b4d2dc81736fe3980ff0e8879a9fc7c33c44ddf" uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" -version = "2.86.0+0" +version = "2.86.2+0" [[deps.Graphics]] deps = ["Colors", "LinearAlgebra", "NaNMath"] @@ -1420,9 +1420,9 @@ uuid = "d125e4d3-2237-4719-b19c-fa641b8a4667" version = "0.1.8" [[deps.MappedArrays]] -git-tree-sha1 = "2dab0221fe2b0f2cb6754eaa743cc266339f527e" +git-tree-sha1 = "0ee4497a4e80dbd29c058fcee6493f5219556f40" uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" -version = "0.4.2" +version = "0.4.3" [[deps.Markdown]] deps = ["Base64"] @@ -1740,9 +1740,9 @@ version = "1.3.0" [[deps.QOI]] deps = ["ColorTypes", "FileIO", "FixedPointNumbers"] -git-tree-sha1 = "8b3fc30bc0390abdce15f8822c889f669baed73d" +git-tree-sha1 = "472daaa816895cb7aee81658d4e7aec901fa1106" uuid = "4b34888f-f399-49d4-9bb3-47ed5cae4e65" -version = "1.0.1" +version = "1.0.2" [[deps.QuadGK]] deps = ["DataStructures", "LinearAlgebra"] @@ -1918,9 +1918,9 @@ version = "2.112.0" [[deps.SciMLOperators]] deps = ["Accessors", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "MacroTools"] -git-tree-sha1 = "a1e12aee1eb7e6f957e8483eeebf9a98f3e135d6" +git-tree-sha1 = "9deb07bb4e6f95712bda5617a717caed701fbe4b" uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" -version = "1.13.0" +version = "1.14.0" weakdeps = ["SparseArrays", "StaticArraysCore"] [deps.SciMLOperators.extensions] @@ -2069,15 +2069,15 @@ version = "1.10.0" [[deps.StatsAPI]] deps = ["LinearAlgebra"] -git-tree-sha1 = "9d72a13a3f4dd3795a195ac5a44d7d6ff5f552ff" +git-tree-sha1 = "178ed29fd5b2a2cfc3bd31c13375ae925623ff36" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.7.1" +version = "1.8.0" [[deps.StatsBase]] deps = ["AliasTables", "DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "064b532283c97daae49e544bb9cb413c26511f8c" +git-tree-sha1 = "be5733d4a2b03341bdcab91cea6caa7e31ced14b" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.34.8" +version = "0.34.9" [[deps.StatsFuns]] deps = ["HypergeometricFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] @@ -2140,10 +2140,10 @@ uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" version = "7.2.1+1" [[deps.SurfaceFluxes]] -deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] -git-tree-sha1 = "444e0bfdbf48aef97146dbd2400680d46daa420c" +deps = ["RootSolvers", "Thermodynamics"] +git-tree-sha1 = "eef0657172ea2da3c7a476d8c4e5655fd77fbaf0" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" -version = "0.14.0" +version = "0.14.1" [deps.SurfaceFluxes.extensions] CreateParametersExt = "ClimaParams" @@ -2185,9 +2185,9 @@ version = "1.10.0" [[deps.TaylorSeries]] deps = ["LinearAlgebra", "Markdown", "SparseArrays"] -git-tree-sha1 = "dbb2073ed3d0b356405abb7562bfb3326f9cb5fe" +git-tree-sha1 = "4a5ddc4036946d3a7900b5776b0872e36d848a29" uuid = "6aa5eb33-94cf-58f4-a9d0-e4b2c4fc25ea" -version = "0.20.9" +version = "0.20.10" weakdeps = ["IntervalArithmetic", "JLD2", "RecursiveArrayTools", "StaticArrays"] [deps.TaylorSeries.extensions] @@ -2208,9 +2208,9 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[deps.Thermodynamics]] deps = ["DocStringExtensions", "ForwardDiff", "KernelAbstractions", "Random", "RootSolvers"] -git-tree-sha1 = "bae39665e42c36e2e6bf5b814631915ec7d90232" +git-tree-sha1 = "5f41cdbbd9b482efa523e43346323656121862c5" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -version = "0.15.0" +version = "0.15.1" [deps.Thermodynamics.extensions] CreateParametersExt = "ClimaParams" @@ -2278,15 +2278,16 @@ version = "0.4.1" [[deps.Unitful]] deps = ["Dates", "LinearAlgebra", "Random"] -git-tree-sha1 = "83360bda12f61c250835830cc40b64f487cc2230" +git-tree-sha1 = "c25751629f5baaa27fef307f96536db62e1d754e" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.25.1" +version = "1.27.0" [deps.Unitful.extensions] ConstructionBaseUnitfulExt = "ConstructionBase" ForwardDiffExt = "ForwardDiff" InverseFunctionsUnitfulExt = "InverseFunctions" LatexifyExt = ["Latexify", "LaTeXStrings"] + NaNMathExt = "NaNMath" PrintfExt = "Printf" [deps.Unitful.weakdeps] @@ -2295,6 +2296,7 @@ version = "1.25.1" InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112" LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" + NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[deps.UnrolledUtilities]] @@ -2443,9 +2445,9 @@ version = "2.0.4+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "5cb3c5d039f880c0b3075803c8bf45cb95ae1e91" +git-tree-sha1 = "de8ab4f01cb2d8b41702bab9eaad9e8b7d352f73" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.51+0" +version = "1.6.53+0" [[deps.libsixel_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "libpng_jll"] diff --git a/experiments/ClimaEarth/Manifest-v1.11.toml b/experiments/ClimaEarth/Manifest-v1.11.toml index 0304015066..dca6f0f5e0 100644 --- a/experiments/ClimaEarth/Manifest-v1.11.toml +++ b/experiments/ClimaEarth/Manifest-v1.11.toml @@ -2,7 +2,7 @@ julia_version = "1.11.6" manifest_format = "2.0" -project_hash = "d502ec36505df261b2f120a7277a749ea8bcd37a" +project_hash = "3df2724a7cfca941a867dc81efe6453239a50547" [[deps.ADTypes]] git-tree-sha1 = "8b2b045b22740e4be20654175cc38291d48539db" @@ -415,9 +415,9 @@ weakdeps = ["GeoMakie", "Makie"] [[deps.ClimaAtmos]] deps = ["Adapt", "ArgParse", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaInterpolations", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "ForwardDiff", "Insolation", "Interpolations", "LazyArtifacts", "LazyBroadcast", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "NullBroadcasts", "RRTMGP", "Random", "SciMLBase", "SparseMatrixColorings", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"] -git-tree-sha1 = "dcfc73f58cc8c261f6eaf85ea4a01ae8e1c88ce3" +git-tree-sha1 = "528398fe7a4c5e067eea4f5ac3925d1c491d0ab7" uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" -version = "0.31.9" +version = "0.32.0" [[deps.ClimaCalibrate]] deps = ["Dates", "Distributed", "Distributions", "EnsembleKalmanProcesses", "JLD2", "Logging", "Random", "TOML", "YAML"] @@ -449,9 +449,9 @@ weakdeps = ["CUDA", "MPI"] [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"] -git-tree-sha1 = "ca717446978d2815b4fa23a62a2131861e44d1e8" +git-tree-sha1 = "85174ebf0e4fa5b7fd3e178e04ae1b669922801d" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.14.42" +version = "0.14.44" weakdeps = ["CUDA", "Krylov"] [deps.ClimaCore.extensions] @@ -488,9 +488,9 @@ weakdeps = ["CUDA"] [[deps.ClimaLand]] deps = ["ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "Dates", "DocStringExtensions", "Insolation", "Interpolations", "LazyArtifacts", "LazyBroadcast", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"] -git-tree-sha1 = "87a9fbf19299d36cd9b1a12a44f847c97bc0d8b3" +git-tree-sha1 = "dfc600500c1082aab4aef53442df90d025fee781" uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532" -version = "1.2.0" +version = "1.2.1" [deps.ClimaLand.extensions] FluxnetSimulationsExt = ["DelimitedFiles"] @@ -526,9 +526,9 @@ version = "0.8.7" [[deps.ClimaParams]] deps = ["Dates", "TOML"] -git-tree-sha1 = "995991392b8bf4c8400b38ba5bcb7d3a0e7d9cce" +git-tree-sha1 = "5ade630eb2f88bd670f316b7fb9f8001adc772c2" uuid = "5c42b081-d73a-476f-9059-fd94b934656c" -version = "1.0.3" +version = "1.0.7" [[deps.ClimaSeaIce]] deps = ["Adapt", "JLD2", "KernelAbstractions", "Oceananigans", "RootSolvers", "Roots", "SeawaterPolynomials"] @@ -775,9 +775,9 @@ version = "1.11.0" [[deps.DelaunayTriangulation]] deps = ["AdaptivePredicates", "EnumX", "ExactPredicates", "Random"] -git-tree-sha1 = "783b21581a051ac91a3921ee37e26a23ed7f57a6" +git-tree-sha1 = "c55f5a9fd67bdbc8e089b5a3111fe4292986a8e8" uuid = "927a84f5-c5f4-47a5-9785-b46e178433df" -version = "1.6.5" +version = "1.6.6" [[deps.DelimitedFiles]] deps = ["Mmap"] @@ -1336,9 +1336,9 @@ uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" version = "2.86.2+0" [[deps.Glob]] -git-tree-sha1 = "97285bbd5230dd766e9ef6749b80fc617126d496" +git-tree-sha1 = "83cb0092e2792b9e3a865b6655e88f5b862607e2" uuid = "c27321d9-0574-5035-807b-f59d2c89b15c" -version = "1.3.1" +version = "1.4.0" [[deps.Graphics]] deps = ["Colors", "LinearAlgebra", "NaNMath"] @@ -1403,10 +1403,10 @@ uuid = "076d061b-32b6-4027-95e0-9a2c6f6d7e74" version = "0.2.0" [[deps.HostCPUFeatures]] -deps = ["BitTwiddlingConvenienceFunctions", "IfElse", "Libdl", "Static"] -git-tree-sha1 = "8e070b599339d622e9a081d17230d74a5c473293" +deps = ["BitTwiddlingConvenienceFunctions", "IfElse", "Libdl", "Preferences", "Static"] +git-tree-sha1 = "af9ab7d1f70739a47f03be78771ebda38c3c71bf" uuid = "3e5b6fbb-0976-4d2c-9146-d79de83f2fb0" -version = "0.1.17" +version = "0.1.18" [[deps.Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "XML2_jll", "Xorg_libpciaccess_jll"] @@ -2018,9 +2018,9 @@ uuid = "d125e4d3-2237-4719-b19c-fa641b8a4667" version = "0.1.8" [[deps.MappedArrays]] -git-tree-sha1 = "2dab0221fe2b0f2cb6754eaa743cc266339f527e" +git-tree-sha1 = "0ee4497a4e80dbd29c058fcee6493f5219556f40" uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" -version = "0.4.2" +version = "0.4.3" [[deps.Markdown]] deps = ["Base64"] @@ -2028,10 +2028,10 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" version = "1.11.0" [[deps.MathOptInterface]] -deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "DataStructures", "ForwardDiff", "JSON3", "LinearAlgebra", "MutableArithmetics", "NaNMath", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays", "SpecialFunctions", "Test"] -git-tree-sha1 = "a2cbab4256690aee457d136752c404e001f27768" +deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "ForwardDiff", "JSON3", "LinearAlgebra", "MutableArithmetics", "NaNMath", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays", "SpecialFunctions", "Test"] +git-tree-sha1 = "181c2611c7aa6a362fdf937b1e2af55e6691181f" uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" -version = "1.46.0" +version = "1.48.0" [[deps.MathTeXEngine]] deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "UnicodeFun"] @@ -2197,10 +2197,10 @@ uuid = "436b0209-26ab-4e65-94a9-6526d86fea76" version = "0.1.0" [[deps.NearestNeighbors]] -deps = ["Distances", "StaticArrays"] -git-tree-sha1 = "e45bb6034fdef63d0c49b82ba9b889215bf8b344" +deps = ["AbstractTrees", "Distances", "StaticArrays"] +git-tree-sha1 = "2949f294f82b5ad7192fd544a988a1e785438ee2" uuid = "b8a86587-4115-5ab1-83bc-aa920d37bbce" -version = "0.4.24" +version = "0.4.26" [[deps.NetCDF_jll]] deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "TOML", "XML2_jll", "Zlib_jll", "Zstd_jll", "libaec_jll", "libzip_jll"] @@ -2836,9 +2836,9 @@ version = "2.112.0" [[deps.SciMLOperators]] deps = ["Accessors", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "MacroTools"] -git-tree-sha1 = "a1e12aee1eb7e6f957e8483eeebf9a98f3e135d6" +git-tree-sha1 = "9deb07bb4e6f95712bda5617a717caed701fbe4b" uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" -version = "1.13.0" +version = "1.14.0" weakdeps = ["SparseArrays", "StaticArraysCore"] [deps.SciMLOperators.extensions] @@ -3047,9 +3047,9 @@ version = "1.8.0" [[deps.StatsBase]] deps = ["AliasTables", "DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "064b532283c97daae49e544bb9cb413c26511f8c" +git-tree-sha1 = "be5733d4a2b03341bdcab91cea6caa7e31ced14b" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.34.8" +version = "0.34.9" [[deps.StatsFuns]] deps = ["HypergeometricFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] @@ -3128,10 +3128,10 @@ uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" version = "7.7.0+0" [[deps.SurfaceFluxes]] -deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] -git-tree-sha1 = "4a28939fa34ce9b45f693f33bbe956d1b2903ba2" +deps = ["RootSolvers", "Thermodynamics"] +git-tree-sha1 = "eef0657172ea2da3c7a476d8c4e5655fd77fbaf0" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" -version = "0.13.1" +version = "0.14.1" weakdeps = ["ClimaParams"] [deps.SurfaceFluxes.extensions] @@ -3177,9 +3177,9 @@ version = "1.10.0" [[deps.TaylorSeries]] deps = ["LinearAlgebra", "Markdown", "SparseArrays"] -git-tree-sha1 = "dbb2073ed3d0b356405abb7562bfb3326f9cb5fe" +git-tree-sha1 = "4a5ddc4036946d3a7900b5776b0872e36d848a29" uuid = "6aa5eb33-94cf-58f4-a9d0-e4b2c4fc25ea" -version = "0.20.9" +version = "0.20.10" weakdeps = ["IntervalArithmetic", "JLD2", "RecursiveArrayTools", "StaticArrays"] [deps.TaylorSeries.extensions] @@ -3206,9 +3206,9 @@ version = "1.0.2" [[deps.Thermodynamics]] deps = ["DocStringExtensions", "ForwardDiff", "KernelAbstractions", "Random", "RootSolvers"] -git-tree-sha1 = "bae39665e42c36e2e6bf5b814631915ec7d90232" +git-tree-sha1 = "b8203ebbcf1dd74ee13d84c52819fb159ac44b93" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -version = "0.15.0" +version = "0.15.2" weakdeps = ["ClimaParams"] [deps.Thermodynamics.extensions] @@ -3299,15 +3299,16 @@ version = "0.4.1" [[deps.Unitful]] deps = ["Dates", "LinearAlgebra", "Random"] -git-tree-sha1 = "83360bda12f61c250835830cc40b64f487cc2230" +git-tree-sha1 = "c25751629f5baaa27fef307f96536db62e1d754e" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.25.1" +version = "1.27.0" [deps.Unitful.extensions] ConstructionBaseUnitfulExt = "ConstructionBase" ForwardDiffExt = "ForwardDiff" InverseFunctionsUnitfulExt = "InverseFunctions" LatexifyExt = ["Latexify", "LaTeXStrings"] + NaNMathExt = "NaNMath" PrintfExt = "Printf" [deps.Unitful.weakdeps] @@ -3316,6 +3317,7 @@ version = "1.25.1" InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112" LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" + NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[deps.UnrolledUtilities]] @@ -3486,9 +3488,9 @@ version = "2.0.4+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "5cb3c5d039f880c0b3075803c8bf45cb95ae1e91" +git-tree-sha1 = "de8ab4f01cb2d8b41702bab9eaad9e8b7d352f73" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.51+0" +version = "1.6.53+0" [[deps.libsixel_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "libpng_jll"] diff --git a/experiments/ClimaEarth/Manifest.toml b/experiments/ClimaEarth/Manifest.toml index b16dafb083..7e29f2eeee 100644 --- a/experiments/ClimaEarth/Manifest.toml +++ b/experiments/ClimaEarth/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.9" manifest_format = "2.0" -project_hash = "38c2cc25263b4aaf3a655a36d0536e2dde3b78cc" +project_hash = "9b395479c3a222092f9983a5b8024f48aa01f724" [[deps.ADTypes]] git-tree-sha1 = "8b2b045b22740e4be20654175cc38291d48539db" @@ -412,9 +412,9 @@ weakdeps = ["GeoMakie", "Makie"] [[deps.ClimaAtmos]] deps = ["Adapt", "ArgParse", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaInterpolations", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "ForwardDiff", "Insolation", "Interpolations", "LazyArtifacts", "LazyBroadcast", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "NullBroadcasts", "RRTMGP", "Random", "SciMLBase", "SparseMatrixColorings", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"] -git-tree-sha1 = "dcfc73f58cc8c261f6eaf85ea4a01ae8e1c88ce3" +git-tree-sha1 = "528398fe7a4c5e067eea4f5ac3925d1c491d0ab7" uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" -version = "0.31.9" +version = "0.32.0" [[deps.ClimaCalibrate]] deps = ["Dates", "Distributed", "Distributions", "EnsembleKalmanProcesses", "JLD2", "Logging", "Random", "TOML", "YAML"] @@ -446,9 +446,9 @@ weakdeps = ["CUDA", "MPI"] [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"] -git-tree-sha1 = "a2acae071e36c1c69c94a83d1fb74b25e8b0fde0" +git-tree-sha1 = "85174ebf0e4fa5b7fd3e178e04ae1b669922801d" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.14.43" +version = "0.14.44" weakdeps = ["CUDA", "Krylov"] [deps.ClimaCore.extensions] @@ -2182,10 +2182,10 @@ uuid = "436b0209-26ab-4e65-94a9-6526d86fea76" version = "0.1.0" [[deps.NearestNeighbors]] -deps = ["Distances", "StaticArrays"] -git-tree-sha1 = "5a47e9b249869754ac274953fbe9b7232856eb20" +deps = ["AbstractTrees", "Distances", "StaticArrays"] +git-tree-sha1 = "2949f294f82b5ad7192fd544a988a1e785438ee2" uuid = "b8a86587-4115-5ab1-83bc-aa920d37bbce" -version = "0.4.25" +version = "0.4.26" [[deps.NetCDF_jll]] deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "TOML", "XML2_jll", "Zlib_jll", "Zstd_jll", "libaec_jll", "libzip_jll"] @@ -3094,10 +3094,10 @@ uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" version = "7.2.1+1" [[deps.SurfaceFluxes]] -deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] -git-tree-sha1 = "4a28939fa34ce9b45f693f33bbe956d1b2903ba2" +deps = ["RootSolvers", "Thermodynamics"] +git-tree-sha1 = "eef0657172ea2da3c7a476d8c4e5655fd77fbaf0" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" -version = "0.13.1" +version = "0.14.1" weakdeps = ["ClimaParams"] [deps.SurfaceFluxes.extensions] diff --git a/experiments/ClimaEarth/Project.toml b/experiments/ClimaEarth/Project.toml index 6dbf5d57f4..d5afc0d0dc 100644 --- a/experiments/ClimaEarth/Project.toml +++ b/experiments/ClimaEarth/Project.toml @@ -38,7 +38,7 @@ YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6" ArgParse = "1" CUDA = "5" ClimaAnalysis = "0.5.10" -ClimaAtmos = "0.27, 0.28, 0.29, 0.30, 0.31" +ClimaAtmos = "0.27, 0.28, 0.29, 0.30, 0.31, 0.32" ClimaCalibrate = "0.1" ClimaDiagnostics = "0.2.6" ClimaLand = "1.2" diff --git a/src/Checkpointer.jl b/src/Checkpointer.jl index b525d08646..151fd64f30 100644 --- a/src/Checkpointer.jl +++ b/src/Checkpointer.jl @@ -418,8 +418,22 @@ Ensure that immutable objects have been initialized correctly, as they cannot be restored from a checkpoint. """ function restore!( - v1::Union{StaticArrays.StaticArray, Number, UnitRange, LinRange, Symbol}, - v2::Union{StaticArrays.StaticArray, Number, UnitRange, LinRange, Symbol}, + v1::Union{ + StaticArrays.StaticArray, + Number, + UnitRange, + LinRange, + Symbol, + CartesianIndices, + }, + v2::Union{ + StaticArrays.StaticArray, + Number, + UnitRange, + LinRange, + Symbol, + CartesianIndices, + }, comms_ctx; name = "", ignore = Set(),