RingGrinds more general indexing with Colon (less escapes)

SpeedyWeather · Dec 13, 2024 · 6b0d4fa · 6b0d4fa
1 parent 4f07e4d
commit 6b0d4fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/RingGrids/general.jl b/src/RingGrids/general.jl
@@ -76,7 +76,7 @@ Base.@propagate_inbounds Base.getindex(G::AbstractGridArray, ijk...) = getindex(
 @inline function Base.getindex(
     G::GridArray,
     col::Colon,
-    k::Integer...,
+    k...,
 ) where {GridArray<:AbstractGridArray}
     GridArray_ = nonparametric_type(GridArray)  # obtain parameters from G.data
     return GridArray_(getindex(G.data, col, k...), G.nlat_half, G.rings)

diff --git a/test/grids.jl b/test/grids.jl
@@ -380,6 +380,9 @@ end
         @test grid[1:2, 1:2, 1:2] == grid.data[1:2, 1:2, 1:2]
         @test grid[1, 1, :] == grid.data[1, 1, :]
 
+        @test SpeedyWeather.RingGrids.nonparametric_type(typeof(grid[:,1:2,1:2])) <: RingGrids.nonparametric_type(G)
+        @test grid[:, 1:2, 1:2].data == grid.data[:, 1:2, 1:2]
+
         idx = CartesianIndex((1, 2, 3))
         @test grid[idx] == grid.data[idx]