Merge pull request #1935 from CliMA/ck/lib_release

New release for some libraries

Author: charleskawczynski

lib/ClimaCorePlots/Project.toml

@@ -1,7 +1,7 @@
 name = "ClimaCorePlots"
 uuid = "cf7c7e5a-b407-4c48-9047-11a94a308626"
 authors = ["CliMA Contributors <clima-software@caltech.edu>"]
-version = "0.2.10"
+version = "0.2.11"
 
 [deps]
 ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"

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,

lib/ClimaCoreTempestRemap/Project.toml

@@ -1,7 +1,7 @@
 name = "ClimaCoreTempestRemap"
 uuid = "d934ef94-cdd4-4710-83d6-720549644b70"
 authors = ["CliMA Contributors <clima-software@caltech.edu>"]
-version = "0.3.15"
+version = "0.3.16"
 
 [deps]
 ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"

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

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;

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)