Pass correct kwargs... in distributed tripolar fill_halo_event! (#4865)

* Refactor fill_halo_regions! function

* Update Project.toml

---------

Co-authored-by: Navid C. Constantinou <[email protected]>

Author: simone-silvestri

Project.toml

@@ -1,7 +1,7 @@
 name = "Oceananigans"
 uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
 authors = ["Climate Modeling Alliance and contributors"]
-version = "0.100.5"
+version = "0.100.6"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/OrthogonalSphericalShellGrids/distributed_zipper.jl

@@ -58,11 +58,8 @@ end
     return nothing
 end
 
-function fill_halo_regions!(c::OffsetArray, bcs, indices, loc, grid::DistributedTripolarGridOfSomeKind, buffers, args...;
-                            only_local_halos=false, fill_open_bcs=true, kwargs...)
-
-    north_bc = bcs.north
-
+function fill_halo_regions!(c::OffsetArray, bcs, indices, loc, grid::DistributedTripolarGridOfSomeKind, buffers, args...; kwargs...)
+  
     arch = architecture(grid)
     kernels!, ordered_bcs = get_boundary_kernels(bcs, c, grid, loc, indices)
 
@@ -73,7 +70,7 @@ function fill_halo_regions!(c::OffsetArray, bcs, indices, loc, grid::Distributed
         @inbounds fill_halo_event!(c, kernels![task], ordered_bcs[task], loc, grid, buffers, args...; kwargs...)
     end
 
-    fill_corners!(c, arch.connectivity, indices, loc, arch, grid, buffers, args...; only_local_halos, kwargs...)
+    fill_corners!(c, arch.connectivity, indices, loc, arch, grid, buffers, args...; kwargs...)
 
     # We increment the request counter only if we have actually initiated the MPI communication.
     # This is the case only if at least one of the boundary conditions is a distributed communication
@@ -82,8 +79,11 @@ function fill_halo_regions!(c::OffsetArray, bcs, indices, loc, grid::Distributed
         arch.mpi_tag[] += 1
     end
 
-    switch_north_halos!(c, north_bc, grid, loc)
-
+    if arch.mpi_tag[] == 0 # The communication has been reset, switch the north halos!
+        north_bc = bcs.north
+        switch_north_halos!(c, north_bc, grid, loc)
+    end
+  
     return nothing
 end