Merge branch 'main' into ss/active-index-macro

src/Advection/topologically_conditional_interpolation.jl

@@ -10,21 +10,26 @@
 #####        close to the boundary, or a second-order interpolation if i is close to a boundary.
 #####
 
-using Oceananigans.Grids: AbstractUnderlyingGrid, Bounded, RightConnected, LeftConnected, BoundedTopology
+using Oceananigans.Grids: AbstractUnderlyingGrid, 
+                          Bounded, 
+                          RightConnected, 
+                          LeftConnected, 
+                          topology,
+                          architecture
 
 const AUG = AbstractUnderlyingGrid
 
 # topologies bounded at least on one side
 const BT = Union{Bounded, RightConnected, LeftConnected}
 
 # Bounded underlying Grids
-const AUGX   = AUG{<:Any, <:BoundedTopology}
-const AUGY   = AUG{<:Any, <:Any, <:BoundedTopology}
-const AUGZ   = AUG{<:Any, <:Any, <:Any, <:BoundedTopology}
-const AUGXY  = AUG{<:Any, <:BoundedTopology, <:BoundedTopology}
-const AUGXZ  = AUG{<:Any, <:BoundedTopology, <:Any, <:BoundedTopology}
-const AUGYZ  = AUG{<:Any, <:Any, <:BoundedTopology, <:BoundedTopology}
-const AUGXYZ = AUG{<:Any, <:BoundedTopology, <:BoundedTopology, <:BoundedTopology}
+const AUGX   = AUG{<:Any, <:BT}
+const AUGY   = AUG{<:Any, <:Any, <:BT}
+const AUGZ   = AUG{<:Any, <:Any, <:Any, <:BT}
+const AUGXY  = AUG{<:Any, <:BT, <:BT}
+const AUGXZ  = AUG{<:Any, <:BT, <:Any, <:BT}
+const AUGYZ  = AUG{<:Any, <:Any, <:BT, <:BT}
+const AUGXYZ = AUG{<:Any, <:BT, <:BT, <:BT}
 
 # Left-biased buffers are smaller by one grid point on the right side; vice versa for right-biased buffers
 # Center interpolation stencil look at i + 1 (i.e., require one less point on the left)
@@ -98,10 +103,10 @@ for bias in (:symmetric, :biased)
             # Conditional high-order interpolation in Bounded directions
             if ξ == :x
                 @eval begin
-                    @inline $alt1_interp(i, j, k, grid::AUGX, scheme::HOADV, args...) =
-                        ifelse($outside_buffer(i, topology(grid, 1), grid.Nx, scheme),
-                               $interp(i, j, k, grid, scheme, args...),
-                               $alt2_interp(i, j, k, grid, scheme.buffer_scheme, args...))
+                    @inline $alt1_interp(i, j, k, grid::AUGX, scheme::HOADV, args...) = 
+                            ifelse($outside_buffer(i, topology(grid, 1), grid.Nx, scheme),
+                                   $interp(i, j, k, grid, scheme, args...),
+                                   $alt2_interp(i, j, k, grid, scheme.buffer_scheme, args...))
                 end
             elseif ξ == :y
                 @eval begin

src/DistributedComputations/distributed_immersed_boundaries.jl

@@ -135,7 +135,7 @@ function map_interior_active_cells(ibg::ImmersedBoundaryGrid{<:Any, <:Any, <:Any
     east_halo_dependent_cells  = interior_active_indices(ibg; parameters = KernelParameters(east_boundary...))
     south_halo_dependent_cells = interior_active_indices(ibg; parameters = KernelParameters(south_boundary...))
     north_halo_dependent_cells = interior_active_indices(ibg; parameters = KernelParameters(north_boundary...))
-    
+
     west_halo_dependent_cells  = ifelse(include_west,  west_halo_dependent_cells,  nothing)
     east_halo_dependent_cells  = ifelse(include_east,  east_halo_dependent_cells,  nothing)
     south_halo_dependent_cells = ifelse(include_south, south_halo_dependent_cells, nothing)

src/Models/HydrostaticFreeSurfaceModels/compute_hydrostatic_free_surface_buffers.jl

@@ -39,9 +39,9 @@ function compute_buffer_tendency_contributions!(grid::DistributedActiveCellsIBG,
                  :east_halo_dependent_cells, 
                  :south_halo_dependent_cells, 
                  :north_halo_dependent_cells)
-        
+
         active_cells_map = @inbounds maps[name]
-        
+
         # If the map == nothing, we don't need to compute the buffer because 
         # the buffer is not adjacent to a processor boundary
         !isnothing(map) && compute_hydrostatic_free_surface_tendency_contributions!(model, :xyz; active_cells_map)