From 1783368a621a18e0de0975a56dbbb146758f7920 Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Thu, 15 Aug 2024 12:03:37 -0400 Subject: [PATCH] New release for some libraries --- lib/ClimaCorePlots/Project.toml | 2 +- lib/ClimaCorePlots/src/ClimaCorePlots.jl | 4 +++- lib/ClimaCoreTempestRemap/Project.toml | 2 +- lib/ClimaCoreTempestRemap/src/ClimaCoreTempestRemap.jl | 4 ++++ lib/ClimaCoreTempestRemap/src/netcdf.jl | 5 ++++- src/DataLayouts/DataLayouts.jl | 1 + 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/ClimaCorePlots/Project.toml b/lib/ClimaCorePlots/Project.toml index 8964752309..47644fd62d 100644 --- a/lib/ClimaCorePlots/Project.toml +++ b/lib/ClimaCorePlots/Project.toml @@ -1,7 +1,7 @@ name = "ClimaCorePlots" uuid = "cf7c7e5a-b407-4c48-9047-11a94a308626" authors = ["CliMA Contributors "] -version = "0.2.10" +version = "0.2.11" [deps] ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d" diff --git a/lib/ClimaCorePlots/src/ClimaCorePlots.jl b/lib/ClimaCorePlots/src/ClimaCorePlots.jl index a86b4544c8..52ec47338a 100644 --- a/lib/ClimaCorePlots/src/ClimaCorePlots.jl +++ b/lib/ClimaCorePlots/src/ClimaCorePlots.jl @@ -4,7 +4,9 @@ import RecipesBase import TriplotBase import ClimaComms -import ClimaCore.DataLayouts: slab_index +# Keep in sync with definition(s) in ClimaCore.DataLayouts. +@inline slab_index(i, j) = CartesianIndex(i, j, 1, 1, 1) +@inline slab_index(i) = CartesianIndex(i, 1, 1, 1, 1) import ClimaCore: ClimaCore, DataLayouts, diff --git a/lib/ClimaCoreTempestRemap/Project.toml b/lib/ClimaCoreTempestRemap/Project.toml index eba3e593da..7f56e02e6d 100644 --- a/lib/ClimaCoreTempestRemap/Project.toml +++ b/lib/ClimaCoreTempestRemap/Project.toml @@ -1,7 +1,7 @@ name = "ClimaCoreTempestRemap" uuid = "d934ef94-cdd4-4710-83d6-720549644b70" authors = ["CliMA Contributors "] -version = "0.3.15" +version = "0.3.16" [deps] ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d" diff --git a/lib/ClimaCoreTempestRemap/src/ClimaCoreTempestRemap.jl b/lib/ClimaCoreTempestRemap/src/ClimaCoreTempestRemap.jl index f0e88ec68d..ffd5dddf5c 100644 --- a/lib/ClimaCoreTempestRemap/src/ClimaCoreTempestRemap.jl +++ b/lib/ClimaCoreTempestRemap/src/ClimaCoreTempestRemap.jl @@ -3,6 +3,10 @@ module ClimaCoreTempestRemap export write_exodus, rll_mesh, overlap_mesh, remap_weights, apply_remap export def_time_coord, def_space_coord +# Keep in sync with definition in DataLayouts. +@inline slab_index(i, j) = CartesianIndex(i, j, 1, 1, 1) +@inline slab_index(i) = CartesianIndex(i, 1, 1, 1, 1) +@inline vindex(v) = CartesianIndex(1, 1, 1, v, 1) using ClimaComms import ClimaCore diff --git a/lib/ClimaCoreTempestRemap/src/netcdf.jl b/lib/ClimaCoreTempestRemap/src/netcdf.jl index 24fd815c51..578154b695 100644 --- a/lib/ClimaCoreTempestRemap/src/netcdf.jl +++ b/lib/ClimaCoreTempestRemap/src/netcdf.jl @@ -1,6 +1,9 @@ import CommonDataModel import ClimaCore: slab, column -import ClimaCore.DataLayouts: slab_index +# Keep in sync with definition(s) in ClimaCore.DataLayouts. +@inline slab_index(i, j) = CartesianIndex(i, j, 1, 1, 1) +@inline slab_index(i) = CartesianIndex(i, 1, 1, 1, 1) + """ def_time_coord(nc::NCDataset, length=Inf, eltype=Float64; diff --git a/src/DataLayouts/DataLayouts.jl b/src/DataLayouts/DataLayouts.jl index aefeae837e..6c8a759e92 100644 --- a/src/DataLayouts/DataLayouts.jl +++ b/src/DataLayouts/DataLayouts.jl @@ -1276,6 +1276,7 @@ type parameters. @inline union_all(::Type{<:IH1JH2}) = IH1JH2 @inline union_all(::Type{<:IV1JH2}) = IV1JH2 +# Keep in sync with definition(s) in libs. @inline slab_index(i, j) = CartesianIndex(i, j, 1, 1, 1) @inline slab_index(i) = CartesianIndex(i, 1, 1, 1, 1) @inline vindex(v) = CartesianIndex(1, 1, 1, v, 1)