From 1f1619c31738021bbfe4f0d2db092f01568a2889 Mon Sep 17 00:00:00 2001
From: Serhii Yaskovets <yaskovet@mpi-cbg.de>
Date: Fri, 14 Jun 2024 10:47:40 +0200
Subject: [PATCH] Get rid of getNNIterator in Cell List. Rename to explicit
Box/Radius iterators
---
.../tests/vector_dist_operators_tests_util.hpp | 12 ++++++------
.../Vector/vector_dist_operators_apply_kernel.hpp | 6 +++---
src/PSE/Kernels_test_util.hpp | 2 +-
src/level_set/particle_cp/particle_cp.hpp | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/Operators/Vector/tests/vector_dist_operators_tests_util.hpp b/src/Operators/Vector/tests/vector_dist_operators_tests_util.hpp
index ee47fd7..1c7fbe3 100644
--- a/src/Operators/Vector/tests/vector_dist_operators_tests_util.hpp
+++ b/src/Operators/Vector/tests/vector_dist_operators_tests_util.hpp
@@ -1216,7 +1216,7 @@ bool check_values_apply_kernel(vector & vd, Kernel & ker, NN_type & NN)
float prp_x = vd.template getProp<VC>(p) * vd.template getProp<VB>(p) + norm(vd.template getProp<VB>(p));
// For each neighborhood particle
- auto Np = NN.getNNIterator(NN.getCell(xp));
+ auto Np = NN.getNNIteratorBox(NN.getCell(xp));
while (Np.isNext())
{
@@ -1278,7 +1278,7 @@ bool check_values_apply_kernel_reduce(vector & vd, Kernel & ker, NN_type & NN)
float prp_x = vd.template getProp<VC>(p) * vd.template getProp<VB>(p) + norm(vd.template getProp<VB>(p));
// For each neighborhood particle
- auto Np = NN.getNNIterator(NN.getCell(xp));
+ auto Np = NN.getNNIteratorBox(NN.getCell(xp));
while (Np.isNext())
{
@@ -1353,7 +1353,7 @@ bool check_values_apply_kernel2(vector & vd, Kernel & ker, NN_type & NN)
Point<3,float> prp_x = 2.0 * vd.template getProp<VC>(p) + vd.template getProp<VB>(p);
// For each neighborhood particle
- auto Np = NN.getNNIterator(NN.getCell(xp));
+ auto Np = NN.getNNIteratorBox(NN.getCell(xp));
while (Np.isNext())
{
@@ -1420,7 +1420,7 @@ bool check_values_apply_kernel3(vector & vd, Kernel & ker, NN_type & NN)
Point<3,float> prp_x = vd.template getProp<VC>(p);
// For each neighborhood particle
- auto Np = NN.getNNIterator(NN.getCell(xp));
+ auto Np = NN.getNNIteratorBox(NN.getCell(xp));
while (Np.isNext())
{
@@ -1485,7 +1485,7 @@ bool check_values_apply_kernel2_reduce(vector & vd, Kernel & ker, NN_type & NN)
Point<3,float> prp_x = 2.0f*vd.template getProp<VC>(p) + vd.template getProp<VB>(p);
// For each neighborhood particle
- auto Np = NN.getNNIterator(NN.getCell(xp));
+ auto Np = NN.getNNIteratorBox(NN.getCell(xp));
while (Np.isNext())
{
@@ -1562,7 +1562,7 @@ bool check_values_apply_kernel3_reduce(vector & vd, Kernel & ker, NN_type & NN,
Point<2,float> ker_accu = 0.0;
// For each neighborhood particle
- auto Np = NN.getNNIterator(NN.getCell(xp));
+ auto Np = NN.getNNIteratorBox(NN.getCell(xp));
while (Np.isNext())
{
diff --git a/src/Operators/Vector/vector_dist_operators_apply_kernel.hpp b/src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
index c41c065..554df23 100644
--- a/src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
+++ b/src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
@@ -107,7 +107,7 @@ struct apply_kernel_is_number_or_expression
rtype prp_p = v_exp.value(key);
// Get the neighborhood of the particle
- auto NN = cl.getNNIterator(cl.getCell(p));
+ auto NN = cl.getNNIteratorBox(cl.getCell(p));
while(NN.isNext())
{
auto nnp = NN.get();
@@ -163,7 +163,7 @@ struct apply_kernel_is_number_or_expression_sim
Point<vector::dims,typename vector::stype> p = vd.getPos(key);
// Get the neighborhood of the particle
- auto NN = cl.getNNIterator(cl.getCell(p));
+ auto NN = cl.getNNIteratorBox(cl.getCell(p));
while(NN.isNext())
{
auto nnp = NN.get();
@@ -218,7 +218,7 @@ struct apply_kernel_is_number_or_expression_gen
Point<vector::dims,typename vector::stype> p = vd.getPos(key);
// Get the neighborhood of the particle
- auto NN = cl.getNNIterator(cl.getCell(p));
+ auto NN = cl.getNNIteratorBox(cl.getCell(p));
while(NN.isNext())
{
auto nnp = NN.get();
diff --git a/src/PSE/Kernels_test_util.hpp b/src/PSE/Kernels_test_util.hpp
index 2bce588..b7f5bf0 100644
--- a/src/PSE/Kernels_test_util.hpp
+++ b/src/PSE/Kernels_test_util.hpp
@@ -123,7 +123,7 @@ template<typename T, typename Kernel> void PSE_test(size_t Npart, size_t overlap
T prp_x = vd.template getProp<0>(key);
// Get the neighborhood of the particles
- auto NN = cl.template getNNIterator(cl.getCell(p));
+ auto NN = cl.template getNNIteratorBox(cl.getCell(p));
while(NN.isNext())
{
auto nnp = NN.get();
diff --git a/src/level_set/particle_cp/particle_cp.hpp b/src/level_set/particle_cp/particle_cp.hpp
index b8b5bb9..978313c 100644
--- a/src/level_set/particle_cp/particle_cp.hpp
+++ b/src/level_set/particle_cp/particle_cp.hpp
@@ -150,7 +150,7 @@ private:
if (redistOptions.verbose) vd_in.template getProp<vd_in_close_part>(akey) = 0;
int isclose = 0;
- auto Np = NN.getNNIterator(NN.getCell(xa));
+ auto Np = NN.getNNIteratorBox(NN.getCell(xa));
while (Np.isNext())
{
vect_dist_key_dx bkey = Np.get();
@@ -350,7 +350,7 @@ private:
Point<dim, double> xaa = vd_in.getPos(a);
// Now we will iterate over the sample points, which means iterating over vd_s.
- auto Np = NN_s.getNNIterator(NN_s.getCell(vd_in.getPos(a)));
+ auto Np = NN_s.getNNIteratorBox(NN_s.getCell(vd_in.getPos(a)));
vect_dist_key_dx b_min = get_closest_neighbor<decltype(NN_s)>(xaa, vd_s, NN_s);
@@ -524,7 +524,7 @@ private:
template<typename NNlist_type> vect_dist_key_dx get_closest_neighbor(Point<dim, double> & xa, particles_surface<dim, n_c> & vd_surface, NNlist_type & NN_s)
{
- auto Np = NN_s.getNNIterator(NN_s.getCell(xa));
+ auto Np = NN_s.getNNIteratorBox(NN_s.getCell(xa));
// distance is the the minimum distance to be beaten
double distance = 1000000.0;
--
GitLab