From cb7c579c450f6ad1f108b21b5aed88b8287dbc7a Mon Sep 17 00:00:00 2001 From: AlexisRenchon Date: Mon, 21 Oct 2024 14:34:13 -0700 Subject: [PATCH] One .pdf instead of 36 .png long_runs artifacts Long runs where producing 36 artifacts (.png files), this commit tidy this up by gathering them into one .pdf instead. --- .buildkite/Manifest-v1.11.toml | 150 ++++++++++---------------- .buildkite/Project.toml | 1 + experiments/long_runs/bucket.jl | 11 +- experiments/long_runs/land.jl | 9 +- experiments/long_runs/land_region.jl | 9 +- experiments/long_runs/soil.jl | 9 +- test/diagnostics/diagnostics_tests.jl | 4 +- test/runtests.jl | 5 + 8 files changed, 95 insertions(+), 103 deletions(-) diff --git a/.buildkite/Manifest-v1.11.toml b/.buildkite/Manifest-v1.11.toml index 68fb9d61ec..f07b33a4fb 100644 --- a/.buildkite/Manifest-v1.11.toml +++ b/.buildkite/Manifest-v1.11.toml @@ -2,7 +2,7 @@ julia_version = "1.11.1" manifest_format = "2.0" -project_hash = "3917c95a044eadd49961b2c47f19f05160833ba5" +project_hash = "bf1216ed2bc76713a01437d07332219f6bcd0c54" [[deps.ADTypes]] git-tree-sha1 = "eea5d80188827b35333801ef97a40c2ed653b081" @@ -246,9 +246,9 @@ weakdeps = ["BandedMatrices"] [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "9e2a6b69137e6969bab0152632dcb3bc108c8bdd" +git-tree-sha1 = "8873e196c2eb87962a2048b3b8e08946535864a1" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" -version = "1.0.8+1" +version = "1.0.8+2" [[deps.CEnum]] git-tree-sha1 = "389ad5c84de1ae7cf0e28e381131c98ea87d54fc" @@ -646,9 +646,9 @@ version = "0.1.2" [[deps.DelaunayTriangulation]] deps = ["AdaptivePredicates", "EnumX", "ExactPredicates", "PrecompileTools", "Random"] -git-tree-sha1 = "668bb97ea6df5e654e6288d87d2243591fe68665" +git-tree-sha1 = "89df54fbe66e5872d91d8c2cd3a375f660c3fd64" uuid = "927a84f5-c5f4-47a5-9785-b46e178433df" -version = "1.6.0" +version = "1.6.1" [[deps.DelimitedFiles]] deps = ["Mmap"] @@ -1052,16 +1052,16 @@ uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" version = "0.27.8" [[deps.GR]] -deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"] -git-tree-sha1 = "ddda044ca260ee324c5fc07edb6d7cf3f0b9c350" +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 = "8e2d86e06ceb4580110d9e716be26658effc5bfd" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.73.5" +version = "0.72.8" [[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 = "278e5e0f820178e8a26df3184fcb2280717c79b1" +deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt5Base_jll", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "da121cbdc95b065da07fbb93638367737969693f" uuid = "d2c73de3-f751-5644-a686-071e5b155ba9" -version = "0.73.5+0" +version = "0.72.8+0" [[deps.GaussQuadrature]] deps = ["SpecialFunctions"] @@ -1618,10 +1618,10 @@ uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" version = "2.40.1+0" [[deps.Libtiff_jll]] -deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "2da088d113af58221c52828a80378e16be7d037a" +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "3eb79b0ca5764d4799c06699573fd8f533259713" uuid = "89763e89-9b03-5906-acba-b20f662cd828" -version = "4.5.1+1" +version = "4.4.0+0" [[deps.Libuuid_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1656,6 +1656,12 @@ version = "2.9.0" ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" LDLFactorizations = "40e66cde-538c-5869-a4ad-c39174c6795b" +[[deps.LittleCMS_jll]] +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg"] +git-tree-sha1 = "110897e7db2d6836be22c18bffd9422218ee6284" +uuid = "d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f" +version = "2.12.0+0" + [[deps.LogExpFunctions]] deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] git-tree-sha1 = "a2d09619db4e765091ee5c6ffe8872849de0feea" @@ -1689,10 +1695,10 @@ uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" version = "2024.2.0+0" [[deps.MLDataDevices]] -deps = ["Adapt", "Functors", "Preferences", "Random"] -git-tree-sha1 = "5e5b7ae2664d4d88adf7c5ba194d2bcda4bbac1c" +deps = ["Adapt", "Compat", "Functors", "Preferences", "Random"] +git-tree-sha1 = "f19f2629ad20176e524c71d06e1c29689ab002fa" uuid = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40" -version = "1.3.0" +version = "1.4.0" [deps.MLDataDevices.extensions] MLDataDevicesAMDGPUExt = "AMDGPU" @@ -2007,6 +2013,12 @@ git-tree-sha1 = "8292dd5c8a38257111ada2174000a33745b06d4e" uuid = "18a262bb-aa17-5467-a713-aee519bc75cb" version = "3.2.4+0" +[[deps.OpenJpeg_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libtiff_jll", "LittleCMS_jll", "Pkg", "libpng_jll"] +git-tree-sha1 = "76374b6e7f632c130e78100b166e5a48464256f8" +uuid = "643b3616-a352-519d-856d-80112ee9badc" +version = "2.4.0+0" + [[deps.OpenLibm_jll]] deps = ["Artifacts", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" @@ -2071,10 +2083,10 @@ uuid = "f57f5aa1-a3ce-4bc8-8ab9-96f992907883" version = "0.4.3" [[deps.PROJ_jll]] -deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "SQLite_jll"] -git-tree-sha1 = "998e61a32a78e191ac9d63f203fc3020dfa45cdd" +deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "Pkg", "SQLite_jll"] +git-tree-sha1 = "fcb3f39ae1184a056ecc415863d46d2109aa6947" uuid = "58948b4f-47e0-5654-a9ad-f609743f8632" -version = "902.500.0+0" +version = "900.100.0+0" [[deps.PackageExtensionCompat]] git-tree-sha1 = "fb28e33b8a95c4cee25ce296c817d89cc2e53518" @@ -2152,9 +2164,9 @@ version = "1.4.2" [[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", "TOML", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"] -git-tree-sha1 = "45470145863035bb124ca51b320ed35d071cc6c2" +git-tree-sha1 = "f202a1ca4f6e165238d8175df63a7e26a51e04dc" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.40.8" +version = "1.40.7" [deps.Plots.extensions] FileIOExt = "FileIO" @@ -2193,6 +2205,12 @@ git-tree-sha1 = "36d8b4b899628fb92c2749eb488d884a926614d3" uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" version = "1.4.3" +[[deps.Poppler_jll]] +deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "OpenJpeg_jll", "Pkg", "libpng_jll"] +git-tree-sha1 = "02148a0cb2532f22c0589ceb75c110e168fb3d1f" +uuid = "9c32591e-4766-534b-9725-b71a8799265b" +version = "21.9.0+0" + [[deps.PreallocationTools]] deps = ["Adapt", "ArrayInterface", "ForwardDiff"] git-tree-sha1 = "6c62ce45f268f3f958821a1e5192cf91c75ae89c" @@ -2257,9 +2275,9 @@ version = "1.10.2" [[deps.Proj]] deps = ["CEnum", "CoordinateTransformations", "GeoFormatTypes", "GeoInterface", "NetworkOptions", "PROJ_jll"] -git-tree-sha1 = "cf4342392997566f8792f5bec7c533b2f82ac4d4" +git-tree-sha1 = "48d79f0044ce64ec29c9cae0c8228e588bb7a0f3" uuid = "c94c279d-25a6-4763-9509-64d165bea63e" -version = "1.8.0" +version = "1.7.2" [[deps.PtrArrays]] git-tree-sha1 = "77a42d78b6a92df47ab37e177b2deac405e1c88f" @@ -2272,11 +2290,11 @@ git-tree-sha1 = "18e8f4d1426e965c7b532ddd260599e1510d26ce" uuid = "4b34888f-f399-49d4-9bb3-47ed5cae4e65" version = "1.0.0" -[[deps.Qt6Base_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Vulkan_Loader_jll", "Xorg_libSM_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_cursor_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "libinput_jll", "xkbcommon_jll"] -git-tree-sha1 = "7c29f0e8c575428bd84dc3c72ece5178caa67336" -uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56" -version = "6.5.2+2" +[[deps.Qt5Base_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"] +git-tree-sha1 = "0c03844e2231e12fda4d0086fd7cbe4098ee8dc5" +uuid = "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1" +version = "5.15.3+2" [[deps.QuadGK]] deps = ["DataStructures", "LinearAlgebra"] @@ -2444,10 +2462,10 @@ uuid = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" version = "0.1.0" [[deps.SciMLBase]] -deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"] -git-tree-sha1 = "50ed64cd5ad79b0bef71fdb6a11d10c3448bfef0" +deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"] +git-tree-sha1 = "26fea1911818cd480400f1a2b7f6b32c3cc3836a" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.56.1" +version = "2.56.4" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2470,9 +2488,9 @@ version = "2.56.1" [[deps.SciMLOperators]] deps = ["Accessors", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "MacroTools"] -git-tree-sha1 = "e39c5f217f9aca640c8e27ab21acf557a3967db5" +git-tree-sha1 = "ef388ca9e4921ec5614ce714f8aa59a5cd33d867" uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" -version = "0.3.10" +version = "0.3.11" weakdeps = ["SparseArrays", "StaticArraysCore"] [deps.SciMLOperators.extensions] @@ -2791,9 +2809,9 @@ version = "1.11.0" [[deps.Thermodynamics]] deps = ["DocStringExtensions", "KernelAbstractions", "Random", "RootSolvers"] -git-tree-sha1 = "8c2afc6dbb2bdac698a5b05816b7521630dea034" +git-tree-sha1 = "5de9f9f6019165cedb04e365a9f277a518ac5aaf" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -version = "0.12.8" +version = "0.12.9" weakdeps = ["ClimaParams"] [deps.Thermodynamics.extensions] @@ -2930,12 +2948,6 @@ git-tree-sha1 = "7aff7d62bffad9bba9928eb6ab55226b32a351eb" uuid = "409d34a3-91d5-4945-b6ec-7529ddf182d8" version = "0.4.6" -[[deps.Vulkan_Loader_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Wayland_jll", "Xorg_libX11_jll", "Xorg_libXrandr_jll", "xkbcommon_jll"] -git-tree-sha1 = "2f0486047a07670caad3a81a075d2e518acc5c59" -uuid = "a44049a8-05dd-5a78-86c9-5fde0876e88c" -version = "1.3.243+0" - [[deps.Wayland_jll]] deps = ["Artifacts", "EpollShim_jll", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"] git-tree-sha1 = "7558e29847e99bc3f04d6569e82d0f5c54460703" @@ -2966,24 +2978,6 @@ git-tree-sha1 = "a54ee957f4c86b526460a720dbc882fa5edcbefc" uuid = "aed1982a-8fda-507f-9586-7b0439959a61" version = "1.1.41+0" -[[deps.XZ_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "ac88fb95ae6447c8dda6a5503f3bafd496ae8632" -uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800" -version = "5.4.6+0" - -[[deps.Xorg_libICE_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "326b4fea307b0b39892b3e85fa451692eda8d46c" -uuid = "f67eecfb-183a-506d-b269-f58e52b52d7c" -version = "1.1.1+0" - -[[deps.Xorg_libSM_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libICE_jll"] -git-tree-sha1 = "3796722887072218eabafb494a13c963209754ce" -uuid = "c834827a-8449-5923-a945-d239c165b7dd" -version = "1.2.4+0" - [[deps.Xorg_libX11_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] git-tree-sha1 = "afead5aba5aa507ad5a3bf01f58f82c8d1403495" @@ -3062,12 +3056,6 @@ git-tree-sha1 = "730eeca102434283c50ccf7d1ecdadf521a765a4" uuid = "cc61e674-0454-545c-8b26-ed2c68acab7a" version = "1.1.2+0" -[[deps.Xorg_xcb_util_cursor_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_jll", "Xorg_xcb_util_renderutil_jll"] -git-tree-sha1 = "04341cb870f29dcd5e39055f895c39d016e18ccd" -uuid = "e920d4aa-a673-5f3a-b3d7-f755a4d47c43" -version = "0.1.4+0" - [[deps.Xorg_xcb_util_image_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] git-tree-sha1 = "0fab0a40349ba1cba2c1da699243396ff8e94b97" @@ -3155,24 +3143,12 @@ git-tree-sha1 = "4b3ac62501ca73263eaa0d034c772f13c647fba6" uuid = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd" version = "1.4.0" -[[deps.eudev_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "gperf_jll"] -git-tree-sha1 = "431b678a28ebb559d224c0b6b6d01afce87c51ba" -uuid = "35ca27e7-8b34-5b7f-bca9-bdc33f59eb06" -version = "3.2.9+0" - [[deps.fzf_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "936081b536ae4aa65415d869287d43ef3cb576b2" uuid = "214eeab7-80f7-51ab-84ad-2988db7cef09" version = "0.53.0+0" -[[deps.gperf_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "3516a5630f741c9eecb3720b1ec9d8edc3ecc033" -uuid = "1a1c6b14-54f6-533d-8383-74cd7377aa70" -version = "3.1.1+0" - [[deps.isoband_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "51b5eeb3f98367157a7a12a1fb0aa5328946c03c" @@ -3202,24 +3178,12 @@ git-tree-sha1 = "9bf7903af251d2050b467f76bdbe57ce541f7f4f" uuid = "1183f4f0-6f2a-5f1a-908b-139f9cdfea6f" version = "0.2.2+0" -[[deps.libevdev_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "141fe65dc3efabb0b1d5ba74e91f6ad26f84cc22" -uuid = "2db6ffa8-e38f-5e21-84af-90c45d0032cc" -version = "1.11.0+0" - [[deps.libfdk_aac_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "8a22cf860a7d27e4f3498a0fe0811a7957badb38" uuid = "f638f0a6-7fb0-5443-88ba-1cc74229b280" version = "2.0.3+0" -[[deps.libinput_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "eudev_jll", "libevdev_jll", "mtdev_jll"] -git-tree-sha1 = "ad50e5b90f222cfe78aa3d5183a20a12de1322ce" -uuid = "36db933b-70db-51c0-b978-0f229ee0e533" -version = "1.18.0+0" - [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] git-tree-sha1 = "b70c870239dc3d7bc094eb2d6be9b73d27bef280" @@ -3238,12 +3202,6 @@ git-tree-sha1 = "490376214c4721cdaca654041f635213c6165cb3" uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a" version = "1.3.7+2" -[[deps.mtdev_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "814e154bdb7be91d78b6802843f76b6ece642f11" -uuid = "009596ad-96f7-51b1-9f1b-5ce2d5e8a71e" -version = "1.1.6+0" - [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" diff --git a/.buildkite/Project.toml b/.buildkite/Project.toml index a53e331c9e..7f298bb8a0 100644 --- a/.buildkite/Project.toml +++ b/.buildkite/Project.toml @@ -29,6 +29,7 @@ MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195" NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" +Poppler_jll = "9c32591e-4766-534b-9725-b71a8799265b" ProfileCanvas = "efd6af41-a80b-495e-886c-e51b0c7d77a3" RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" diff --git a/experiments/long_runs/bucket.jl b/experiments/long_runs/bucket.jl index 5c92562cc6..7c9464c3e2 100644 --- a/experiments/long_runs/bucket.jl +++ b/experiments/long_runs/bucket.jl @@ -1,7 +1,7 @@ # # Global bucket run # The code sets up and runs the bucket model on a spherical domain, -# using ERA5 data. +# using ERA5 data. # Simulation Setup # Number of spatial elements: 101 in horizontal, 5 in vertical @@ -38,6 +38,8 @@ using CairoMakie using Dates import NCDatasets +using Poppler_jll: pdfunite + const FT = Float64; time_interpolation_method = LinearInterpolation(PeriodicCalendar()) regridder_type = :InterpolationsRegridder @@ -167,6 +169,7 @@ setup_and_solve_problem(; greet = true); simdir = ClimaAnalysis.SimDir(outdir) short_names = ["swa", "rn", "tsfc", "qsfc", "lhf", "shf", "wsoil", "wsfc", "ssfc"] +tmpdir = mktempdir(root_path) for short_name in short_names var = get(simdir; short_name) times = ClimaAnalysis.times(var) @@ -182,6 +185,10 @@ for short_name in short_names :mask => ClimaAnalysis.Utils.kwargs(color = :white), ), ) - CairoMakie.save(joinpath(root_path, "$(short_name)_$t.png"), fig) + CairoMakie.save(joinpath(tmpdir, "$(short_name)_$t.pdf"), fig) end end +figures = readdir(tmpdir) +pdfunite() do unite + run(Cmd([unite, figures..., "figures.pdf"])) +end diff --git a/experiments/long_runs/land.jl b/experiments/long_runs/land.jl index 31363cb96e..76c894a26b 100644 --- a/experiments/long_runs/land.jl +++ b/experiments/long_runs/land.jl @@ -46,6 +46,8 @@ import GeoMakie using Dates import NCDatasets +using Poppler_jll: pdfunite + const FT = Float64; time_interpolation_method = LinearInterpolation(PeriodicCalendar()) regridder_type = :InterpolationsRegridder @@ -593,6 +595,7 @@ setup_and_solve_problem(; greet = true); #### ClimaAnalysis #### simdir = ClimaAnalysis.SimDir(outdir) short_names = ["gpp", "ct", "lai", "swc", "si", "swa", "lwu", "et", "er", "sr"] +tmpdir = mktempdir(root_path) for short_name in short_names var = get(simdir; short_name) times = ClimaAnalysis.times(var) @@ -607,6 +610,10 @@ for short_name in short_names :mask => ClimaAnalysis.Utils.kwargs(color = :white), ), ) - CairoMakie.save(joinpath(root_path, "$(short_name)_$t.png"), fig) + CairoMakie.save(joinpath(tmpdir, "$(short_name)_$t.pdf"), fig) end end +figures = readdir(tmpdir) +pdfunite() do unite + run(Cmd([unite, figures..., "figures.pdf"])) +end diff --git a/experiments/long_runs/land_region.jl b/experiments/long_runs/land_region.jl index a7f989fa32..a1bbb47349 100644 --- a/experiments/long_runs/land_region.jl +++ b/experiments/long_runs/land_region.jl @@ -45,6 +45,8 @@ using CairoMakie using Dates import NCDatasets +using Poppler_jll: pdfunite + const FT = Float64; time_interpolation_method = LinearInterpolation(PeriodicCalendar()) regridder_type = :InterpolationsRegridder @@ -597,6 +599,7 @@ setup_and_solve_problem(; greet = true); #### ClimaAnalysis #### simdir = ClimaAnalysis.SimDir(outdir) short_names = ["gpp", "ct", "swc", "si"] +tmpdir = mktempdir(root_path) for short_name in short_names var = get(simdir; short_name) times = ClimaAnalysis.times(var) @@ -606,7 +609,11 @@ for short_name in short_names tmp = ClimaAnalysis.slice(var, time = t; kwargs...) if !all(isnan.(tmp.data)) viz.heatmap2D!(fig, tmp) - CairoMakie.save(joinpath(root_path, "$(short_name)_$t.png"), fig) + CairoMakie.save(joinpath(tmpdir, "$(short_name)_$t.pdf"), fig) end end end +figures = readdir(tmpdir) +pdfunite() do unite + run(Cmd([unite, figures..., "figures.pdf"])) +end diff --git a/experiments/long_runs/soil.jl b/experiments/long_runs/soil.jl index aa8ce9a746..a6512676f6 100644 --- a/experiments/long_runs/soil.jl +++ b/experiments/long_runs/soil.jl @@ -44,6 +44,8 @@ using CairoMakie using Dates import NCDatasets +using Poppler_jll: pdfunite + const FT = Float64; time_interpolation_method = LinearInterpolation(PeriodicCalendar()) regridder_type = :InterpolationsRegridder @@ -365,6 +367,7 @@ setup_and_solve_problem(; greet = true); #### ClimaAnalysis #### simdir = ClimaAnalysis.SimDir(outdir) short_names = ["swc", "si", "sie"] +tmpdir = mktempdir(root_path) for short_name in short_names var = get(simdir; short_name) times = ClimaAnalysis.times(var) @@ -380,6 +383,10 @@ for short_name in short_names :mask => ClimaAnalysis.Utils.kwargs(color = :white), ), ) - CairoMakie.save(joinpath(root_path, "$(short_name)_$t.png"), fig) + CairoMakie.save(joinpath(tmpdir, "$(short_name)_$t.pdf"), fig) end end +figures = readdir(tmpdir) +pdfunite() do unite + run(Cmd([unite, figures..., "figures.pdf"])) +end diff --git a/test/diagnostics/diagnostics_tests.jl b/test/diagnostics/diagnostics_tests.jl index 7d9f6b49c4..003d43c0bf 100644 --- a/test/diagnostics/diagnostics_tests.jl +++ b/test/diagnostics/diagnostics_tests.jl @@ -4,7 +4,7 @@ using ClimaLand.Diagnostics: @with_error @test isdefined(ClimaLand.Diagnostics, :compute_sw_albedo!) -@test !hasmethod( +@test hasmethod( ClimaLand.Diagnostics.compute_sw_albedo!, (Any, Any, Any, Any, Any), ) @@ -35,7 +35,7 @@ ClimaLand.Diagnostics.define_diagnostics!(DummyModel()) # Just to trigger the error out = Y = p = t = land_model = nothing -@test_throws ErrorException("Cannot compute albedo with model = Nothing") ClimaLand.Diagnostics.compute_albedo!( +@test_throws ErrorException("Cannot compute sw_albedo with model = Nothing") ClimaLand.Diagnostics.compute_sw_albedo!( out, Y, p, diff --git a/test/runtests.jl b/test/runtests.jl index 01f5737c6b..5158fbbe11 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -108,3 +108,8 @@ end @safetestset "Integrated soil and snow" begin include("integrated/soil_snow.jl") end + +# Diagnostics +@safetestset "Diagnostics" begin + include("diagnostics/diagnostics_tests.jl") +end