Migrate to v0.3

trixi-framework · Jun 24, 2024 · 692f7c1 · 692f7c1
1 parent d9d366e
commit 692f7c1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/benchmarks/count_neighbors.jl b/benchmarks/count_neighbors.jl
@@ -5,7 +5,7 @@ using BenchmarkTools
     benchmark_count_neighbors(neighborhood_search, coordinates; parallel = true)
 
 A very cheap and simple neighborhood search benchmark, only counting the neighbors of each
-particle. For each particle-neighbor pair, only an array entry is incremented.
+point. For each point-neighbor pair, only an array entry is incremented.
 
 Due to the minimal computational cost, differences between neighborhood search
 implementations are highlighted. On the other hand, this is the least realistic benchmark.
@@ -18,8 +18,8 @@ function benchmark_count_neighbors(neighborhood_search, coordinates; parallel =
     function count_neighbors!(n_neighbors, coordinates, neighborhood_search, parallel)
         n_neighbors .= 0
 
-        for_particle_neighbor(coordinates, coordinates, neighborhood_search,
-                              parallel = parallel) do i, _, _, _
+        foreach_point_neighbor(coordinates, coordinates, neighborhood_search,
+                               parallel = parallel) do i, _, _, _
             n_neighbors[i] += 1
         end
     end

diff --git a/benchmarks/n_body.jl b/benchmarks/n_body.jl
@@ -21,8 +21,8 @@ function benchmark_n_body(neighborhood_search, coordinates; parallel = true)
     function compute_acceleration!(dv, coordinates, mass, G, neighborhood_search, parallel)
         dv .= 0.0
 
-        for_particle_neighbor(coordinates, coordinates, neighborhood_search,
-                              parallel = parallel) do i, j, pos_diff, distance
+        foreach_point_neighbor(coordinates, coordinates, neighborhood_search,
+                               parallel = parallel) do i, j, pos_diff, distance
             # Only consider particles with a distance > 0
             distance < sqrt(eps()) && return
 

diff --git a/benchmarks/plot.jl b/benchmarks/plot.jl
@@ -52,12 +52,12 @@ function plot_benchmarks(benchmark, n_points_per_dimension, iterations;
         search_radius = 3.0
 
         neighborhood_searches = [
-            TrivialNeighborhoodSearch{size(coordinates, 1)}(search_radius,
-                                                            axes(coordinates, 2)),
-            GridNeighborhoodSearch{size(coordinates, 1)}(search_radius,
-                                                         size(coordinates, 2)),
-            PrecomputedNeighborhoodSearch{size(coordinates, 1)}(search_radius,
-                                                                size(coordinates, 2)),
+            TrivialNeighborhoodSearch{size(coordinates, 1)}(; search_radius,
+                                                            eachpoint = axes(coordinates, 2)),
+            GridNeighborhoodSearch{size(coordinates, 1)}(; search_radius,
+                                                         n_points = size(coordinates, 2)),
+            PrecomputedNeighborhoodSearch{size(coordinates, 1)}(; search_radius,
+                                                                n_points = size(coordinates, 2)),
         ]
 
         for i in eachindex(neighborhood_searches)