(0.94.0) Overhaul spacings functions to return KernelFunctionOperations

src/Grids/latitude_longitude_grid.jl

@@ -680,8 +680,8 @@ end
     view(grid.Δyᶠᶜᵃ, interior_indices(ℓy, topology(grid, 2)(), grid.Ny))
 
 @inline yspacings(grid::YRegLatLonGrid, ℓx, ℓy; with_halos=false) = yspacings(grid, ℓy; with_halos)
-@inline yspacings(grid, ℓy::Center; kwargs...) = grid.Δyᶠᶜᵃ
-@inline yspacings(grid, ℓy::Face; kwargs...)   = grid.Δyᶜᶠᵃ
+@inline yspacings(grid::LatLonGrid, ℓy::Center; kwargs...) = grid.Δyᶠᶜᵃ
+@inline yspacings(grid::LatLonGrid, ℓy::Face; kwargs...)   = grid.Δyᶜᶠᵃ
 
 @inline zspacings(grid::LatLonGrid,     ℓz::Center; with_halos=false) = with_halos ? grid.Δzᵃᵃᶜ : view(grid.Δzᵃᵃᶜ, interior_indices(ℓz, topology(grid, 3)(), size(grid, 3)))
 @inline zspacings(grid::ZRegLatLonGrid, ℓz::Center; with_halos=false) = grid.Δzᵃᵃᶜ

src/ImmersedBoundaries/immersed_grid_metrics.jl

@@ -1,6 +1,8 @@
 using Oceananigans.AbstractOperations: GridMetricOperation
 
-import Oceananigans.Grids: return_metrics
+import Oceananigans.Grids: return_metrics,
+                           xspacing, yspacing, zspacing,
+                           xspacings, yspacings, zspacings
 
 const c = Center()
 const f = Face()
@@ -34,6 +36,11 @@ end
 @inline Δzᵃᵃᶠ(i, j, k, ibg::IBG) = Δzᵃᵃᶠ(i, j, k, ibg.underlying_grid)
 
 return_metrics(grid::IBG) = return_metrics(grid.underlying_grid)
-xspacings(X, grid::IBG) = xspacings(X, grid.underlying_grid)
-yspacings(Y, grid::IBG) = yspacings(Y, grid.underlying_grid)
-zspacings(Z, grid::IBG) = zspacings(Z, grid.underlying_grid)
+
+xspacing(grid::IBG, args...) = xspacing(grid.underlying_grid, args...)
+yspacing(grid::IBG, args...) = yspacing(grid.underlying_grid, args...)
+zspacing(grid::IBG, args...) = zspacing(grid.underlying_grid, args...)
+
+xspacings(grid::IBG, args...) = xspacings(grid.underlying_grid, args...)
+yspacings(grid::IBG, args...) = yspacings(grid.underlying_grid, args...)
+zspacings(grid::IBG, args...) = zspacings(grid.underlying_grid, args...)