Rename inner function to foreach_neighbor (#24)

trixi-framework · Jun 6, 2024 · 0045290 · 0045290
1 parent 51f8fe4
commit 0045290
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/PointNeighbors.jl b/src/PointNeighbors.jl
@@ -11,7 +11,7 @@ include("neighborhood_search.jl")
 include("nhs_trivial.jl")
 include("nhs_grid.jl")
 
-export for_particle_neighbor
+export for_particle_neighbor, foreach_neighbor
 export TrivialNeighborhoodSearch, GridNeighborhoodSearch
 export initialize!, update!, initialize_grid!, update_grid!
 

diff --git a/src/neighborhood_search.jl b/src/neighborhood_search.jl
@@ -66,8 +66,7 @@ end
 @inline function for_particle_neighbor(f, system_coords, neighbor_coords,
                                        neighborhood_search, particles, parallel::Val{true})
     @threaded for particle in particles
-        for_particle_neighbor_inner(f, system_coords, neighbor_coords, neighborhood_search,
-                                    particle)
+        foreach_neighbor(f, system_coords, neighbor_coords, neighborhood_search, particle)
     end
 
     return nothing
@@ -76,20 +75,16 @@ end
 @inline function for_particle_neighbor(f, system_coords, neighbor_coords,
                                        neighborhood_search, particles, parallel::Val{false})
     for particle in particles
-        for_particle_neighbor_inner(f, system_coords, neighbor_coords, neighborhood_search,
-                                    particle)
+        foreach_neighbor(f, system_coords, neighbor_coords, neighborhood_search, particle)
     end
 
     return nothing
 end
 
-# Use this function barrier and unpack inside to avoid passing closures to Polyester.jl
-# with `@batch` (`@threaded`).
-# Otherwise, `@threaded` does not work here with Julia ARM on macOS.
-# See https://github.com/JuliaSIMD/Polyester.jl/issues/88.
-@inline function for_particle_neighbor_inner(f, system_coords, neighbor_system_coords,
-                                             neighborhood_search, particle)
-    (; search_radius, periodic_box) = neighborhood_search
+@inline function foreach_neighbor(f, system_coords, neighbor_system_coords,
+                                  neighborhood_search, particle;
+                                  search_radius = neighborhood_search.search_radius)
+    (; periodic_box) = neighborhood_search
 
     particle_coords = extract_svector(system_coords, Val(ndims(neighborhood_search)),
                                       particle)