From 16bf62b481ae90d6ffa1d57a4e7a3dd2af879c8f Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Thu, 2 Nov 2023 10:43:30 -0700 Subject: [PATCH 1/2] Update compatibility NCDatasets 0.13 --- post_processing/plot/plot_helpers.jl | 95 ++++++++++--------- .../orographic_gravity_wave_helper.jl | 10 +- src/solver/type_getters.jl | 10 +- .../nogw_test_3d.jl | 14 +-- .../nogw_test_mima.jl | 8 +- .../nogw_test_single_column.jl | 8 +- test/orographic_gravity_wave/ogwd_3d.jl | 46 ++++----- test/orographic_gravity_wave/ogwd_baseflux.jl | 8 +- 8 files changed, 101 insertions(+), 98 deletions(-) diff --git a/post_processing/plot/plot_helpers.jl b/post_processing/plot/plot_helpers.jl index 52de723196..1732afd7cd 100644 --- a/post_processing/plot/plot_helpers.jl +++ b/post_processing/plot/plot_helpers.jl @@ -66,12 +66,12 @@ function generate_paperplots_dry_baro_wave(fig_dir, nc_files) ncfile = filter(x -> endswith(x, "day$day.0.nc"), nc_files) if !isempty(ncfile) nt = NCDataset(ncfile[1], "r") do nc - lon = nc["lon"][:] - lat = nc["lat"][:] - z = nc["z"][:] - p = nc["pressure"][:] - T = nc["temperature"][:] - vort = nc["vorticity"][:] + lon = Array(nc["lon"]) + lat = Array(nc["lat"]) + z = Array(nc["z"]) + p = Array(nc["pressure"]) + T = Array(nc["temperature"]) + vort = Array(nc["vorticity"]) (; lon, lat, z, p, T, vort) end (; lon, lat, z, p, T, vort) = nt @@ -117,20 +117,21 @@ function generate_paperplots_moist_baro_wave(fig_dir, nc_files) ncfile = filter(x -> endswith(x, "day$day.0.nc"), nc_files) if !isempty(ncfile) nt = NCDataset(ncfile[1], "r") do nc - lon = nc["lon"][:] - lat = nc["lat"][:] - z = nc["z"][:] - p = nc["pressure"][:] - T = nc["temperature"][:] - vort = nc["vorticity"][:] - qt = nc["qt"][:] - cloud_water = nc["cloud_liquid"][:] + nc["cloud_ice"][:] - water_vapor = nc["water_vapor"][:] - rho = nc["rho"][:] - w = nc["w"][:] - u = nc["u"][:] - v = nc["v"][:] - z_sfc = nc["sfc_elevation"][:] + lon = Array(nc["lon"]) + lat = Array(nc["lat"]) + z = Array(nc["z"]) + p = Array(nc["pressure"]) + T = Array(nc["temperature"]) + vort = Array(nc["vorticity"]) + qt = Array(nc["qt"]) + cloud_water = + Array(nc["cloud_liquid"]) + Array(nc["cloud_ice"]) + water_vapor = Array(nc["water_vapor"]) + rho = Array(nc["rho"]) + w = Array(nc["w"]) + u = Array(nc["u"]) + v = Array(nc["v"]) + z_sfc = Array(nc["sfc_elevation"]) (; lon, lat, @@ -341,9 +342,9 @@ function generate_elevation_spectra(fig_dir, nc_files) ncfile = filter(x -> endswith(x, "day0.0.nc"), nc_files) if !isempty(ncfile) nt = NCDataset(ncfile[1], "r") do nc - z_sfc = nc["sfc_elevation"][:] - lon = nc["lon"][:] - lat = nc["lat"][:] + z_sfc = Array(nc["sfc_elevation"]) + lon = Array(nc["lon"]) + lat = Array(nc["lat"]) (; lon, lat, z_sfc) end (; lon, lat, z_sfc) = nt @@ -407,54 +408,56 @@ function generate_paperplots_held_suarez(fig_dir, nc_files; moist) for (i, ifile) in enumerate(nc_file) nc = NCDataset(ifile, "r") if i == 1 - global lat = nc["lat"][:] - global lon = nc["lon"][:] - global z = nc["z"][:] - global u = nc["u"][:] - global v = nc["v"][:] - global w = nc["w"][:] - global T = nc["temperature"][:] - global θ = nc["potential_temperature"][:] + global lat = Array(nc["lat"]) + global lon = Array(nc["lon"]) + global z = Array(nc["z"]) + global u = Array(nc["u"]) + global v = Array(nc["v"]) + global w = Array(nc["w"]) + global T = Array(nc["temperature"]) + global θ = Array(nc["potential_temperature"]) if moist - global qt = nc["qt"][:] + global qt = Array(nc["qt"]) end if haskey(nc, "sfc_flux_energy") - sfc_flux_energy = nc["sfc_flux_energy"][:] + sfc_flux_energy = Array(nc["sfc_flux_energy"]) end if haskey(nc, "sfc_evaporation") - sfc_evaporation = nc["sfc_evaporation"][:] + sfc_evaporation = Array(nc["sfc_evaporation"]) end if haskey(nc, "lw_flux_up") # NOTE: We define net as up - down - lw_flux_net = nc["lw_flux_up"][:] - nc["lw_flux_down"][:] - sw_flux_net = nc["sw_flux_up"][:] - nc["sw_flux_down"][:] + lw_flux_net = + Array(nc["lw_flux_up"]) - Array(nc["lw_flux_down"]) + sw_flux_net = + Array(nc["sw_flux_up"]) - Array(nc["sw_flux_down"]) end else - u = cat(u, nc["u"][:], dims = 4) - v = cat(v, nc["v"][:], dims = 4) - w = cat(w, nc["w"][:], dims = 4) - T = cat(T, nc["temperature"][:], dims = 4) - θ = cat(θ, nc["potential_temperature"][:], dims = 4) + u = cat(u, Array(nc["u"]), dims = 4) + v = cat(v, Array(nc["v"]), dims = 4) + w = cat(w, Array(nc["w"]), dims = 4) + T = cat(T, Array(nc["temperature"]), dims = 4) + θ = cat(θ, Array(nc["potential_temperature"]), dims = 4) if moist - qt = cat(qt, nc["qt"][:], dims = 4) + qt = cat(qt, Array(nc["qt"]), dims = 4) end if haskey(nc, "sfc_flux_energy") sfc_flux_energy = - cat(sfc_flux_energy, nc["sfc_flux_energy"][:], dims = 3) + cat(sfc_flux_energy, Array(nc["sfc_flux_energy"]), dims = 3) end if haskey(nc, "sfc_evaporation") sfc_evaporation = - cat(sfc_evaporation, nc["sfc_evaporation"][:], dims = 3) + cat(sfc_evaporation, Array(nc["sfc_evaporation"]), dims = 3) end if haskey(nc, "lw_flux_up") lw_flux_net = cat( lw_flux_net, - nc["lw_flux_up"][:] - nc["lw_flux_down"][:], + Array(nc["lw_flux_up"]) - Array(nc["lw_flux_down"]), dims = 4, ) sw_flux_net = cat( sw_flux_net, - nc["sw_flux_up"][:] - nc["sw_flux_down"][:], + Array(nc["sw_flux_up"]) - Array(nc["sw_flux_down"]), dims = 4, ) end diff --git a/src/parameterized_tendencies/gravity_wave_drag/orographic_gravity_wave_helper.jl b/src/parameterized_tendencies/gravity_wave_drag/orographic_gravity_wave_helper.jl index 6a36dd5e18..ba93a126f6 100644 --- a/src/parameterized_tendencies/gravity_wave_drag/orographic_gravity_wave_helper.jl +++ b/src/parameterized_tendencies/gravity_wave_drag/orographic_gravity_wave_helper.jl @@ -227,9 +227,9 @@ end function compute_OGW_info(Y, elev_data, earth_radius, γ, h_frac) # obtain lat, lon, elevation from the elev_data nt = NCDataset(elev_data, "r") do ds - lon = ds["longitude"][:] - lat = ds["latitude"][:] - elev = ds["elevation"][:] + lon = Array(ds["longitude"]) + lat = Array(ds["latitude"]) + elev = Array(ds["elevation"]) (; lon, lat, elev) end (; lon, lat, elev) = nt @@ -318,8 +318,8 @@ end function get_topo_ll(orographic_info_rll) nt = NCDataset(orographic_info_rll, "r") do ds - lon = ds["lon"][:] - lat = ds["lat"][:] + lon = Array(ds["lon"]) + lat = Array(ds["lat"]) hmax = ds["hmax"][:, :, 1] hmin = ds["hmin"][:, :, 1] t11 = ds["t11"][:, :, 1] diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl index 71fe0dcc38..881d8fce75 100644 --- a/src/solver/type_getters.jl +++ b/src/solver/type_getters.jl @@ -1,8 +1,8 @@ using Dates: DateTime, @dateformat_str -using NCDatasets using Dierckx using ImageFiltering using Interpolations +import NCDatasets import ClimaCore: InputOutput, Meshes, Spaces import ClimaAtmos.RRTMGPInterface as RRTMGPI import ClimaAtmos as CA @@ -132,10 +132,10 @@ function get_spaces(parsed_args, params, comms_ctx) warp_function = nothing elseif topography == "Earth" data_path = joinpath(topo_elev_dataset_path(), "ETOPO1_coarse.nc") - earth_spline = NCDataset(data_path) do data - zlevels = data["elevation"][:] - lon = data["longitude"][:] - lat = data["latitude"][:] + earth_spline = NCDatasets.NCDataset(data_path) do data + zlevels = Array(data["elevation"]) + lon = Array(data["longitude"]) + lat = Array(data["latitude"]) # Apply Smoothing smooth_degree = Int(parsed_args["smoothing_order"]) esmth = imfilter(zlevels, Kernel.gaussian(smooth_degree)) diff --git a/test/non_orographic_gravity_wave/nogw_test_3d.jl b/test/non_orographic_gravity_wave/nogw_test_3d.jl index 350c039254..a861639c0f 100644 --- a/test/non_orographic_gravity_wave/nogw_test_3d.jl +++ b/test/non_orographic_gravity_wave/nogw_test_3d.jl @@ -52,13 +52,13 @@ include(joinpath(pkgdir(ClimaAtmos), "artifacts", "artifact_funcs.jl")) era_data = joinpath(era_global_dataset_path(), "box-era5-monthly.nc") nt = NCDataset(era_data) do ds - lon = ds["longitude"][:] - lat = ds["latitude"][:] - lev = ds["level"][:] .* 100 - time = ds["time"][:] - gZ = ds["z"][:] - T = ds["t"][:] - u = ds["u"][:] + lon = Array(ds["longitude"]) + lat = Array(ds["latitude"]) + lev = Array(ds["level"]) .* 100 + time = Array(ds["time"]) + gZ = Array(ds["z"]) + T = Array(ds["t"]) + u = Array(ds["u"]) (; lon, lat, lev, time, gZ, T, u) end (; lon, lat, lev, time, gZ, T, u) = nt diff --git a/test/non_orographic_gravity_wave/nogw_test_mima.jl b/test/non_orographic_gravity_wave/nogw_test_mima.jl index b4b856c6f3..6a38d71f6c 100644 --- a/test/non_orographic_gravity_wave/nogw_test_mima.jl +++ b/test/non_orographic_gravity_wave/nogw_test_mima.jl @@ -83,10 +83,10 @@ include(joinpath(pkgdir(ClimaAtmos), "artifacts", "artifact_funcs.jl")) mima_data = joinpath(mima_gwf_path(), "mima_gwf.nc") nt = NCDataset(mima_data) do ds - lon = ds["lon"][:] - lat = ds["lat"][:] - pfull = ds["pfull"][:] - phalf = ds["phalf"][:] + lon = Array(ds["lon"]) + lat = Array(ds["lat"]) + pfull = Array(ds["pfull"]) + phalf = Array(ds["phalf"]) time = ds["time"][1:13] lev = ds["level"][:, :, :, 1:13] z = ds["hght"][:, :, :, 1:13] diff --git a/test/non_orographic_gravity_wave/nogw_test_single_column.jl b/test/non_orographic_gravity_wave/nogw_test_single_column.jl index 0ea3287214..c13171bdf7 100644 --- a/test/non_orographic_gravity_wave/nogw_test_single_column.jl +++ b/test/non_orographic_gravity_wave/nogw_test_single_column.jl @@ -56,10 +56,10 @@ era_data = nt = NCDataset(era_data) do ds # Dimensions: longitude × latitude × level × time # data at 40N, all longitude, all levels, all time - lon = ds["longitude"][:] - lat = ds["latitude"][:] - lev = ds["level"][:] .* 100 - time = ds["time"][:] + lon = Array(ds["longitude"]) + lat = Array(ds["latitude"]) + lev = Array(ds["level"]) .* 100 + time = Array(ds["time"]) gZ = ds["z"][:, 5, :, :] T = ds["t"][:, 5, :, :] u = ds["u"][:, 5, :, :] diff --git a/test/orographic_gravity_wave/ogwd_3d.jl b/test/orographic_gravity_wave/ogwd_3d.jl index ff1ae59583..2bf1f04c84 100644 --- a/test/orographic_gravity_wave/ogwd_3d.jl +++ b/test/orographic_gravity_wave/ogwd_3d.jl @@ -24,18 +24,18 @@ comms_ctx = ClimaComms.SingletonCommsContext() include(joinpath(pkgdir(ClimaAtmos), "artifacts", "artifact_funcs.jl")) ncfile = joinpath(gfdl_ogw_data_path(), "gfdl_ogw.nc") nt = NCDataset(ncfile) do ds - lon = ds["lon"][:] - lat = ds["lat"][:] - z_full = ds["z_full"][:] - temp = ds["temp"][:] - ucomp = ds["ucomp"][:] - vcomp = ds["vcomp"][:] - udt_topo = ds["udt_topo"][:] - vdt_topo = ds["vdt_topo"][:] - sphum = ds["sphum"][:] - ps = ds["ps"][:] - pk = ds["pk"][:] - bk = ds["bk"][:] + lon = Array(ds["lon"]) + lat = Array(ds["lat"]) + z_full = Array(ds["z_full"]) + temp = Array(ds["temp"]) + ucomp = Array(ds["ucomp"]) + vcomp = Array(ds["vcomp"]) + udt_topo = Array(ds["udt_topo"]) + vdt_topo = Array(ds["vdt_topo"]) + sphum = Array(ds["sphum"]) + ps = Array(ds["ps"]) + pk = Array(ds["pk"]) + bk = Array(ds["bk"]) (; lon, lat, @@ -76,9 +76,9 @@ p_center = 0.5 * (p_half[:, :, 1:(end - 1), :] .+ p_half[:, :, 2:end, :]) # earth warp data_path = joinpath(topo_elev_dataset_path(), "ETOPO1_coarse.nc") earth_spline = NCDataset(data_path) do data - zlevels = data["elevation"][:] - lon = data["longitude"][:] - lat = data["latitude"][:] + zlevels = Array(data["elevation"]) + lon = Array(data["longitude"]) + lat = Array(data["latitude"]) # Apply Smoothing smooth_degree = 15 esmth = imfilter(zlevels, Kernel.gaussian(smooth_degree)) @@ -386,14 +386,14 @@ apply_remap( # Plot the zonal and meridional components of the base flux nt = NCDataset(datafile_rll) do ds - lon = ds["lon"][:] - lat = ds["lat"][:] - z_coord = ds["z"][:] - z_center = ds["z_3d"][:] - ogwd_u = ds["ogwd_u"][:] - ogwd_v = ds["ogwd_v"][:] - gfdl_udt_topo = ds["gfdl_udt_topo"][:] - gfdl_vdt_topo = ds["gfdl_vdt_topo"][:] + lon = Array(ds["lon"]) + lat = Array(ds["lat"]) + z_coord = Array(ds["z"]) + z_center = Array(ds["z_3d"]) + ogwd_u = Array(ds["ogwd_u"]) + ogwd_v = Array(ds["ogwd_v"]) + gfdl_udt_topo = Array(ds["gfdl_udt_topo"]) + gfdl_vdt_topo = Array(ds["gfdl_vdt_topo"]) (; lon, lat, diff --git a/test/orographic_gravity_wave/ogwd_baseflux.jl b/test/orographic_gravity_wave/ogwd_baseflux.jl index 2676a9af03..e0306e31f3 100644 --- a/test/orographic_gravity_wave/ogwd_baseflux.jl +++ b/test/orographic_gravity_wave/ogwd_baseflux.jl @@ -114,10 +114,10 @@ apply_remap(datafile_rll, datafile_cg, weightfile, ["tau_x", "tau_y"]) # Plot the zonal and meridional components of the base flux nt = NCDataset(datafile_rll) do ds - lon = ds["lon"][:] - lat = ds["lat"][:] - tau_x = ds["tau_x"][:] - tau_y = ds["tau_y"][:] + lon = Array(ds["lon"]) + lat = Array(ds["lat"]) + tau_x = Array(ds["tau_x"]) + tau_y = Array(ds["tau_y"]) (; lon, lat, tau_x, tau_y) end (; lon, lat, tau_x, tau_y) = nt From f4459d24945f316ae01df98fe218290420919882 Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Fri, 10 Nov 2023 07:12:27 -0800 Subject: [PATCH 2/2] Update RRTMPG to 0.9.3 RRTMPG 0.9.3 supports NCDatasets 0.13 --- .dev/Manifest.toml | 4 ++-- Project.toml | 4 ++-- docs/Manifest.toml | 24 +++++++++++++++--------- examples/Manifest.toml | 32 +++++++++++++++++++------------- perf/Manifest.toml | 32 +++++++++++++++++++------------- 5 files changed, 57 insertions(+), 39 deletions(-) diff --git a/.dev/Manifest.toml b/.dev/Manifest.toml index efb1f0e03c..3920faeb6f 100644 --- a/.dev/Manifest.toml +++ b/.dev/Manifest.toml @@ -135,9 +135,9 @@ version = "1.6.2" [[deps.Parsers]] deps = ["Dates", "PrecompileTools", "UUIDs"] -git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851" +git-tree-sha1 = "a935806434c9d4c506ba941871b327b96d41f2bf" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.7.2" +version = "2.8.0" [[deps.Pkg]] deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] diff --git a/Project.toml b/Project.toml index a67303421e..dde7d1ac56 100644 --- a/Project.toml +++ b/Project.toml @@ -69,11 +69,11 @@ IntervalSets = "0.5, 0.6, 0.7" Krylov = "0.9" LinearAlgebra = "1" Logging = "1" -NCDatasets = "0.11, 0.12, <0.13" +NCDatasets = "0.11, 0.12, 0.13" NVTX = "0.3" Pkg = "1.8" Printf = "1" -RRTMGP = "0.9.2" +RRTMGP = "0.9.3" Random = "1" RootSolvers = "0.2, 0.3, 0.4" SciMLBase = "1, 2" diff --git a/docs/Manifest.toml b/docs/Manifest.toml index 7a62b0c1f7..32a57907b0 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -494,6 +494,12 @@ git-tree-sha1 = "23163d55f885173722d1e4cf0f6110cdbaf7e272" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.15.1" +[[deps.DiskArrays]] +deps = ["OffsetArrays"] +git-tree-sha1 = "1bfa9de80f35ac63c6c381b2d43c590875896a1f" +uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" +version = "0.3.22" + [[deps.Distances]] deps = ["LinearAlgebra", "Statistics", "StatsAPI"] git-tree-sha1 = "5225c965635d8c21168e32a12954675e7bea1151" @@ -1095,10 +1101,10 @@ uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" version = "0.2.4" [[deps.NCDatasets]] -deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "NetCDF_jll", "NetworkOptions", "Printf"] -git-tree-sha1 = "4263c4220f22e20729329838bf7e94a49d1ac32f" +deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] +git-tree-sha1 = "7fcb4378f9c648a186bcb996fa29acc929a179ed" uuid = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" -version = "0.12.17" +version = "0.13.1" [[deps.NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] @@ -1181,9 +1187,9 @@ version = "1.6.2" [[deps.PDMats]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "66b2fcd977db5329aa35cac121e5b94dd6472198" +git-tree-sha1 = "f6f85a2edb9c356b829934ad3caed2ad0ebbfc99" uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.11.28" +version = "0.11.29" [[deps.PaddedViews]] deps = ["OffsetArrays"] @@ -1199,9 +1205,9 @@ version = "0.12.3" [[deps.Parsers]] deps = ["Dates", "PrecompileTools", "UUIDs"] -git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851" +git-tree-sha1 = "a935806434c9d4c506ba941871b327b96d41f2bf" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.7.2" +version = "2.8.0" [[deps.Pkg]] deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] @@ -1296,9 +1302,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] deps = ["Adapt", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "52a01d4a1963925ec60c76413d8c557e153c5e5e" +git-tree-sha1 = "ba6fe2d8e3648f27cdc29de64fb634a1846ba670" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.9.2" +version = "0.9.3" [[deps.Random]] deps = ["SHA", "Serialization"] diff --git a/examples/Manifest.toml b/examples/Manifest.toml index 3fa528e7f1..00ea63173e 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -611,6 +611,12 @@ git-tree-sha1 = "23163d55f885173722d1e4cf0f6110cdbaf7e272" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.15.1" +[[deps.DiskArrays]] +deps = ["OffsetArrays"] +git-tree-sha1 = "1bfa9de80f35ac63c6c381b2d43c590875896a1f" +uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" +version = "0.3.22" + [[deps.Distances]] deps = ["LinearAlgebra", "Statistics", "StatsAPI"] git-tree-sha1 = "5225c965635d8c21168e32a12954675e7bea1151" @@ -1588,10 +1594,10 @@ uuid = "3b2b4ff1-bcff-5658-a3ee-dbcf1ce5ac09" version = "0.4.4" [[deps.NCDatasets]] -deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "NetCDF_jll", "NetworkOptions", "Printf"] -git-tree-sha1 = "4263c4220f22e20729329838bf7e94a49d1ac32f" +deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] +git-tree-sha1 = "7fcb4378f9c648a186bcb996fa29acc929a179ed" uuid = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" -version = "0.12.17" +version = "0.13.1" [[deps.NCRegressionTests]] deps = ["NCDatasets", "OrderedCollections", "PrettyTables", "Test"] @@ -1738,9 +1744,9 @@ version = "10.42.0+0" [[deps.PDMats]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "66b2fcd977db5329aa35cac121e5b94dd6472198" +git-tree-sha1 = "f6f85a2edb9c356b829934ad3caed2ad0ebbfc99" uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.11.28" +version = "0.11.29" [[deps.PNGFiles]] deps = ["Base64", "CEnum", "ImageCore", "IndirectArrays", "OffsetArrays", "libpng_jll"] @@ -1774,9 +1780,9 @@ version = "0.12.3" [[deps.Parsers]] deps = ["Dates", "PrecompileTools", "UUIDs"] -git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851" +git-tree-sha1 = "a935806434c9d4c506ba941871b327b96d41f2bf" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.7.2" +version = "2.8.0" [[deps.Permutations]] deps = ["Combinatorics", "LinearAlgebra", "Random"] @@ -1863,9 +1869,9 @@ version = "0.1.2" [[deps.Polynomials]] deps = ["LinearAlgebra", "RecipesBase", "Setfield", "SparseArrays"] -git-tree-sha1 = "ea78a2764f31715093de7ab495e12c0187f231d1" +git-tree-sha1 = "5a95b69396b77fdb2c48970a535610c4743810e2" uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45" -version = "4.0.4" +version = "4.0.5" [deps.Polynomials.extensions] PolynomialsChainRulesCoreExt = "ChainRulesCore" @@ -1983,9 +1989,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] deps = ["Adapt", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "52a01d4a1963925ec60c76413d8c557e153c5e5e" +git-tree-sha1 = "ba6fe2d8e3648f27cdc29de64fb634a1846ba670" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.9.2" +version = "0.9.3" [[deps.Random]] deps = ["SHA", "Serialization"] @@ -2067,9 +2073,9 @@ version = "1.3.0" [[deps.Revise]] deps = ["CodeTracking", "Distributed", "FileWatching", "JuliaInterpreter", "LibGit2", "LoweredCodeUtils", "OrderedCollections", "Pkg", "REPL", "Requires", "UUIDs", "Unicode"] -git-tree-sha1 = "ba168f8fc36bf83c8d0573d464b7aab0f8a81623" +git-tree-sha1 = "62fbfbbed77a20e9390c4f02219cb3b11d21708d" uuid = "295af30f-e4ad-537b-8983-00126c2a3abe" -version = "3.5.7" +version = "3.5.8" [[deps.RingLists]] deps = ["Random"] diff --git a/perf/Manifest.toml b/perf/Manifest.toml index 266f471330..af0f302a8f 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -640,6 +640,12 @@ git-tree-sha1 = "23163d55f885173722d1e4cf0f6110cdbaf7e272" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.15.1" +[[deps.DiskArrays]] +deps = ["OffsetArrays"] +git-tree-sha1 = "1bfa9de80f35ac63c6c381b2d43c590875896a1f" +uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" +version = "0.3.22" + [[deps.Distances]] deps = ["LinearAlgebra", "Statistics", "StatsAPI"] git-tree-sha1 = "5225c965635d8c21168e32a12954675e7bea1151" @@ -1646,10 +1652,10 @@ uuid = "3b2b4ff1-bcff-5658-a3ee-dbcf1ce5ac09" version = "0.4.4" [[deps.NCDatasets]] -deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "NetCDF_jll", "NetworkOptions", "Printf"] -git-tree-sha1 = "4263c4220f22e20729329838bf7e94a49d1ac32f" +deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] +git-tree-sha1 = "7fcb4378f9c648a186bcb996fa29acc929a179ed" uuid = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" -version = "0.12.17" +version = "0.13.1" [[deps.NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] @@ -1790,9 +1796,9 @@ version = "10.42.0+0" [[deps.PDMats]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "66b2fcd977db5329aa35cac121e5b94dd6472198" +git-tree-sha1 = "f6f85a2edb9c356b829934ad3caed2ad0ebbfc99" uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.11.28" +version = "0.11.29" [[deps.PNGFiles]] deps = ["Base64", "CEnum", "ImageCore", "IndirectArrays", "OffsetArrays", "libpng_jll"] @@ -1832,9 +1838,9 @@ version = "0.12.3" [[deps.Parsers]] deps = ["Dates", "PrecompileTools", "UUIDs"] -git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851" +git-tree-sha1 = "a935806434c9d4c506ba941871b327b96d41f2bf" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.7.2" +version = "2.8.0" [[deps.Permutations]] deps = ["Combinatorics", "LinearAlgebra", "Random"] @@ -1921,9 +1927,9 @@ version = "0.1.2" [[deps.Polynomials]] deps = ["LinearAlgebra", "RecipesBase", "Setfield", "SparseArrays"] -git-tree-sha1 = "ea78a2764f31715093de7ab495e12c0187f231d1" +git-tree-sha1 = "5a95b69396b77fdb2c48970a535610c4743810e2" uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45" -version = "4.0.4" +version = "4.0.5" [deps.Polynomials.extensions] PolynomialsChainRulesCoreExt = "ChainRulesCore" @@ -2053,9 +2059,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.RRTMGP]] deps = ["Adapt", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "52a01d4a1963925ec60c76413d8c557e153c5e5e" +git-tree-sha1 = "ba6fe2d8e3648f27cdc29de64fb634a1846ba670" uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.9.2" +version = "0.9.3" [[deps.Random]] deps = ["SHA", "Serialization"] @@ -2143,9 +2149,9 @@ version = "1.1.1" [[deps.Revise]] deps = ["CodeTracking", "Distributed", "FileWatching", "JuliaInterpreter", "LibGit2", "LoweredCodeUtils", "OrderedCollections", "Pkg", "REPL", "Requires", "UUIDs", "Unicode"] -git-tree-sha1 = "ba168f8fc36bf83c8d0573d464b7aab0f8a81623" +git-tree-sha1 = "62fbfbbed77a20e9390c4f02219cb3b11d21708d" uuid = "295af30f-e4ad-537b-8983-00126c2a3abe" -version = "3.5.7" +version = "3.5.8" [[deps.RingLists]] deps = ["Random"]