From 4cbc9eb6dd060f9da6ecd2294eb000925a6d5ec7 Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Tue, 2 Jul 2024 20:03:24 -0700 Subject: [PATCH] Remove Dierckx, move to Interpolations --- NEWS.md | 13 +- Project.toml | 4 +- docs/Manifest.toml | 92 ++++++-------- examples/Manifest.toml | 118 ++++++++---------- examples/Project.toml | 1 - perf/Manifest.toml | 110 ++++++++-------- perf/Project.toml | 1 - src/initial_conditions/InitialConditions.jl | 2 +- src/initial_conditions/initial_conditions.jl | 22 +++- .../radiation/radiation.jl | 12 +- .../forcing/external_forcing.jl | 7 +- src/solver/type_getters.jl | 1 - src/surface_conditions/SurfaceConditions.jl | 2 +- src/surface_conditions/surface_setups.jl | 11 +- test/Project.toml | 2 - 15 files changed, 192 insertions(+), 206 deletions(-) diff --git a/NEWS.md b/NEWS.md index 919a5af6eb5..94735b07a2d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,16 +3,19 @@ ClimaAtmos.jl Release Notes Main ------- -- ![][badge-💥breaking] Change "radiation_model" in the radiation cache to "rrtmgp_model". +- ![][badge-🔥behavioralΔ] Switch from `Dierckz` to `Interpolations`. `Interpolations` + is type-stable and GPU compatible. The order of interpolation has decreased to first. + PR [#3169](https://github.com/CliMA/ClimaAtmos.jl/pull/3169) +- ![][badge-💥breaking] Change `radiation_model` in the radiation cache to `rrtmgp_model`. PR [#3167](https://github.com/CliMA/ClimaAtmos.jl/pull/3167) -- ![][badge-💥breaking] Change the "idealized_insolation" argument to "insolation", +- ![][badge-💥breaking] Change the `idealized_insolation` argument to `insolation`, and add RCEMIP insolation. PR [#3150](https://github.com/CliMA/ClimaAtmos.jl/pull/3150) v0.26.3 ------- - Add ClimaCoupler downstream test. PR [#3152](https://github.com/CliMA/ClimaAtmos.jl/pull/3152) -- Add an option to use aerosol radiation. This is not fully working yet. +- Add an option to use aerosol radiation. This is not fully working yet. PR [#3147](https://github.com/CliMA/ClimaAtmos.jl/pull/3147) - Update to RRTMGP v0.17.0. PR [#3131](https://github.com/CliMA/ClimaAtmos.jl/pull/3131) @@ -23,12 +26,12 @@ v0.26.2 ------- - Limit temperature input to RRTMGP within the lookup table range. PR [#3124](https://github.com/CliMA/ClimaAtmos.jl/pull/3124) - + v0.26.1 ------- - Updated RRTMGP compat from 0.15 to 0.16 PR [#3114](https://github.com/CliMA/ClimaAtmos.jl/pull/3114) -- ![][badge-🔥behavioralΔ] Removed the filter for shortwave radiative fluxes. +- ![][badge-🔥behavioralΔ] Removed the filter for shortwave radiative fluxes. PR [#3099](https://github.com/CliMA/ClimaAtmos.jl/pull/3099). v0.26.0 diff --git a/Project.toml b/Project.toml index 16e696ea762..4ab6faa4391 100644 --- a/Project.toml +++ b/Project.toml @@ -18,7 +18,6 @@ ClimaUtilities = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513" CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" -Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838" @@ -48,7 +47,7 @@ Adapt = "4" ArgParse = "1" ArtifactWrappers = "0.2" Artifacts = "1" -AtmosphericProfilesLibrary = "0.1" +AtmosphericProfilesLibrary = "0.1.6" ClimaComms = "0.6.2" ClimaCore = "0.14.6" ClimaDiagnostics = "0.2" @@ -58,7 +57,6 @@ ClimaUtilities = "0.1.3" CloudMicrophysics = "0.22" Colors = "0.12" Dates = "1" -Dierckx = "0.5" DiffEqBase = "6" DocStringExtensions = "0.8, 0.9" FastGaussQuadrature = "0.4, 0.5, 1" diff --git a/docs/Manifest.toml b/docs/Manifest.toml index 71239268855..5d183d546ee 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -5,9 +5,9 @@ manifest_format = "2.0" project_hash = "64afcb8dacf7a673d0068ba1a72602801e8d529a" [[deps.ADTypes]] -git-tree-sha1 = "ae44a0c3d68a420d4ac0fa1f7e0c034ccecb6dc5" +git-tree-sha1 = "7a6b285f217ba92b5b474b783b4c2e8cf8218aaa" uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -version = "1.5.2" +version = "1.5.3" weakdeps = ["ChainRulesCore", "EnzymeCore"] [deps.ADTypes.extensions] @@ -96,9 +96,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" @@ -124,9 +124,9 @@ version = "7.11.0" [[deps.ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "600078184f7de14b3e60efe13fc0ba5c59f6dca5" +git-tree-sha1 = "8556500c18fcad8b4c44058e23fbc4a36143f6be" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.10.0" +version = "1.10.1" weakdeps = ["SparseArrays"] [deps.ArrayLayouts.extensions] @@ -142,10 +142,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"] @@ -155,9 +155,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"] @@ -265,9 +265,9 @@ version = "1.0.5" [[deps.CairoMakie]] deps = ["CRC32c", "Cairo", "Cairo_jll", "Colors", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "Makie", "PrecompileTools"] -git-tree-sha1 = "3441d68ea63944a2b9b6de76603ec1c8b0fd4e3e" +git-tree-sha1 = "f84837ccd1411ba059bb0b752dab9c7f1b0b0826" uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" -version = "0.12.3" +version = "0.12.4" [[deps.Cairo_jll]] deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] @@ -292,7 +292,7 @@ weakdeps = ["SparseArrays"] ChainRulesCoreSparseArraysExt = "SparseArrays" [[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"] +deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Colors", "Dates", "DiffEqBase", "DocStringExtensions", "FastGaussQuadrature", "Insolation", "Interpolations", "IntervalSets", "Krylov", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "YAML"] path = ".." uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" version = "0.26.3" @@ -332,9 +332,9 @@ version = "0.2.3" [[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"] @@ -354,9 +354,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" [deps.ClimaUtilities.extensions] ClimaUtilitiesClimaCommsCUDAExt = ["ClimaComms", "CUDA"] @@ -384,9 +384,9 @@ version = "0.1.13" [[deps.CloudMicrophysics]] deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "HCubature", "LazyArtifacts", "QuadGK", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "2e0dd19f7e4dad484a1ebac015cc3c50698dd571" +git-tree-sha1 = "5d20d3452be63e6c6da766052ddce072e23b425e" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.22.0" +version = "0.22.1" [deps.CloudMicrophysics.extensions] EmulatorModelsExt = ["DataFrames", "MLJ"] @@ -397,9 +397,9 @@ version = "0.22.0" [[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"] @@ -541,9 +541,9 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" [[deps.DelaunayTriangulation]] deps = ["EnumX", "ExactPredicates", "Random"] -git-tree-sha1 = "1755070db557ec2c37df2664c75600298b0c1cfc" +git-tree-sha1 = "b0cb128d2e100646573e1da8565b02491fddb5ef" uuid = "927a84f5-c5f4-47a5-9785-b46e178433df" -version = "1.0.3" +version = "1.0.4" [[deps.DelimitedFiles]] deps = ["Mmap"] @@ -551,18 +551,6 @@ git-tree-sha1 = "9e2f36d3c96a820c678f2f1f1782582fcf685bae" uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" version = "1.9.1" -[[deps.Dierckx]] -deps = ["Dierckx_jll"] -git-tree-sha1 = "d1ea9f433781bb6ff504f7d3cb70c4782c504a3a" -uuid = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" -version = "0.5.3" - -[[deps.Dierckx_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "6596b96fe1caff3db36415eeb6e9d3b50bfe40ee" -uuid = "cd4c43a9-7502-52ba-aa6d-59fb2a88580b" -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 = "d1e8a4642e28b0945bde6e2e1ac569b9e0abd728" @@ -1006,9 +994,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"] @@ -1560,9 +1548,9 @@ version = "0.5.13" [[deps.Makie]] deps = ["Animations", "Base64", "CRC32c", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Dates", "DelaunayTriangulation", "Distributions", "DocStringExtensions", "Downloads", "FFMPEG_jll", "FileIO", "FilePaths", "FixedPointNumbers", "Format", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "InteractiveUtils", "IntervalSets", "Isoband", "KernelDensity", "LaTeXStrings", "LinearAlgebra", "MacroTools", "MakieCore", "Markdown", "MathTeXEngine", "Observables", "OffsetArrays", "Packing", "PlotUtils", "PolygonOps", "PrecompileTools", "Printf", "REPL", "Random", "RelocatableFolders", "Scratch", "ShaderAbstractions", "Showoff", "SignedDistanceFields", "SparseArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "TriplotBase", "UnicodeFun", "Unitful"] -git-tree-sha1 = "e11b0666b457e3bb60119f2ed4d063d2b68954d3" +git-tree-sha1 = "57a1a2b3d12e04f9e9fb77d61cd12571d5541c5f" uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" -version = "0.21.3" +version = "0.21.4" [[deps.MakieCore]] deps = ["ColorTypes", "GeometryBasics", "IntervalSets", "Observables"] @@ -1745,9 +1733,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] @@ -2017,9 +2005,9 @@ version = "1.3.4" [[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" @@ -2120,9 +2108,9 @@ version = "0.6.43" [[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" @@ -2308,9 +2296,9 @@ weakdeps = ["OffsetArrays", "StaticArrays"] [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] -git-tree-sha1 = "20833c5b7f7edf0e5026f23db7f268e4f23ec577" +git-tree-sha1 = "eeafab08ae20c62c44c8399ccb9354a04b80db50" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.9.6" +version = "1.9.7" weakdeps = ["ChainRulesCore", "Statistics"] [deps.StaticArrays.extensions] @@ -2408,9 +2396,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"] @@ -2488,9 +2476,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] diff --git a/examples/Manifest.toml b/examples/Manifest.toml index f08c5eb74b1..92453559d04 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -2,12 +2,12 @@ julia_version = "1.10.4" manifest_format = "2.0" -project_hash = "d95e2ede05eb683ad8fc21789282919021c2aa3d" +project_hash = "0c59f47e75bae5d377c2b1fa267ce810d21934c6" [[deps.ADTypes]] -git-tree-sha1 = "ae44a0c3d68a420d4ac0fa1f7e0c034ccecb6dc5" +git-tree-sha1 = "7a6b285f217ba92b5b474b783b4c2e8cf8218aaa" uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -version = "1.5.2" +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 = "8556500c18fcad8b4c44058e23fbc4a36143f6be" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.10.0" +version = "1.10.1" 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"] @@ -255,9 +255,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"] @@ -267,9 +267,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"] @@ -320,7 +320,7 @@ version = "0.5.5" GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6" [[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"] +deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Colors", "Dates", "DiffEqBase", "DocStringExtensions", "FastGaussQuadrature", "Insolation", "Interpolations", "IntervalSets", "Krylov", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "YAML"] path = ".." uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" version = "0.26.3" @@ -384,9 +384,9 @@ version = "0.2.3" [[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"] @@ -406,9 +406,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] @@ -428,9 +428,9 @@ version = "0.1.13" [[deps.CloudMicrophysics]] deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "HCubature", "LazyArtifacts", "QuadGK", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "2e0dd19f7e4dad484a1ebac015cc3c50698dd571" +git-tree-sha1 = "5d20d3452be63e6c6da766052ddce072e23b425e" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.22.0" +version = "0.22.1" [deps.CloudMicrophysics.extensions] EmulatorModelsExt = ["DataFrames", "MLJ"] @@ -447,9 +447,9 @@ version = "1.3.5" [[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"] @@ -597,9 +597,9 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" [[deps.DelaunayTriangulation]] deps = ["EnumX", "ExactPredicates", "Random"] -git-tree-sha1 = "1755070db557ec2c37df2664c75600298b0c1cfc" +git-tree-sha1 = "b0cb128d2e100646573e1da8565b02491fddb5ef" uuid = "927a84f5-c5f4-47a5-9785-b46e178433df" -version = "1.0.3" +version = "1.0.4" [[deps.DelimitedFiles]] deps = ["Mmap"] @@ -607,18 +607,6 @@ git-tree-sha1 = "9e2f36d3c96a820c678f2f1f1782582fcf685bae" uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" version = "1.9.1" -[[deps.Dierckx]] -deps = ["Dierckx_jll"] -git-tree-sha1 = "d1ea9f433781bb6ff504f7d3cb70c4782c504a3a" -uuid = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" -version = "0.5.3" - -[[deps.Dierckx_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "6596b96fe1caff3db36415eeb6e9d3b50bfe40ee" -uuid = "cd4c43a9-7502-52ba-aa6d-59fb2a88580b" -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 = "d1e8a4642e28b0945bde6e2e1ac569b9e0abd728" @@ -979,9 +967,9 @@ version = "6.2.1+6" [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "Serialization", "Statistics"] -git-tree-sha1 = "5c9de6d5af87acd2cf719e214ed7d51e14017b7a" +git-tree-sha1 = "04661708f5301394a1f1be86a07a89e835900db6" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "10.2.2" +version = "10.2.3" [[deps.GPUArraysCore]] deps = ["Adapt"] @@ -1055,9 +1043,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"] @@ -1266,9 +1254,9 @@ version = "1.0.0" [[deps.JET]] deps = ["CodeTracking", "InteractiveUtils", "JuliaInterpreter", "LoweredCodeUtils", "MacroTools", "Pkg", "PrecompileTools", "Preferences", "Test"] -git-tree-sha1 = "8dc1a7e850cbcbb28d5beecc3816c16acd3f7452" +git-tree-sha1 = "1f209ff8dce4cebff6bfebd2da9cdc0e982874a6" uuid = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" -version = "0.9.5" +version = "0.9.6" [deps.JET.extensions] ReviseExt = "Revise" @@ -1278,9 +1266,9 @@ version = "0.9.5" [[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.JLLWrappers]] deps = ["Artifacts", "Preferences"] @@ -1612,9 +1600,9 @@ weakdeps = ["ChainRulesCore", "ForwardDiff", "SpecialFunctions"] [[deps.LoweredCodeUtils]] deps = ["JuliaInterpreter"] -git-tree-sha1 = "c6a36b22d2cca0e1a903f00f600991f97bf5f426" +git-tree-sha1 = "eeaedcf337f33c039f9f3a209a8db992deefd7e9" uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b" -version = "2.4.6" +version = "2.4.8" [[deps.Lz4_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1850,9 +1838,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] @@ -2171,9 +2159,9 @@ version = "1.3.4" [[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" @@ -2268,9 +2256,9 @@ version = "0.6.43" [[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" @@ -2311,9 +2299,9 @@ version = "1.2.1" [[deps.SentinelArrays]] deps = ["Dates", "Random"] -git-tree-sha1 = "90b4f68892337554d31cdcdbe19e48989f26c7e6" +git-tree-sha1 = "6bb314cb1aacfa37ef58e5a0ccf4a1ec0311f495" uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c" -version = "1.4.3" +version = "1.4.4" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -2462,9 +2450,9 @@ weakdeps = ["OffsetArrays", "StaticArrays"] [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] -git-tree-sha1 = "20833c5b7f7edf0e5026f23db7f268e4f23ec577" +git-tree-sha1 = "eeafab08ae20c62c44c8399ccb9354a04b80db50" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.9.6" +version = "1.9.7" weakdeps = ["ChainRulesCore", "Statistics"] [deps.StaticArrays.extensions] @@ -2556,9 +2544,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"] @@ -2642,9 +2630,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] @@ -2738,9 +2726,9 @@ version = "1.0.0" [[deps.WriteVTK]] deps = ["Base64", "CodecZlib", "FillArrays", "LightXML", "TranscodingStreams", "VTKBase"] -git-tree-sha1 = "48b9e8e9c83865e99e57f027d4edfa94e0acddae" +git-tree-sha1 = "46664bb833f24e4fe561192e3753c9168c3b71b2" uuid = "64499a7a-5c06-52f2-abe2-ccb03c286192" -version = "1.19.1" +version = "1.19.2" [[deps.XML2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"] diff --git a/examples/Project.toml b/examples/Project.toml index 0d94ece4a1b..f1772ce7049 100644 --- a/examples/Project.toml +++ b/examples/Project.toml @@ -22,7 +22,6 @@ ClimaUtilities = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513" CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" -Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838" diff --git a/perf/Manifest.toml b/perf/Manifest.toml index 5c5a3df108c..87493c86749 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -2,12 +2,12 @@ julia_version = "1.10.4" manifest_format = "2.0" -project_hash = "7a92cac99b6b02f9ad635d89d8820baa11d445e7" +project_hash = "ddcac0ed38fc33b661f9c30ef50fd3e33f33a3e0" [[deps.ADTypes]] -git-tree-sha1 = "ae44a0c3d68a420d4ac0fa1f7e0c034ccecb6dc5" +git-tree-sha1 = "7a6b285f217ba92b5b474b783b4c2e8cf8218aaa" uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -version = "1.5.2" +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 = "8556500c18fcad8b4c44058e23fbc4a36143f6be" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.10.0" +version = "1.10.1" 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"] @@ -266,9 +266,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"] @@ -278,9 +278,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"] @@ -331,7 +331,7 @@ version = "0.5.5" GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6" [[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"] +deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Colors", "Dates", "DiffEqBase", "DocStringExtensions", "FastGaussQuadrature", "Insolation", "Interpolations", "IntervalSets", "Krylov", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "YAML"] path = ".." uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" version = "0.26.3" @@ -395,9 +395,9 @@ version = "0.2.3" [[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"] @@ -411,9 +411,9 @@ weakdeps = ["BenchmarkTools", "CUDA", "OrderedCollections", "PrettyTables", "Sta [[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] @@ -433,9 +433,9 @@ version = "0.1.13" [[deps.CloudMicrophysics]] deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "HCubature", "LazyArtifacts", "QuadGK", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "2e0dd19f7e4dad484a1ebac015cc3c50698dd571" +git-tree-sha1 = "5d20d3452be63e6c6da766052ddce072e23b425e" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.22.0" +version = "0.22.1" [deps.CloudMicrophysics.extensions] EmulatorModelsExt = ["DataFrames", "MLJ"] @@ -452,9 +452,9 @@ version = "1.3.5" [[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"] @@ -608,9 +608,9 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" [[deps.DelaunayTriangulation]] deps = ["EnumX", "ExactPredicates", "Random"] -git-tree-sha1 = "1755070db557ec2c37df2664c75600298b0c1cfc" +git-tree-sha1 = "b0cb128d2e100646573e1da8565b02491fddb5ef" uuid = "927a84f5-c5f4-47a5-9785-b46e178433df" -version = "1.0.3" +version = "1.0.4" [[deps.DelimitedFiles]] deps = ["Mmap"] @@ -618,18 +618,6 @@ git-tree-sha1 = "9e2f36d3c96a820c678f2f1f1782582fcf685bae" uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" version = "1.9.1" -[[deps.Dierckx]] -deps = ["Dierckx_jll"] -git-tree-sha1 = "d1ea9f433781bb6ff504f7d3cb70c4782c504a3a" -uuid = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" -version = "0.5.3" - -[[deps.Dierckx_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "6596b96fe1caff3db36415eeb6e9d3b50bfe40ee" -uuid = "cd4c43a9-7502-52ba-aa6d-59fb2a88580b" -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 = "d1e8a4642e28b0945bde6e2e1ac569b9e0abd728" @@ -1014,9 +1002,9 @@ version = "6.2.1+6" [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "Serialization", "Statistics"] -git-tree-sha1 = "5c9de6d5af87acd2cf719e214ed7d51e14017b7a" +git-tree-sha1 = "04661708f5301394a1f1be86a07a89e835900db6" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "10.2.2" +version = "10.2.3" [[deps.GPUArraysCore]] deps = ["Adapt"] @@ -1090,9 +1078,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.Graphviz_jll]] deps = ["Artifacts", "Cairo_jll", "Expat_jll", "JLLWrappers", "Libdl", "Pango_jll", "Pkg"] @@ -1313,9 +1301,9 @@ version = "0.8.29" [[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.JLLWrappers]] deps = ["Artifacts", "Preferences"] @@ -1890,9 +1878,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] @@ -2247,9 +2235,9 @@ version = "1.3.4" [[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" @@ -2300,9 +2288,9 @@ version = "1.1.1" [[deps.Revise]] deps = ["CodeTracking", "Distributed", "FileWatching", "JuliaInterpreter", "LibGit2", "LoweredCodeUtils", "OrderedCollections", "Pkg", "REPL", "Requires", "UUIDs", "Unicode"] -git-tree-sha1 = "12aa2d7593df490c407a3bbd8b86b8b515017f3e" +git-tree-sha1 = "85ddd93ea15dcd8493400600e09104a9e94bb18d" uuid = "295af30f-e4ad-537b-8983-00126c2a3abe" -version = "3.5.14" +version = "3.5.15" [[deps.Rmath]] deps = ["Random", "Rmath_jll"] @@ -2356,9 +2344,9 @@ version = "0.6.43" [[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" @@ -2399,9 +2387,9 @@ version = "1.2.1" [[deps.SentinelArrays]] deps = ["Dates", "Random"] -git-tree-sha1 = "90b4f68892337554d31cdcdbe19e48989f26c7e6" +git-tree-sha1 = "6bb314cb1aacfa37ef58e5a0ccf4a1ec0311f495" uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c" -version = "1.4.3" +version = "1.4.4" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -2562,9 +2550,9 @@ weakdeps = ["OffsetArrays", "StaticArrays"] [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] -git-tree-sha1 = "20833c5b7f7edf0e5026f23db7f268e4f23ec577" +git-tree-sha1 = "eeafab08ae20c62c44c8399ccb9354a04b80db50" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.9.6" +version = "1.9.7" weakdeps = ["ChainRulesCore", "Statistics"] [deps.StaticArrays.extensions] @@ -2656,9 +2644,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"] @@ -2855,9 +2843,9 @@ version = "1.0.0" [[deps.WriteVTK]] deps = ["Base64", "CodecZlib", "FillArrays", "LightXML", "TranscodingStreams", "VTKBase"] -git-tree-sha1 = "48b9e8e9c83865e99e57f027d4edfa94e0acddae" +git-tree-sha1 = "46664bb833f24e4fe561192e3753c9168c3b71b2" uuid = "64499a7a-5c06-52f2-abe2-ccb03c286192" -version = "1.19.1" +version = "1.19.2" [[deps.XML2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"] diff --git a/perf/Project.toml b/perf/Project.toml index 4709888bdb6..8d62abf7d99 100644 --- a/perf/Project.toml +++ b/perf/Project.toml @@ -22,7 +22,6 @@ ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79" CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" -Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" diff --git a/src/initial_conditions/InitialConditions.jl b/src/initial_conditions/InitialConditions.jl index 3ea8719a515..f88fcfa5a31 100644 --- a/src/initial_conditions/InitialConditions.jl +++ b/src/initial_conditions/InitialConditions.jl @@ -26,7 +26,7 @@ import ..Parameters as CAP import Thermodynamics as TD import AtmosphericProfilesLibrary as APL import SciMLBase -import Dierckx +import Interpolations as Intp import NCDatasets as NC include("local_state.jl") diff --git a/src/initial_conditions/initial_conditions.jl b/src/initial_conditions/initial_conditions.jl index b0034378e13..600d097f156 100644 --- a/src/initial_conditions/initial_conditions.jl +++ b/src/initial_conditions/initial_conditions.jl @@ -39,7 +39,10 @@ struct ColumnInterpolatableField{F, D} function ColumnInterpolatableField(f::Fields.ColumnField) zdata = vec(parent(Fields.Fields.coordinate_field(f).z)) fdata = vec(parent(f)) - data = Dierckx.Spline1D(zdata, fdata; k = 1) + data = Intp.extrapolate( + Intp.interpolate((zdata,), fdata, Intp.Gridded(Intp.Linear())), + Intp.Flat(), + ) return new{typeof(f), typeof(data)}(f, data) end end @@ -710,7 +713,8 @@ end ## EDMF Test Cases ## # TODO: Get rid of this -const FunctionOrSpline = Union{Dierckx.Spline1D, Function} +const FunctionOrSpline = + Union{Intp.GriddedInterpolation, Intp.Extrapolation, Function} """ hydrostatic_pressure_profile(; thermo_params, p_0, [T, θ, q_tot, z_max]) @@ -1060,7 +1064,14 @@ function (initial_condition::TRMM_LBA)(params) q_v_sat = p_v_sat * (1 / molmass_ratio) / denominator return q_v_sat * measured_RH(z) / 100 end - q_tot = Dierckx.Spline1D(measured_z_values, measured_q_tot_values; k = 1) + q_tot = Intp.extrapolate( + Intp.interpolate( + (measured_z_values,), + measured_q_tot_values; + Intp.Gridded(Intp.Linear()), + ), + Intp.Flat(), + ) p = hydrostatic_pressure_profile(; thermo_params, p_0, T, q_tot) u = APL.TRMM_LBA_u(FT) @@ -1144,7 +1155,10 @@ function (initial_condition::GCMDriven)(params) z_gcm = gcm_z(external_forcing_file) vars = gcm_initial_conditions(external_forcing_file) θ, u, v, q_tot, ρ₀ = map(vars) do value - Dierckx.Spline1D(z_gcm, value; k = 1) + Intp.extrapolate( + Intp.interpolate((z_gcm,), value, Intp.Gridded(Intp.Linear())), + Intp.Flat(), + ) end function local_state(local_geometry) diff --git a/src/parameterized_tendencies/radiation/radiation.jl b/src/parameterized_tendencies/radiation/radiation.jl index 3cd726c23d7..1b6bcf3f3cc 100644 --- a/src/parameterized_tendencies/radiation/radiation.jl +++ b/src/parameterized_tendencies/radiation/radiation.jl @@ -10,7 +10,7 @@ import .Parameters as CAP import RRTMGP import .RRTMGPInterface as RRTMGPI -using Dierckx: Spline1D +import Interpolations using StatsBase: mean @@ -96,9 +96,13 @@ function radiation_model_cache( vec(mean(reshape(input_data["ozone"][:, :, 1], n, :); dims = 2)) # interpolate the ozone concentrations to our initial pressures - pressure2ozone = Spline1D( - input_center_pressure, - input_center_volume_mixing_ratio_o3, + pressure2ozone = Intp.extrapolate( + Intp.interpolate( + (input_center_pressure,), + input_center_volume_mixing_ratio_o3, + Intp.Gridded(Intp.Linear()), + ), + Intp.Flat(), ) if device isa ClimaComms.CUDADevice fv = Fields.field_values(ᶜp) diff --git a/src/prognostic_equations/forcing/external_forcing.jl b/src/prognostic_equations/forcing/external_forcing.jl index 43b70b0e770..822d41b4ae1 100644 --- a/src/prognostic_equations/forcing/external_forcing.jl +++ b/src/prognostic_equations/forcing/external_forcing.jl @@ -6,10 +6,13 @@ import Thermodynamics as TD import ClimaCore.Spaces as Spaces import ClimaCore.Fields as Fields import NCDatasets as NC -import Dierckx +import Interpolations as Intp function interp_vertical_prof(x, xp, fp) - spl = Dierckx.Spline1D(xp, fp; k = 1) + spl = Intp.extrapolate( + Intp.interpolate((xp,), fp, Intp.Gridded(Intp.Linear())), + Intp.Flat(), + ) return spl(vec(x)) end diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl index 6f5562b53fe..3c19e7fb6ac 100644 --- a/src/solver/type_getters.jl +++ b/src/solver/type_getters.jl @@ -1,6 +1,5 @@ using Adapt using Dates: DateTime, @dateformat_str -using Dierckx using Interpolations import NCDatasets import ClimaUtilities.OutputPathGenerator diff --git a/src/surface_conditions/SurfaceConditions.jl b/src/surface_conditions/SurfaceConditions.jl index d97711801b4..b8b6ba75a5e 100644 --- a/src/surface_conditions/SurfaceConditions.jl +++ b/src/surface_conditions/SurfaceConditions.jl @@ -20,7 +20,7 @@ import ClimaCore.Geometry: ⊗ import SurfaceFluxes as SF import Thermodynamics as TD -import Dierckx +import Interpolations import StaticArrays as SA import Statistics: mean import NCDatasets as NC diff --git a/src/surface_conditions/surface_setups.jl b/src/surface_conditions/surface_setups.jl index 8db78896dfe..79c0c2e0008 100644 --- a/src/surface_conditions/surface_setups.jl +++ b/src/surface_conditions/surface_setups.jl @@ -142,9 +142,14 @@ function (::ARM_SGP)(params) thermo_params = CAP.thermodynamics_params(params) ts = TD.PhaseNonEquil_pθq(thermo_params, p, θ, TD.PhasePartition(q_vap)) T = TD.air_temperature(thermo_params, ts) - shf = FT.(Dierckx.Spline1D(t_data, shf_data; k = 1)) - lhf = FT.(Dierckx.Spline1D(t_data, lhf_data; k = 1)) - # TODO: Replace Dierckx with a type-stable interpolation and remove the FT. + shf = Intp.extrapolate( + Intp.interpolate((t_data,), shf_data, Intp.Gridded(Intp.Linear())), + Intp.Flat(), + ) + lhf = Intp.extrapolate( + Intp.interpolate(t_data, lhf_data, Intp.Gridded(Intp.Linear())), + Intp.Flat(), + ) function surface_state(surface_coordinates, interior_z, t) fluxes = HeatFluxes(; shf = shf(t), lhf = lhf(t)) parameterization = MoninObukhov(; z0, fluxes, ustar) diff --git a/test/Project.toml b/test/Project.toml index 3a01493f433..994d80c8283 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -19,7 +19,6 @@ ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79" CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" -Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def" DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503" @@ -72,7 +71,6 @@ ClimaCorePlots = "0.2" ClimaCoreSpectra = "0.1" ClimaCoreTempestRemap = "0.3" ClimaCoreVTK = "0.7" -Dierckx = "0.5" DiffEqNoiseProcess = "5" ForwardDiff = "0.10" Glob = "1"