From 9ed2e069c00ec6306c9bae61000370a94aec480c Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Fri, 2 Feb 2024 16:59:30 -0800 Subject: [PATCH 1/8] add output/ to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 47e5e6369e..e162f8cd28 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,9 @@ docs/src/generated/ !experiments/ClimaCore/**/Manifest.toml !perf/Manifest.toml +# Output +output/ + # Data *.vtk *.dat From 90d67934bb9ee300e6fe4a3ad6475eb3966c523d Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Fri, 2 Feb 2024 16:58:45 -0800 Subject: [PATCH 2/8] update compats --- Project.toml | 10 +-- experiments/AMIP/Manifest.toml | 56 +++++++----- experiments/AMIP/Project.toml | 3 - perf/Manifest.toml | 150 +++++++++++++++++++-------------- perf/Project.toml | 3 - 5 files changed, 126 insertions(+), 96 deletions(-) diff --git a/Project.toml b/Project.toml index fafc4e1d87..60c8b6a6bc 100644 --- a/Project.toml +++ b/Project.toml @@ -24,22 +24,22 @@ TempestRemap_jll = "8573a8c5-1df0-515e-a024-abad257ee284" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" [compat] -CLIMAParameters = "0.4, 0.5, 0.6, 0.7" -ClimaAtmos = "0.19.1" +CLIMAParameters = "0.8.1" +ClimaAtmos = "0.20" ClimaComms = "0.5.6" ClimaCore = "0.11.8" ClimaCoreTempestRemap = "0.3" -ClimaLSM = "0.6" +ClimaLSM = "0.7" Dates = "1" DocStringExtensions = "0.8, 0.9" -Insolation = "0.8" +Insolation = "0.9" JLD2 = "0.4" NCDatasets = "0.11, 0.12, 0.13" Plots = "1.39.0" SciMLBase = "1, 2" StaticArrays = "1" Statistics = "1" -SurfaceFluxes = "0.8" +SurfaceFluxes = "0.9" TempestRemap_jll = "2" Thermodynamics = "0.11" julia = "1.8" diff --git a/experiments/AMIP/Manifest.toml b/experiments/AMIP/Manifest.toml index 7bb8ccaef0..e448507d98 100644 --- a/experiments/AMIP/Manifest.toml +++ b/experiments/AMIP/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.0" manifest_format = "2.0" -project_hash = "e30e3cec173b96ef0f39af976fadb60750b6f220" +project_hash = "583d53437ea883f44a3bef71d0af7d6b8d674ee0" [[deps.ADTypes]] git-tree-sha1 = "41c37aa88889c171f1300ceac1313c06e891d245" @@ -195,9 +195,9 @@ version = "0.1.2" [[deps.CLIMAParameters]] deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "a085251dfe4b0f732fe2b65d5354e6af91a8e931" +git-tree-sha1 = "ccfac72eed3ccf27ad086564059cab9d64567c7d" uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" -version = "0.7.26" +version = "0.8.5" [[deps.CPUSummary]] deps = ["CpuId", "IfElse", "PrecompileTools", "Static"] @@ -270,9 +270,9 @@ weakdeps = ["SparseArrays"] [[deps.ClimaAtmos]] deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "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 = "03d3c492f00813e5a94de85a22ae2798c812c69d" +git-tree-sha1 = "10e8fbe55c7a1aae4e28a535b1b4114ad1f2a176" uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" -version = "0.19.2" +version = "0.20.0" [[deps.ClimaComms]] deps = ["CUDA", "MPI"] @@ -309,10 +309,10 @@ uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" version = "0.1.0" [[deps.ClimaLSM]] -deps = ["ArtifactWrappers", "CFTime", "CSV", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "DataFrames", "Dates", "DocStringExtensions", "Flux", "HTTP", "IntervalSets", "JLD2", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "StatsBase", "SurfaceFluxes", "Thermodynamics", "cuDNN"] -git-tree-sha1 = "856e804712907aa32a944ef5c3a028171920fd94" +deps = ["Adapt", "ArtifactWrappers", "CFTime", "CSV", "CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "DataFrames", "Dates", "DocStringExtensions", "Flux", "HTTP", "IntervalSets", "JLD2", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "StatsBase", "SurfaceFluxes", "Thermodynamics", "cuDNN"] +git-tree-sha1 = "63a82b4c5687899b69a362482e5990fd935bc0a5" uuid = "7884a58f-fab6-4fd0-82bb-ecfedb2d8430" -version = "0.6.0" +version = "0.7.0" [[deps.ClimaTimeSteppers]] deps = ["CUDA", "ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"] @@ -328,9 +328,9 @@ version = "0.1.12" [[deps.CloudMicrophysics]] deps = ["CLIMAParameters", "DocStringExtensions", "ForwardDiff", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "a6993c57af74e2e0f2191b556178cc8d8c0df9d6" +git-tree-sha1 = "0c0be34fad945b95fd3c94cca9003bacae990ccf" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.15.1" +version = "0.15.2" [[deps.CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] @@ -935,9 +935,13 @@ version = "1.4.0" [[deps.Insolation]] deps = ["Artifacts", "Dates", "DelimitedFiles", "Interpolations"] -git-tree-sha1 = "2679907708edd9bbe2bd98585e575b48f17902c8" +git-tree-sha1 = "2aaf998568ab59643cefb0fc17eba42f9d5bef37" uuid = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8" -version = "0.8.2" +version = "0.9.0" +weakdeps = ["CLIMAParameters"] + + [deps.Insolation.extensions] + CreateParametersExt = "CLIMAParameters" [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1669,10 +1673,14 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] -deps = ["Adapt", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "40ea97b2334725cef9b7f9e2fc2f76b35596807d" +deps = ["Adapt", "Artifacts", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] +git-tree-sha1 = "3493869e9bbe529dfd8dada02b455847bdb46f27" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.10.0" +version = "0.11.0" +weakdeps = ["CLIMAParameters"] + + [deps.RRTMGP.extensions] + CreateParametersExt = "CLIMAParameters" [[deps.Random]] deps = ["SHA"] @@ -1976,10 +1984,14 @@ uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" version = "7.2.1+1" [[deps.SurfaceFluxes]] -deps = ["CLIMAParameters", "DocStringExtensions", "RootSolvers", "Thermodynamics"] -git-tree-sha1 = "a167924897731ee57ef0197bb19357bfc2d007bc" +deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] +git-tree-sha1 = "6431256ee7c06ed2900fd46688f355e5a43e90eb" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" -version = "0.8.1" +version = "0.9.1" +weakdeps = ["CLIMAParameters"] + + [deps.SurfaceFluxes.extensions] + CreateParametersExt = "CLIMAParameters" [[deps.SymbolicIndexingInterface]] git-tree-sha1 = "b3103f4f50a3843e66297a2456921377c78f5e31" @@ -2049,9 +2061,13 @@ version = "1.0.1" [[deps.Thermodynamics]] deps = ["DocStringExtensions", "KernelAbstractions", "Random", "RootSolvers"] -git-tree-sha1 = "2de4b5ccc71baf3578959928c295a2fa13105db7" +git-tree-sha1 = "d3b8b0346aa5f101135fbe3cd62acaeb2074a50a" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -version = "0.11.2" +version = "0.11.6" +weakdeps = ["CLIMAParameters"] + + [deps.Thermodynamics.extensions] + CreateParametersExt = "CLIMAParameters" [[deps.ThreadingUtilities]] deps = ["ManualMemory"] diff --git a/experiments/AMIP/Project.toml b/experiments/AMIP/Project.toml index b31df1410b..744a95447a 100644 --- a/experiments/AMIP/Project.toml +++ b/experiments/AMIP/Project.toml @@ -31,7 +31,6 @@ NVTX = "5da4648a-3479-48b8-97b9-01cb529c0a1f" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c" -RRTMGP = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" @@ -47,7 +46,6 @@ YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6" ArgParse = "1.1" ArtifactWrappers = "0.2" AtmosphericProfilesLibrary = "0.1" -CLIMAParameters = "0.4, 0.5, 0.6, 0.7" ClimaCorePlots = "0.2" ClimaCoupler = "0.1" ClimaTimeSteppers = "0.7" @@ -61,7 +59,6 @@ JSON = "0.21" MPI = "0.20" NVTX = "0.3" ProgressLogging = "0.1" -RRTMGP = "0.10.0" StaticArrays = "1" TerminalLoggers = "0.1" YAML = "0.4" diff --git a/perf/Manifest.toml b/perf/Manifest.toml index a1b42f2e3c..2b1ce20e5a 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.0" manifest_format = "2.0" -project_hash = "bf80aa242c5f214868828f301d47a2d12b65d5f5" +project_hash = "b48c593fa4849aac2901b07964ac17f6692837ed" [[deps.ADTypes]] git-tree-sha1 = "41c37aa88889c171f1300ceac1313c06e891d245" @@ -80,9 +80,9 @@ version = "7.7.0" [[deps.ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "a45ec4acc9d905f94b47243cff666820bb107789" +git-tree-sha1 = "64d582bcb9c93ac741234789eeb4f16812413efb" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.5.2" +version = "1.6.0" weakdeps = ["SparseArrays"] [deps.ArrayLayouts.extensions] @@ -123,9 +123,9 @@ version = "0.4.2" [[deps.BandedMatrices]] deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "PrecompileTools"] -git-tree-sha1 = "27baf04c642465b4289179f29bb7127f0673d4f1" +git-tree-sha1 = "3ac52471386dfcc0f6a3c8aeb37ed37c37701128" uuid = "aae01518-5342-5314-be14-df237901396f" -version = "1.4.0" +version = "1.4.1" weakdeps = ["SparseArrays"] [deps.BandedMatrices.extensions] @@ -133,9 +133,9 @@ weakdeps = ["SparseArrays"] [[deps.BangBang]] deps = ["Compat", "ConstructionBase", "InitialValues", "LinearAlgebra", "Requires", "Setfield", "Tables"] -git-tree-sha1 = "e28912ce94077686443433c2800104b061a827ed" +git-tree-sha1 = "7aa7ad1682f3d5754e3491bb59b8103cae28e3a3" uuid = "198e06fe-97b7-11e9-32a5-e1d131e6ad66" -version = "0.3.39" +version = "0.3.40" [deps.BangBang.extensions] BangBangChainRulesCoreExt = "ChainRulesCore" @@ -195,9 +195,9 @@ version = "0.1.2" [[deps.CLIMAParameters]] deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "a085251dfe4b0f732fe2b65d5354e6af91a8e931" +git-tree-sha1 = "ccfac72eed3ccf27ad086564059cab9d64567c7d" uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" -version = "0.7.26" +version = "0.8.5" [[deps.CPUSummary]] deps = ["CpuId", "IfElse", "PrecompileTools", "Static"] @@ -230,9 +230,9 @@ version = "0.7.0+1" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] -git-tree-sha1 = "bcc4a23cbbd99c8535a5318455dcf0f2546ec536" +git-tree-sha1 = "2cb12f6b2209f40a4b8967697689a47c50485490" uuid = "1af6417a-86b4-443c-805f-a4643ffb695f" -version = "0.2.2" +version = "0.2.3" [[deps.CUDA_Runtime_jll]] deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] @@ -254,15 +254,15 @@ version = "1.16.1+1" [[deps.ChainRules]] deps = ["Adapt", "ChainRulesCore", "Compat", "Distributed", "GPUArraysCore", "IrrationalConstants", "LinearAlgebra", "Random", "RealDot", "SparseArrays", "SparseInverseSubset", "Statistics", "StructArrays", "SuiteSparse"] -git-tree-sha1 = "0aa0a3dd7b9bacbbadf1932ccbdfa938985c5561" +git-tree-sha1 = "213f001d1233fd3b8ef007f50c8cab29061917d8" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "1.58.1" +version = "1.61.0" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra"] -git-tree-sha1 = "c1deebd76f7a443d527fc0430d5758b8b2112ed8" +git-tree-sha1 = "1287e3872d646eed95198457873249bd9f0caed2" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.19.1" +version = "1.20.1" weakdeps = ["SparseArrays"] [deps.ChainRulesCore.extensions] @@ -270,9 +270,9 @@ weakdeps = ["SparseArrays"] [[deps.ClimaAtmos]] deps = ["ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "CLIMAParameters", "ClimaComms", "ClimaCore", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "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 = "03d3c492f00813e5a94de85a22ae2798c812c69d" +git-tree-sha1 = "10e8fbe55c7a1aae4e28a535b1b4114ad1f2a176" uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" -version = "0.19.2" +version = "0.20.0" [[deps.ClimaComms]] deps = ["CUDA", "MPI"] @@ -282,9 +282,9 @@ version = "0.5.6" [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "Unrolled"] -git-tree-sha1 = "e43923b57aa6abea8df2b59e1318f5598e715bf0" +git-tree-sha1 = "541bf25a8adc3c7ddf8d45a96149964f5cfbb074" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.11.8" +version = "0.11.9" weakdeps = ["Krylov"] [deps.ClimaCore.extensions] @@ -309,10 +309,10 @@ uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" version = "0.1.0" [[deps.ClimaLSM]] -deps = ["ArtifactWrappers", "CFTime", "CSV", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "DataFrames", "Dates", "DocStringExtensions", "Flux", "HTTP", "IntervalSets", "JLD2", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "StatsBase", "SurfaceFluxes", "Thermodynamics", "cuDNN"] -git-tree-sha1 = "856e804712907aa32a944ef5c3a028171920fd94" +deps = ["Adapt", "ArtifactWrappers", "CFTime", "CSV", "CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "DataFrames", "Dates", "DocStringExtensions", "Flux", "HTTP", "IntervalSets", "JLD2", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "StatsBase", "SurfaceFluxes", "Thermodynamics", "cuDNN"] +git-tree-sha1 = "63a82b4c5687899b69a362482e5990fd935bc0a5" uuid = "7884a58f-fab6-4fd0-82bb-ecfedb2d8430" -version = "0.6.0" +version = "0.7.0" [[deps.ClimaTimeSteppers]] deps = ["CUDA", "ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"] @@ -328,15 +328,15 @@ version = "0.1.12" [[deps.CloudMicrophysics]] deps = ["CLIMAParameters", "DocStringExtensions", "ForwardDiff", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "a6993c57af74e2e0f2191b556178cc8d8c0df9d6" +git-tree-sha1 = "0c0be34fad945b95fd3c94cca9003bacae990ccf" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.15.1" +version = "0.15.2" [[deps.CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] -git-tree-sha1 = "cd67fc487743b2f0fd4380d4cbd3a24660d0eec8" +git-tree-sha1 = "59939d8a997469ee05c4b4944560a820f9ba0d73" uuid = "944b1d66-785c-5afd-91f1-9de20f533193" -version = "0.7.3" +version = "0.7.4" [[deps.ColorSchemes]] deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "PrecompileTools", "Random"] @@ -455,9 +455,9 @@ uuid = "7445602f-e544-4518-8976-18f8e8ae6cdb" version = "0.2.4" [[deps.DataAPI]] -git-tree-sha1 = "8da84edb865b0b5b0100c0666a9bc9a0b71c553c" +git-tree-sha1 = "abe83f3a2f1b857aac70ef8b269080af17764bbe" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.15.0" +version = "1.16.0" [[deps.DataFrames]] deps = ["Compat", "DataAPI", "DataStructures", "Future", "InlineStrings", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrecompileTools", "PrettyTables", "Printf", "REPL", "Random", "Reexport", "SentinelArrays", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] @@ -737,9 +737,9 @@ version = "0.8.4" [[deps.Flux]] deps = ["Adapt", "ChainRulesCore", "Compat", "Functors", "LinearAlgebra", "MLUtils", "MacroTools", "NNlib", "OneHotArrays", "Optimisers", "Preferences", "ProgressLogging", "Random", "Reexport", "SparseArrays", "SpecialFunctions", "Statistics", "Zygote"] -git-tree-sha1 = "2827339fbc2291d541a9c62ffbf28da7f3621ae4" +git-tree-sha1 = "39a9e46b4e92d5b56c0712adeb507555a2327240" uuid = "587475ba-b771-5e3f-ad9e-33799f191a9c" -version = "0.14.9" +version = "0.14.11" [deps.Flux.extensions] FluxAMDGPUExt = "AMDGPU" @@ -834,15 +834,15 @@ version = "0.25.0" [[deps.GR]] deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "UUIDs", "p7zip_jll"] -git-tree-sha1 = "27442171f28c952804dede8ff72828a96f2bfc1f" +git-tree-sha1 = "3458564589be207fa6a77dbbf8b97674c9836aab" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.72.10" +version = "0.73.2" [[deps.GR_jll]] deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "FreeType2_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"] -git-tree-sha1 = "025d171a2847f616becc0f84c8dc62fe18f0f6dd" +git-tree-sha1 = "77f81da2964cc9fa7c0127f941e8bce37f7f1d70" uuid = "d2c73de3-f751-5644-a686-071e5b155ba9" -version = "0.72.10+0" +version = "0.73.2+0" [[deps.GaussQuadrature]] deps = ["SpecialFunctions"] @@ -895,9 +895,9 @@ weakdeps = ["MPI"] [[deps.HDF5_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] -git-tree-sha1 = "8156325170d6763b5494c072ac4754214db3e669" +git-tree-sha1 = "e4591176488495bf44d7456bd73179d87d5e6eab" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.14.3+0" +version = "1.14.3+1" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] @@ -935,9 +935,13 @@ version = "1.4.0" [[deps.Insolation]] deps = ["Artifacts", "Dates", "DelimitedFiles", "Interpolations"] -git-tree-sha1 = "2679907708edd9bbe2bd98585e575b48f17902c8" +git-tree-sha1 = "2aaf998568ab59643cefb0fc17eba42f9d5bef37" uuid = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8" -version = "0.8.2" +version = "0.9.0" +weakdeps = ["CLIMAParameters"] + + [deps.Insolation.extensions] + CreateParametersExt = "CLIMAParameters" [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1390,9 +1394,9 @@ version = "4.5.1" [[deps.NNlib]] deps = ["Adapt", "Atomix", "ChainRulesCore", "GPUArraysCore", "KernelAbstractions", "LinearAlgebra", "Pkg", "Random", "Requires", "Statistics"] -git-tree-sha1 = "900a11b3a2b02e36b25cb55a80777d4a4670f0f6" +git-tree-sha1 = "d2811b435d2f571bdfdfa644bb806a66b458e186" uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.9.10" +version = "0.9.11" [deps.NNlib.extensions] NNlibAMDGPUExt = "AMDGPU" @@ -1457,9 +1461,9 @@ version = "1.3.5+1" [[deps.OneHotArrays]] deps = ["Adapt", "ChainRulesCore", "Compat", "GPUArraysCore", "LinearAlgebra", "NNlib"] -git-tree-sha1 = "5e4029759e8699ec12ebdf8721e51a659443403c" +git-tree-sha1 = "963a3f28a2e65bb87a68033ea4a616002406037d" uuid = "0b1bfda6-eb8a-41d2-88d8-f5af5cad476f" -version = "0.2.4" +version = "0.2.5" [[deps.OpenBLAS32_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] @@ -1491,9 +1495,9 @@ version = "1.4.1" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "cc6e1927ac521b659af340e0ca45828a3ffc748f" +git-tree-sha1 = "60e3045590bd104a16fefb12836c00c0ef8c7f8c" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.12+0" +version = "3.0.13+0" [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] @@ -1570,10 +1574,10 @@ uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" version = "1.4.0" [[deps.Plots]] -deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Preferences", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"] -git-tree-sha1 = "ccee59c6e48e6f2edf8a5b64dc817b6729f99eb5" +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 = "38a748946dca52a622e79eea6ed35c6737499109" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.39.0" +version = "1.40.0" [deps.Plots.extensions] FileIOExt = "FileIO" @@ -1679,10 +1683,14 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] -deps = ["Adapt", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "40ea97b2334725cef9b7f9e2fc2f76b35596807d" +deps = ["Adapt", "Artifacts", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] +git-tree-sha1 = "3493869e9bbe529dfd8dada02b455847bdb46f27" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.10.0" +version = "0.11.0" +weakdeps = ["CLIMAParameters"] + + [deps.RRTMGP.extensions] + CreateParametersExt = "CLIMAParameters" [[deps.Random]] deps = ["SHA"] @@ -1730,21 +1738,25 @@ version = "0.6.12" [[deps.RecursiveArrayTools]] deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "SparseArrays", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"] -git-tree-sha1 = "dd7fc1923fde0cc6cdff451352d17924b0704ca1" +git-tree-sha1 = "2bd309f5171a628efdf5309361cd8a779b9e63a9" uuid = "731186ca-8d62-57ce-b412-fbd966d074cd" -version = "3.5.4" +version = "3.8.0" [deps.RecursiveArrayTools.extensions] RecursiveArrayToolsFastBroadcastExt = "FastBroadcast" + RecursiveArrayToolsForwardDiffExt = "ForwardDiff" RecursiveArrayToolsMeasurementsExt = "Measurements" RecursiveArrayToolsMonteCarloMeasurementsExt = "MonteCarloMeasurements" + RecursiveArrayToolsReverseDiffExt = ["ReverseDiff", "Zygote"] RecursiveArrayToolsTrackerExt = "Tracker" RecursiveArrayToolsZygoteExt = "Zygote" [deps.RecursiveArrayTools.weakdeps] FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898" + ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" + ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" @@ -1788,9 +1800,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"] -git-tree-sha1 = "de41474ac529bf81598e064587421cc5ebc28fa0" +git-tree-sha1 = "535bb76be2c1090a09767b18b160f5729ad12aff" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.20.0" +version = "2.23.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -1917,9 +1929,9 @@ weakdeps = ["OffsetArrays", "StaticArrays"] [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] -git-tree-sha1 = "f68dd04d131d9a8a8eb836173ee8f105c360b0c5" +git-tree-sha1 = "7b0e9c14c624e435076d19aea1e5cbdec2b9ca37" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.9.1" +version = "1.9.2" weakdeps = ["ChainRulesCore", "Statistics"] [deps.StaticArrays.extensions] @@ -1982,15 +1994,19 @@ uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" version = "7.2.1+1" [[deps.SurfaceFluxes]] -deps = ["CLIMAParameters", "DocStringExtensions", "RootSolvers", "Thermodynamics"] -git-tree-sha1 = "a167924897731ee57ef0197bb19357bfc2d007bc" +deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] +git-tree-sha1 = "6431256ee7c06ed2900fd46688f355e5a43e90eb" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" -version = "0.8.1" +version = "0.9.1" +weakdeps = ["CLIMAParameters"] + + [deps.SurfaceFluxes.extensions] + CreateParametersExt = "CLIMAParameters" [[deps.SymbolicIndexingInterface]] -git-tree-sha1 = "74502f408d99fc217a9d7cd901d9ffe45af892b1" +git-tree-sha1 = "b3103f4f50a3843e66297a2456921377c78f5e31" uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5" -version = "0.3.3" +version = "0.3.5" [[deps.TOML]] deps = ["Dates"] @@ -2055,9 +2071,13 @@ version = "1.0.1" [[deps.Thermodynamics]] deps = ["DocStringExtensions", "KernelAbstractions", "Random", "RootSolvers"] -git-tree-sha1 = "2de4b5ccc71baf3578959928c295a2fa13105db7" +git-tree-sha1 = "d3b8b0346aa5f101135fbe3cd62acaeb2074a50a" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -version = "0.11.2" +version = "0.11.6" +weakdeps = ["CLIMAParameters"] + + [deps.Thermodynamics.extensions] + CreateParametersExt = "CLIMAParameters" [[deps.ThreadingUtilities]] deps = ["ManualMemory"] @@ -2072,9 +2092,9 @@ uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" version = "0.5.23" [[deps.TranscodingStreams]] -git-tree-sha1 = "1fbeaaca45801b4ba17c251dd8603ef24801dd84" +git-tree-sha1 = "54194d92959d8ebaa8e26227dbe3cdefcdcd594f" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" -version = "0.10.2" +version = "0.10.3" weakdeps = ["Random", "Test"] [deps.TranscodingStreams.extensions] diff --git a/perf/Project.toml b/perf/Project.toml index ad0dfe9e30..147911266b 100644 --- a/perf/Project.toml +++ b/perf/Project.toml @@ -32,7 +32,6 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" ProfileCanvas = "efd6af41-a80b-495e-886c-e51b0c7d77a3" ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c" -RRTMGP = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" @@ -48,7 +47,6 @@ YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6" ArgParse = "1.1" ArtifactWrappers = "0.2" AtmosphericProfilesLibrary = "0.1" -CLIMAParameters = "0.4, 0.5, 0.6, 0.7" ClimaCorePlots = "0.2" ClimaCoupler = "0.1" ClimaTimeSteppers = "0.7" @@ -63,7 +61,6 @@ MPI = "0.20" NVTX = "0.3" ProfileCanvas = "0.1" ProgressLogging = "0.1" -RRTMGP = "0.10.0" StaticArrays = "1" TerminalLoggers = "0.1" YAML = "0.4" From 153aac2c39ab599a0a121ec0e247beeac682fcd3 Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Fri, 2 Feb 2024 16:59:01 -0800 Subject: [PATCH 3/8] bucket updates --- .../AMIP/components/land/bucket_init.jl | 125 ++---------------- .../AMIP/components/land/bucket_utils.jl | 8 +- 2 files changed, 17 insertions(+), 116 deletions(-) diff --git a/experiments/AMIP/components/land/bucket_init.jl b/experiments/AMIP/components/land/bucket_init.jl index 037b329fda..f657310f6e 100644 --- a/experiments/AMIP/components/land/bucket_init.jl +++ b/experiments/AMIP/components/land/bucket_init.jl @@ -8,7 +8,14 @@ using ClimaComms: AbstractCommsContext import ClimaLSM using ClimaLSM.Bucket: BucketModel, BucketModelParameters, AbstractAtmosphericDrivers, AbstractRadiativeDrivers import ClimaLSM.Bucket: BulkAlbedoTemporal, BulkAlbedoStatic, BulkAlbedoFunction -using ClimaLSM: make_exp_tendency, initialize, make_set_initial_cache, surface_evaporative_scaling +using ClimaLSM: + make_exp_tendency, + initialize, + make_set_initial_cache, + surface_evaporative_scaling, + CoupledRadiativeFluxes, + CoupledAtmosphere +import ClimaLSM.Parameters as LSMP include(joinpath(pkgdir(ClimaLSM), "parameters", "create_parameters.jl")) import ClimaCoupler.Interfacer: LandModelSimulation, get_field, update_field!, name @@ -31,117 +38,14 @@ name(::BucketSimulation) = "BucketSimulation" include("./bucket_utils.jl") -""" - CoupledRadiativeFluxes{FT} <: AbstractRadiativeDrivers{FT} - -To be used when coupling to an atmosphere model; internally, used for -multiple dispatch on `surface_fluxes`. -""" -struct CoupledRadiativeFluxes{FT} <: AbstractRadiativeDrivers{FT} end - -""" - CoupledAtmosphere{FT} <: AbstractAtmosphericDrivers{FT} - -To be used when coupling to an atmosphere model; internally, used for -multiple dispatch on `surface_fluxes`. -""" -struct CoupledAtmosphere{FT} <: AbstractAtmosphericDrivers{FT} end - -""" - ClimaLSM.turbulent_fluxes(atmos::CoupledAtmosphere{FT}, - model::BucketModel{FT}, - Y, - p, - ) where {FT <: AbstractFloat} - -Computes the turbulent surface fluxes terms at the ground for a coupled simulation. -Note that `Ch` is not used with the current implementation of the bucket model, -but will be used once the canopy is incorporated. - -The turbulent energy flux is currently not split up between latent and sensible -heat fluxes. This will be fixed once `lhf` and `shf` are added to the bucket's -cache. -""" -function ClimaLSM.turbulent_fluxes( - atmos::CoupledAtmosphere{FT}, - model::BucketModel{FT}, - Y, - p, - _..., -) where {FT <: AbstractFloat} - space = model.domain.space.surface - return ( - lhf = ClimaCore.Fields.zeros(space), - shf = p.bucket.turbulent_energy_flux, - vapor_flux = p.bucket.evaporation, - Ch = ClimaCore.Fields.similar(p.bucket.evaporation), - ) -end - -""" - ClimaLSM.net_radiation(radiation::CoupledRadiativeFluxes{FT}, - model::BucketModel{FT}, - Y, - p, - _..., - ) where {FT <: AbstractFloat} - -Computes the net radiative flux at the ground for a coupled simulation. -""" -function ClimaLSM.net_radiation( - radiation::CoupledRadiativeFluxes{FT}, - model::BucketModel{FT}, - Y::ClimaCore.Fields.FieldVector, - p::NamedTuple, - _..., -) where {FT <: AbstractFloat} +# TODO remove this function after ClimaLand v0.8.1 update +function ClimaLSM.turbulent_fluxes(atmos::CoupledAtmosphere, model::BucketModel, Y, p, t) # coupler has done its thing behind the scenes already - return p.bucket.R_n -end - - -""" - ClimaLSM.surface_air_density( - atmos::CoupledAtmosphere{FT}, - model::BucketModel{FT}, - Y, - p, - _..., - ) -an extension of the bucket model method which returns the surface air -density in the case of a coupled simulation. -""" -function ClimaLSM.surface_air_density( - atmos::CoupledAtmosphere{FT}, - model::BucketModel{FT}, - Y, - p, - _..., -) where {FT <: AbstractFloat} - return p.bucket.ρ_sfc -end - -""" - ClimaLSM.liquid_precipitation(atmos::CoupledAtmosphere, p, t) - -an extension of the bucket model method which returns the precipitation -(m/s) in the case of a coupled simulation. -""" -function ClimaLSM.liquid_precipitation(atmos::CoupledAtmosphere, p, t) - # coupler has filled this in - return p.drivers.P_liq + model_name = ClimaLSM.name(model) + model_cache = getproperty(p, model_name) + return model_cache.turbulent_fluxes end -""" - ClimaLSM.snow_precipitation(atmos::CoupledAtmosphere, p, t) - -an extension of the bucket model method which returns the precipitation -(m/s) in the case of a coupled simulation. -""" -function ClimaLSM.snow_precipitation(atmos::CoupledAtmosphere, p, t) - # coupler has filled this in - return p.drivers.P_snow -end function ClimaLSM.initialize_drivers(a::CoupledAtmosphere{FT}, coords) where {FT} keys = (:P_liq, :P_snow) @@ -155,9 +59,6 @@ function ClimaLSM.initialize_drivers(a::CoupledAtmosphere{FT}, coords) where {FT return vars.drivers end -function ClimaLSM.initialize_drivers(a::CoupledRadiativeFluxes{FT}, coords) where {FT} - return (;) -end """ temp_anomaly_aquaplanet(coord) diff --git a/experiments/AMIP/components/land/bucket_utils.jl b/experiments/AMIP/components/land/bucket_utils.jl index f25a10c935..e3d310be15 100644 --- a/experiments/AMIP/components/land/bucket_utils.jl +++ b/experiments/AMIP/components/land/bucket_utils.jl @@ -50,11 +50,11 @@ get_field(sim::BucketSimulation, ::Val{:area_fraction}) = sim.area_fraction get_field(sim::BucketSimulation, ::Val{:air_density}) = sim.integrator.p.bucket.ρ_sfc function update_field!(sim::BucketSimulation, ::Val{:turbulent_energy_flux}, field) - parent(sim.integrator.p.bucket.turbulent_energy_flux) .= parent(field) + parent(sim.integrator.p.bucket.turbulent_fluxes.shf) .= parent(field) end function update_field!(sim::BucketSimulation, ::Val{:turbulent_moisture_flux}, field) ρ_liq = (LSMP.ρ_cloud_liq(sim.model.parameters.earth_param_set)) - parent(sim.integrator.p.bucket.evaporation) .= parent(field ./ ρ_liq) # TODO: account for sublimation + parent(sim.integrator.p.bucket.turbulent_fluxes.vapor_flux) .= parent(field ./ ρ_liq) # TODO: account for sublimation end function update_field!(sim::BucketSimulation, ::Val{:radiative_energy_flux}, field) parent(sim.integrator.p.bucket.R_n) .= parent(field) @@ -79,8 +79,8 @@ reinit!(sim::BucketSimulation) = reinit!(sim.integrator) # extensions required by FluxCalculator (partitioned fluxes) function update_turbulent_fluxes_point!(sim::BucketSimulation, fields::NamedTuple, colidx::Fields.ColumnIndex) (; F_turb_energy, F_turb_moisture) = fields - sim.integrator.p.bucket.turbulent_energy_flux[colidx] .= F_turb_energy - sim.integrator.p.bucket.evaporation[colidx] .= + sim.integrator.p.bucket.turbulent_fluxes.shf[colidx] .= F_turb_energy + sim.integrator.p.bucket.turbulent_fluxes.vapor_flux[colidx] .= F_turb_moisture ./ LSMP.ρ_cloud_liq(sim.model.parameters.earth_param_set) return nothing end From 90ba56be462140a56cae82d9b1de45a01c61c90c Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Mon, 5 Feb 2024 12:27:11 -0800 Subject: [PATCH 4/8] atmos update --- .../AMIP/components/atmosphere/climaatmos_init.jl | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/experiments/AMIP/components/atmosphere/climaatmos_init.jl b/experiments/AMIP/components/atmosphere/climaatmos_init.jl index fb56e4a378..169f17aacc 100644 --- a/experiments/AMIP/components/atmosphere/climaatmos_init.jl +++ b/experiments/AMIP/components/atmosphere/climaatmos_init.jl @@ -95,23 +95,12 @@ end # extensions required by the Interfacer get_field(sim::ClimaAtmosSimulation, ::Val{:radiative_energy_flux}) = Fields.level(sim.integrator.p.radiation.ᶠradiation_flux, half) -function get_field(sim::ClimaAtmosSimulation, ::Val{:liquid_precipitation}) - ρ_liq = CAP.ρ_cloud_liq(sim.integrator.p.params) - sim.integrator.p.precipitation.col_integrated_rain .* ρ_liq # kg/m^2/s -end -function get_field(sim::ClimaAtmosSimulation, ::Val{:snow_precipitation}) - # TODO: use this upon Atmos v0.20 release - # sim.integrator.p.precipitation.col_integrated_snow # kg/m^2/s - - ρ_ice = CAP.ρ_cloud_ice(sim.integrator.p.params) - sim.integrator.p.precipitation.col_integrated_snow .* ρ_ice # kg/m^2/s -end - +get_field(sim::ClimaAtmosSimulation, ::Val{:liquid_precipitation}) = sim.integrator.p.precipitation.col_integrated_rain # kg/m^2/s +get_field(sim::ClimaAtmosSimulation, ::Val{:snow_precipitation}) = sim.integrator.p.precipitation.col_integrated_snow # kg/m^2/s get_field(sim::ClimaAtmosSimulation, ::Val{:turbulent_energy_flux}) = Geometry.WVector.(sim.integrator.p.precomputed.sfc_conditions.ρ_flux_h_tot) get_field(sim::ClimaAtmosSimulation, ::Val{:turbulent_moisture_flux}) = Geometry.WVector.(sim.integrator.p.precomputed.sfc_conditions.ρ_flux_q_tot) - get_field(sim::ClimaAtmosSimulation, ::Val{:thermo_state_int}) = Spaces.level(sim.integrator.p.precomputed.ᶜts, 1) # extensions required by FluxCalculator (partitioned fluxes) From 58ef0b0d98aae3e4c3043751efe61dfc7b2b0c6e Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Mon, 5 Feb 2024 12:53:31 -0800 Subject: [PATCH 5/8] CLIMAParameters updates --- ...km_nz63_clearsky_tvinsol_0M_slabocean.toml | 2 - .../eisenman_seaice_tests.jl | 7 +-- .../prescr_seaice_tests.jl | 5 +- test/flux_calculator_tests.jl | 54 +++---------------- test/interfacer_tests.jl | 5 +- toml/default_coarse.toml | 1 - 6 files changed, 12 insertions(+), 62 deletions(-) diff --git a/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml b/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml index 0791ca5ba9..95ed8a0952 100644 --- a/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml +++ b/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml @@ -1,9 +1,7 @@ [zd_rayleigh] -alias = "zd_rayleigh" value = 35000.0 type = "float" [alpha_rayleigh_uh] -alias = "alpha_rayleigh_uh" value = 0.0 type = "float" diff --git a/test/component_model_tests/eisenman_seaice_tests.jl b/test/component_model_tests/eisenman_seaice_tests.jl index 5393d92501..ca7805023c 100644 --- a/test/component_model_tests/eisenman_seaice_tests.jl +++ b/test/component_model_tests/eisenman_seaice_tests.jl @@ -25,11 +25,8 @@ for FT in (Float32, Float64) # create a boundary space boundary_space = TestHelper.create_space(FT) - # thermodynammic parameter set - aliases = string.(fieldnames(TP.ThermodynamicsParameters)) - toml_dict = CP.create_toml_dict(FT; dict_type = "alias") - pairs = CP.get_parameter_values!(toml_dict, aliases, "Thermodynamics") - thermo_params = TP.ThermodynamicsParameters{FT}(; pairs...) + # thermodynamic parameter set + thermo_params = TP.ThermodynamicsParameters(FT) @testset "No net fluxes for FT=$FT" begin Y, Ya = state_init(params_ice, boundary_space) diff --git a/test/component_model_tests/prescr_seaice_tests.jl b/test/component_model_tests/prescr_seaice_tests.jl index 3aed64f6b5..4d57292d24 100644 --- a/test/component_model_tests/prescr_seaice_tests.jl +++ b/test/component_model_tests/prescr_seaice_tests.jl @@ -31,10 +31,7 @@ for FT in (Float32, Float64) ice_fraction = Fields.ones(space) .* FT(global_mask) dt = FT(1.0) - toml_dict = CP.create_toml_dict(FT; dict_type = "alias") - aliases = string.(fieldnames(TDP.ThermodynamicsParameters)) - param_pairs = CP.get_parameter_values!(toml_dict, aliases, "Thermodynamics") - thermo_params = TDP.ThermodynamicsParameters{FT}(; param_pairs...) + thermo_params = TDP.ThermodynamicsParameters(FT) additional_cache = (; F_turb_energy = ClimaCore.Fields.zeros(space), diff --git a/test/flux_calculator_tests.jl b/test/flux_calculator_tests.jl index d5bab403e7..f95a7ae1a1 100644 --- a/test/flux_calculator_tests.jl +++ b/test/flux_calculator_tests.jl @@ -23,8 +23,9 @@ import ClimaCoupler: Interfacer import CLIMAParameters as CP import Thermodynamics as TD -import Thermodynamics.Parameters as TP +import Thermodynamics.Parameters.ThermodynamicsParameters import SurfaceFluxes as SF +import SurfaceFluxes.Parameters.SurfaceFluxesParameters import SurfaceFluxes.UniversalFunctions as UF using StaticArrays @@ -43,41 +44,6 @@ function atmos_turbulent_fluxes!(sim::DummySimulation, csf) sim.cache.flux .= (csf.T_sfc .- sim.state.T) .* sim.cache.κ ./ sim.cache.dz # Eq. 1 end -# Test for the PartitionedStateFluxes() case -# parameter set generated CLIMAParamerers and helper functions from SurfaceFluxes.jl -function create_uf_parameters(toml_dict, ::UF.BusingerType) - FT = CP.float_type(toml_dict) - aliases = ["Pr_0_Businger", "a_m_Businger", "a_h_Businger", "ζ_a_Businger", "γ_Businger"] - - pairs = CP.get_parameter_values!(toml_dict, aliases, "UniversalFunctions") - pairs = (; pairs...) # convert to NamedTuple - - pairs = (; - Pr_0 = pairs.Pr_0_Businger, - a_m = pairs.a_m_Businger, - a_h = pairs.a_h_Businger, - ζ_a = pairs.ζ_a_Businger, - γ = pairs.γ_Businger, - ) - return UF.BusingerParams{FT}(; pairs...) -end - -function create_parameters(toml_dict, ufpt) - FT = CP.float_type(toml_dict) - - ufp = create_uf_parameters(toml_dict, ufpt) - AUFP = typeof(ufp) - - aliases = string.(fieldnames(TD.Parameters.ThermodynamicsParameters)) - pairs = CP.get_parameter_values!(toml_dict, aliases, "Thermodynamics") - thermo_params = TD.Parameters.ThermodynamicsParameters{FT}(; pairs...) - TP = typeof(thermo_params) - - aliases = ["von_karman_const"] - pairs = CP.get_parameter_values!(toml_dict, aliases, "SurfaceFluxesParameters") - return SF.Parameters.SurfaceFluxesParameters{FT, AUFP, TP}(; pairs..., ufp, thermo_params) -end - # atmos sim object and extensions struct TestAtmos{P, Y, D, I} <: Interfacer.AtmosModelSimulation params::P @@ -104,16 +70,13 @@ end function get_thermo_params(sim::TestAtmos) FT = sim.params.FT - aliases = string.(fieldnames(TP.ThermodynamicsParameters)) - toml_dict = CP.create_toml_dict(FT; dict_type = "alias") - pairs = CP.get_parameter_values!(toml_dict, aliases, "Thermodynamics") - TP.ThermodynamicsParameters{FT}(; pairs...) + thermo_params = ThermodynamicsParameters(FT) + return thermo_params end function get_surface_params(sim::TestAtmos) FT = sim.params.FT - toml_dict = CP.create_toml_dict(FT; dict_type = "alias") - sf_params = create_parameters(toml_dict, UF.BusingerType()) + sf_params = SurfaceFluxesParameters(FT, UF.BusingerParams) return sf_params end @@ -138,7 +101,7 @@ Interfacer.get_field(sim::TestOcean, ::Val{:albedo}) = sim.integrator.p.α function surface_thermo_state( sim::TestOcean, - thermo_params::TD.Parameters.ThermodynamicsParameters, + thermo_params::ThermodynamicsParameters, thermo_state_int, colidx::Fields.ColumnIndex, ) @@ -172,7 +135,7 @@ function Interfacer.update_field!(sim::DummySurfaceSimulation3, ::Val{:∂F_turb end function surface_thermo_state( sim::DummySurfaceSimulation3, - thermo_params::TD.Parameters.ThermodynamicsParameters, + thermo_params::ThermodynamicsParameters, thermo_state_int, colidx::Fields.ColumnIndex, ) @@ -325,8 +288,7 @@ for FT in (Float32, Float64) end @testset "get_surface_params for FT=$FT" begin - toml_dict = CP.create_toml_dict(FT; dict_type = "alias") - sf_params = create_parameters(toml_dict, UF.BusingerType()) + sf_params = SurfaceFluxesParameters(FT, UF.BusingerParams) @test get_surface_params(TestAtmos((; FT = FT), [], [], [])) == sf_params sim = DummySimulation([], []) diff --git a/test/interfacer_tests.jl b/test/interfacer_tests.jl index d8f9dc622f..9ca7705443 100644 --- a/test/interfacer_tests.jl +++ b/test/interfacer_tests.jl @@ -77,10 +77,7 @@ for FT in (Float32, Float64) # test for a simple generic surface model @testset "get_field for a SurfaceStub" begin - toml_dict = CP.create_toml_dict(FT; dict_type = "alias") - aliases = string.(fieldnames(TDP.ThermodynamicsParameters)) - param_pairs = CP.get_parameter_values!(toml_dict, aliases, "Thermodynamics") - thermo_params = TDP.ThermodynamicsParameters{FT}(; param_pairs...) + thermo_params = TDP.ThermodynamicsParameters(FT) stub = SurfaceStub((; area_fraction = FT(1), diff --git a/toml/default_coarse.toml b/toml/default_coarse.toml index b887173907..77a6b92e8c 100644 --- a/toml/default_coarse.toml +++ b/toml/default_coarse.toml @@ -1,4 +1,3 @@ [C_E] -alias = "C_E" value = 0.044 type = "float" From 4d4aac0752a6954fb847c4c8a765bba0b66c1e2a Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Mon, 5 Feb 2024 14:16:53 -0800 Subject: [PATCH 6/8] use NCDatasets v0.14 --- Project.toml | 2 +- experiments/AMIP/Manifest.toml | 84 +++++++++++++++++++++++++++------- perf/Manifest.toml | 84 +++++++++++++++++++++++++++------- src/Regridder.jl | 4 +- 4 files changed, 137 insertions(+), 37 deletions(-) diff --git a/Project.toml b/Project.toml index 60c8b6a6bc..3011ac6cda 100644 --- a/Project.toml +++ b/Project.toml @@ -34,7 +34,7 @@ Dates = "1" DocStringExtensions = "0.8, 0.9" Insolation = "0.9" JLD2 = "0.4" -NCDatasets = "0.11, 0.12, 0.13" +NCDatasets = "0.11, 0.12, 0.13, 0.14" Plots = "1.39.0" SciMLBase = "1, 2" StaticArrays = "1" diff --git a/experiments/AMIP/Manifest.toml b/experiments/AMIP/Manifest.toml index e448507d98..c4e13ff798 100644 --- a/experiments/AMIP/Manifest.toml +++ b/experiments/AMIP/Manifest.toml @@ -123,9 +123,9 @@ version = "0.4.2" [[deps.BandedMatrices]] deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "PrecompileTools"] -git-tree-sha1 = "3ac52471386dfcc0f6a3c8aeb37ed37c37701128" +git-tree-sha1 = "931f3f49902e9b6b527fd7cd02d1cd7b4a84264c" uuid = "aae01518-5342-5314-be14-df237901396f" -version = "1.4.1" +version = "1.5.0" weakdeps = ["SparseArrays"] [deps.BandedMatrices.extensions] @@ -176,6 +176,12 @@ git-tree-sha1 = "fc69cbdb4277042f72c6e59cbc7024fbe3034b89" uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e" version = "0.16.39" +[[deps.Blosc_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Lz4_jll", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "19b98ee7e3db3b4eff74c5c9c72bf32144e24f10" +uuid = "0b7ba130-8d10-5ba8-a3d6-c5182647fed9" +version = "1.21.5+0" + [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "9e2a6b69137e6969bab0152632dcb3bc108c8bdd" @@ -367,10 +373,10 @@ uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" version = "0.12.10" [[deps.CommonDataModel]] -deps = ["CFTime", "DataStructures", "Dates", "Preferences", "Printf"] -git-tree-sha1 = "7f5717cbb2c1ce650cfd454451f282df33103596" +deps = ["CFTime", "DataStructures", "Dates", "Preferences", "Printf", "Statistics"] +git-tree-sha1 = "a132d267a055e8173a4a8e83d0d4ddcaeae70f91" uuid = "1fbeeb36-5f17-413c-809b-666fb144f157" -version = "0.2.5" +version = "0.3.4" [[deps.CommonSolve]] git-tree-sha1 = "0eee5eb66b1cf62cd6ad1b460238e60e4b09400c" @@ -556,10 +562,10 @@ uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.15.1" [[deps.DiskArrays]] -deps = ["OffsetArrays"] -git-tree-sha1 = "1bfa9de80f35ac63c6c381b2d43c590875896a1f" +deps = ["LRUCache", "OffsetArrays"] +git-tree-sha1 = "ef25c513cad08d7ebbed158c91768ae32f308336" uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" -version = "0.3.22" +version = "0.3.23" [[deps.Distances]] deps = ["LinearAlgebra", "Statistics", "StatsAPI"] @@ -814,6 +820,11 @@ git-tree-sha1 = "ff38ba61beff76b8f4acad8ab0c97ef73bb670cb" uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89" version = "3.3.9+0" +[[deps.GMP_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "781609d7-10c4-51f6-84f2-b8444358ff6d" +version = "6.2.1+6" + [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "Serialization", "Statistics"] git-tree-sha1 = "85d7fb51afb3def5dcb85ad31c3707795c8bccc1" @@ -872,6 +883,12 @@ git-tree-sha1 = "97285bbd5230dd766e9ef6749b80fc617126d496" uuid = "c27321d9-0574-5035-807b-f59d2c89b15c" version = "1.3.1" +[[deps.GnuTLS_jll]] +deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Nettle_jll", "P11Kit_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "266fe9b2335527cbf569ba4fd0979e3d8c6fd491" +uuid = "0951126a-58fd-58f1-b5b3-b08c7c4a876d" +version = "3.7.8+1" + [[deps.Graphite2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011" @@ -1097,6 +1114,15 @@ git-tree-sha1 = "d986ce2d884d49126836ea94ed5bfb0f12679713" uuid = "1d63c593-3942-5779-bab2-d838dc0a180e" version = "15.0.7+0" +[[deps.LRUCache]] +git-tree-sha1 = "b3cc6698599b10e652832c2f23db3cab99d51b59" +uuid = "8ac3fa9e-de4c-5943-b1dc-09c6b5f20637" +version = "1.6.1" +weakdeps = ["Serialization"] + + [deps.LRUCache.extensions] + SerializationExt = ["Serialization"] + [[deps.LZO_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6" @@ -1264,6 +1290,12 @@ git-tree-sha1 = "c1dd6d7978c12545b4179fb6153b9250c96b0075" uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36" version = "1.0.3" +[[deps.Lz4_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "6c26c5e8a4203d43b5497be3ec5d4e0c3cde240a" +uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" +version = "1.9.4+0" + [[deps.MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl"] git-tree-sha1 = "72dc3cf284559eb8f53aa593fe62cb33f83ed0c0" @@ -1376,9 +1408,9 @@ version = "0.2.4" [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] -git-tree-sha1 = "173a378f357e9bb24b22019efb5e4778223ce8cf" +git-tree-sha1 = "79400cceb1655e7b2fe528a7b114c785bc152e59" uuid = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" -version = "0.13.2" +version = "0.14.1" [[deps.NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] @@ -1435,10 +1467,16 @@ uuid = "71a1bf82-56d0-4bbc-8a3c-48b961074391" version = "0.1.5" [[deps.NetCDF_jll]] -deps = ["Artifacts", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "XML2_jll", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "10c612c81eaffdd6b7c28a45a554cdd9d2f40ff1" +deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenMPI_jll", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"] +git-tree-sha1 = "a8af1798e4eb9ff768ce7fdefc0e957097793f15" uuid = "7243133f-43d8-5620-bbf4-c2c921802cf3" -version = "400.902.208+0" +version = "400.902.209+0" + +[[deps.Nettle_jll]] +deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "eca63e3847dad608cfa6a3329b95ef674c7160b4" +uuid = "4c82536e-c426-54e4-b420-14f461c4ed8b" +version = "3.7.2+0" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -1522,6 +1560,12 @@ git-tree-sha1 = "dfdf5519f235516220579f949664f1bf44e741c5" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "1.6.3" +[[deps.P11Kit_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "2cd396108e178f3ae8dedbd8e938a18726ab2fbf" +uuid = "c2071276-7c44-58a7-b746-946036e04d0a" +version = "0.24.1+0" + [[deps.PCRE2_jll]] deps = ["Artifacts", "Libdl"] uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" @@ -1575,9 +1619,9 @@ version = "1.4.0" [[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 = "38a748946dca52a622e79eea6ed35c6737499109" +git-tree-sha1 = "c4fa93d7d66acad8f6f4ff439576da9d2e890ee0" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.40.0" +version = "1.40.1" [deps.Plots.extensions] FileIOExt = "FileIO" @@ -1790,9 +1834,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"] -git-tree-sha1 = "535bb76be2c1090a09767b18b160f5729ad12aff" +git-tree-sha1 = "75bae786dc8b07ec3c2159d578886691823bcb42" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.23.0" +version = "2.23.1" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2504,6 +2548,12 @@ git-tree-sha1 = "b910cb81ef3fe6e78bf6acee440bda86fd6ae00c" uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a" version = "1.3.7+1" +[[deps.libzip_jll]] +deps = ["Artifacts", "Bzip2_jll", "GnuTLS_jll", "JLLWrappers", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "9a6ac803f3c17fe7cf66430a8bfc7186800f08a4" +uuid = "337d8026-41b4-5cde-a456-74a10e5b31d1" +version = "1.9.2+0" + [[deps.mtdev_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "814e154bdb7be91d78b6802843f76b6ece642f11" diff --git a/perf/Manifest.toml b/perf/Manifest.toml index 2b1ce20e5a..b7447770bc 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -123,9 +123,9 @@ version = "0.4.2" [[deps.BandedMatrices]] deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "PrecompileTools"] -git-tree-sha1 = "3ac52471386dfcc0f6a3c8aeb37ed37c37701128" +git-tree-sha1 = "931f3f49902e9b6b527fd7cd02d1cd7b4a84264c" uuid = "aae01518-5342-5314-be14-df237901396f" -version = "1.4.1" +version = "1.5.0" weakdeps = ["SparseArrays"] [deps.BandedMatrices.extensions] @@ -176,6 +176,12 @@ git-tree-sha1 = "fc69cbdb4277042f72c6e59cbc7024fbe3034b89" uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e" version = "0.16.39" +[[deps.Blosc_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Lz4_jll", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "19b98ee7e3db3b4eff74c5c9c72bf32144e24f10" +uuid = "0b7ba130-8d10-5ba8-a3d6-c5182647fed9" +version = "1.21.5+0" + [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "9e2a6b69137e6969bab0152632dcb3bc108c8bdd" @@ -367,10 +373,10 @@ uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" version = "0.12.10" [[deps.CommonDataModel]] -deps = ["CFTime", "DataStructures", "Dates", "Preferences", "Printf"] -git-tree-sha1 = "7f5717cbb2c1ce650cfd454451f282df33103596" +deps = ["CFTime", "DataStructures", "Dates", "Preferences", "Printf", "Statistics"] +git-tree-sha1 = "a132d267a055e8173a4a8e83d0d4ddcaeae70f91" uuid = "1fbeeb36-5f17-413c-809b-666fb144f157" -version = "0.2.5" +version = "0.3.4" [[deps.CommonSolve]] git-tree-sha1 = "0eee5eb66b1cf62cd6ad1b460238e60e4b09400c" @@ -556,10 +562,10 @@ uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.15.1" [[deps.DiskArrays]] -deps = ["OffsetArrays"] -git-tree-sha1 = "1bfa9de80f35ac63c6c381b2d43c590875896a1f" +deps = ["LRUCache", "OffsetArrays"] +git-tree-sha1 = "ef25c513cad08d7ebbed158c91768ae32f308336" uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" -version = "0.3.22" +version = "0.3.23" [[deps.Distances]] deps = ["LinearAlgebra", "Statistics", "StatsAPI"] @@ -814,6 +820,11 @@ git-tree-sha1 = "ff38ba61beff76b8f4acad8ab0c97ef73bb670cb" uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89" version = "3.3.9+0" +[[deps.GMP_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "781609d7-10c4-51f6-84f2-b8444358ff6d" +version = "6.2.1+6" + [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "Serialization", "Statistics"] git-tree-sha1 = "85d7fb51afb3def5dcb85ad31c3707795c8bccc1" @@ -872,6 +883,12 @@ git-tree-sha1 = "97285bbd5230dd766e9ef6749b80fc617126d496" uuid = "c27321d9-0574-5035-807b-f59d2c89b15c" version = "1.3.1" +[[deps.GnuTLS_jll]] +deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Nettle_jll", "P11Kit_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "266fe9b2335527cbf569ba4fd0979e3d8c6fd491" +uuid = "0951126a-58fd-58f1-b5b3-b08c7c4a876d" +version = "3.7.8+1" + [[deps.Graphite2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011" @@ -1097,6 +1114,15 @@ git-tree-sha1 = "d986ce2d884d49126836ea94ed5bfb0f12679713" uuid = "1d63c593-3942-5779-bab2-d838dc0a180e" version = "15.0.7+0" +[[deps.LRUCache]] +git-tree-sha1 = "b3cc6698599b10e652832c2f23db3cab99d51b59" +uuid = "8ac3fa9e-de4c-5943-b1dc-09c6b5f20637" +version = "1.6.1" +weakdeps = ["Serialization"] + + [deps.LRUCache.extensions] + SerializationExt = ["Serialization"] + [[deps.LZO_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6" @@ -1264,6 +1290,12 @@ git-tree-sha1 = "c1dd6d7978c12545b4179fb6153b9250c96b0075" uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36" version = "1.0.3" +[[deps.Lz4_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "6c26c5e8a4203d43b5497be3ec5d4e0c3cde240a" +uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" +version = "1.9.4+0" + [[deps.MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl"] git-tree-sha1 = "72dc3cf284559eb8f53aa593fe62cb33f83ed0c0" @@ -1376,9 +1408,9 @@ version = "0.2.4" [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] -git-tree-sha1 = "173a378f357e9bb24b22019efb5e4778223ce8cf" +git-tree-sha1 = "79400cceb1655e7b2fe528a7b114c785bc152e59" uuid = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" -version = "0.13.2" +version = "0.14.1" [[deps.NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] @@ -1435,10 +1467,16 @@ uuid = "71a1bf82-56d0-4bbc-8a3c-48b961074391" version = "0.1.5" [[deps.NetCDF_jll]] -deps = ["Artifacts", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "XML2_jll", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "10c612c81eaffdd6b7c28a45a554cdd9d2f40ff1" +deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenMPI_jll", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"] +git-tree-sha1 = "a8af1798e4eb9ff768ce7fdefc0e957097793f15" uuid = "7243133f-43d8-5620-bbf4-c2c921802cf3" -version = "400.902.208+0" +version = "400.902.209+0" + +[[deps.Nettle_jll]] +deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "eca63e3847dad608cfa6a3329b95ef674c7160b4" +uuid = "4c82536e-c426-54e4-b420-14f461c4ed8b" +version = "3.7.2+0" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -1522,6 +1560,12 @@ git-tree-sha1 = "dfdf5519f235516220579f949664f1bf44e741c5" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "1.6.3" +[[deps.P11Kit_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "2cd396108e178f3ae8dedbd8e938a18726ab2fbf" +uuid = "c2071276-7c44-58a7-b746-946036e04d0a" +version = "0.24.1+0" + [[deps.PCRE2_jll]] deps = ["Artifacts", "Libdl"] uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" @@ -1575,9 +1619,9 @@ version = "1.4.0" [[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 = "38a748946dca52a622e79eea6ed35c6737499109" +git-tree-sha1 = "c4fa93d7d66acad8f6f4ff439576da9d2e890ee0" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.40.0" +version = "1.40.1" [deps.Plots.extensions] FileIOExt = "FileIO" @@ -1800,9 +1844,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"] -git-tree-sha1 = "535bb76be2c1090a09767b18b160f5729ad12aff" +git-tree-sha1 = "75bae786dc8b07ec3c2159d578886691823bcb42" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.23.0" +version = "2.23.1" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2514,6 +2558,12 @@ git-tree-sha1 = "b910cb81ef3fe6e78bf6acee440bda86fd6ae00c" uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a" version = "1.3.7+1" +[[deps.libzip_jll]] +deps = ["Artifacts", "Bzip2_jll", "GnuTLS_jll", "JLLWrappers", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "9a6ac803f3c17fe7cf66430a8bfc7186800f08a4" +uuid = "337d8026-41b4-5cde-a456-74a10e5b31d1" +version = "1.9.2+0" + [[deps.mtdev_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "814e154bdb7be91d78b6802843f76b6ece642f11" diff --git a/src/Regridder.jl b/src/Regridder.jl index cb1f3524bc..e2480d19ef 100644 --- a/src/Regridder.jl +++ b/src/Regridder.jl @@ -275,9 +275,9 @@ end Extracts the time information from a NetCDF file `ds`. """ function get_time(ds) - if "time" in ds + if "time" in keys(ds.dim) data_dates = Dates.DateTime.(Array(ds["time"])) - elseif "date" in ds + elseif "date" in keys(ds.dim) data_dates = TimeManager.strdate_to_datetime.(string.(Int.(Array(ds["date"])))) else @warn "No dates available in input data file" From 08a0fcb83d9b66a0ab5e25776110da8b8ab1d6c4 Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Mon, 5 Feb 2024 17:04:41 -0800 Subject: [PATCH 7/8] rm unused yml file --- .../model_configs/target_params_in_slab.yml | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 config/model_configs/target_params_in_slab.yml diff --git a/config/model_configs/target_params_in_slab.yml b/config/model_configs/target_params_in_slab.yml deleted file mode 100644 index 5b17d59cee..0000000000 --- a/config/model_configs/target_params_in_slab.yml +++ /dev/null @@ -1,21 +0,0 @@ -albedo_from_file: false -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 -apply_limiter: false -dt: "200secs" -dt_cpl: 3600 -dt_rad: "6hours" -dt_save_to_sol: "3600secs" -energy_check: true -h_elem: 6 -idealized_insolation: false -job_id: "target_params_in_slab" -mode_name: "slabplanet" -moist: "equil" -mono_surface: true -precip_model: "0M" -rad: "allskywithclear" -rayleigh_sponge: true -run_name: "target_params_in_slab" -t_end: "10days" -vert_diff: "true" From ce91c6d6b089aa4fc6f3a3379bae36b45ca036d1 Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Tue, 6 Feb 2024 13:24:37 -0800 Subject: [PATCH 8/8] allskywithclear -> gray rad --- .../model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml | 2 +- config/model_configs/target_params_in_slab_test2.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml b/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml index f8cc812e24..46b0d4ad3f 100644 --- a/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml +++ b/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml @@ -12,7 +12,7 @@ mode_name: "amip" moist: "equil" mono_surface: false precip_model: "0M" -rad: "allskywithclear" +rad: "gray" run_name: "coarse_single_ft64_hourly_checkpoints_co2" t_end: "32days" vert_diff: "true" diff --git a/config/model_configs/target_params_in_slab_test2.yml b/config/model_configs/target_params_in_slab_test2.yml index 5a591136c2..b4b074c8ff 100644 --- a/config/model_configs/target_params_in_slab_test2.yml +++ b/config/model_configs/target_params_in_slab_test2.yml @@ -14,7 +14,7 @@ mode_name: "slabplanet" moist: "equil" mono_surface: true precip_model: "0M" -rad: "allskywithclear" +rad: "gray" rayleigh_sponge: true run_name: "target_params_in_slab_test2" t_end: "10days"