Modify the neighbor particles test to also test selectActualNeighbors. (

AMReX-Codes#3118) The proposed changes: - [ ] fix a bug or incorrect behavior in AMReX - [ ] add new capabilities to AMReX - [ ] changes answers in the test suite to more than roundoff level - [ ] are likely to significantly affect the results of downstream AMReX users - [ ] include documentation in the code and/or rst files, if appropriate
mohuangrui · Feb 1, 2023 · 78dd7a0 · 78dd7a0
1 parent c09ed7d
commit 78dd7a0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/Src/Particle/AMReX_NeighborParticlesI.H b/Src/Particle/AMReX_NeighborParticlesI.H
@@ -1023,9 +1023,9 @@ selectActualNeighbors (CheckPair&& check_pair, int num_cells)
             bins.build(np_total, pstruct, grownBox,
                       [=] AMREX_GPU_DEVICE (const ParticleType& p) noexcept -> IntVect
                       {
-                          int i = static_cast<int>(amrex::Math::floor((p.pos(0)-plo[0])*dxi[0]) - lo.x);
-                          int j = static_cast<int>(amrex::Math::floor((p.pos(1)-plo[1])*dxi[1]) - lo.y);
-                          int k = static_cast<int>(amrex::Math::floor((p.pos(2)-plo[2])*dxi[2]) - lo.z);
+                          AMREX_D_TERM(int i = static_cast<int>(amrex::Math::floor((p.pos(0)-plo[0])*dxi[0]) - lo.x);,
+                                       int j = static_cast<int>(amrex::Math::floor((p.pos(1)-plo[1])*dxi[1]) - lo.y);,
+                                       int k = static_cast<int>(amrex::Math::floor((p.pos(2)-plo[2])*dxi[2]) - lo.z));
                           AMREX_D_TERM(AMREX_ASSERT(i >= 0);, AMREX_ASSERT(j >= 0);, AMREX_ASSERT(k >= 0));
 
                           return IntVect(AMREX_D_DECL(i, j, k));

diff --git a/Tests/Particles/NeighborParticles/MDParticleContainer.cpp b/Tests/Particles/NeighborParticles/MDParticleContainer.cpp
@@ -187,7 +187,7 @@ std::pair<Real, Real> MDParticleContainer::minAndMaxDistance()
             }
         });
 
-        //        Gpu::Device::streamSynchronize();
+        Gpu::Device::streamSynchronize();
 
         min_d = std::min(min_d, min_d_gpu.dataValue());
         max_d = std::max(max_d, max_d_gpu.dataValue());

diff --git a/Tests/Particles/NeighborParticles/inputs b/Tests/Particles/NeighborParticles/inputs
@@ -7,4 +7,5 @@ nbor_list.size = (24, 24, 24)
 nbor_list.max_grid_size = 8
 nbor_list.is_periodic = 1
 nbor_list.num_ppc = 1
-
+nbor_list.do_plotfile = 1
+nbor_list.check_answer = 1
diff --git a/Tests/Particles/NeighborParticles/main.cpp b/Tests/Particles/NeighborParticles/main.cpp
@@ -17,6 +17,8 @@ struct TestParams
     int max_grid_size;
     int num_ppc;
     int is_periodic;
+    int do_plotfile;
+    int check_answer;
 };
 
 void testNeighborParticles();
@@ -43,6 +45,12 @@ void get_test_params(TestParams& params, const std::string& prefix)
     pp.get("max_grid_size", params.max_grid_size);
     pp.get("num_ppc", params.num_ppc);
     pp.get("is_periodic", params.is_periodic);
+
+    params.do_plotfile = true;
+    pp.query("do_plotfile", params.do_plotfile);
+
+    params.check_answer = true;
+    pp.query("check_answer", params.check_answer);
 }
 
 void testNeighborParticles ()
@@ -183,11 +191,26 @@ void testNeighborList ()
 
     pc.buildNeighborList(CheckPair());
 
-    pc.checkNeighborList();
+    if (params.check_answer) {
+        pc.checkNeighborList();
+    }
 
-    MultiFab dummy_mf(ba, dm, 1, 0);
-    dummy_mf.setVal(0.0);
-    WriteSingleLevelPlotfile("NeighborParticles_plt00001", dummy_mf,
-                             {"dummy"}, geom, 0.0, 0);
-    pc.WritePlotFile("NeighborParticles_plt00001", "neighbors");
+#ifdef AMREX_USE_GPU
+    pc.clearNeighbors();
+    pc.fillNeighbors();
+    pc.selectActualNeighbors(CheckPair());
+    pc.updateNeighbors();
+    pc.buildNeighborList(CheckPair());
+    if (params.check_answer) {
+        pc.checkNeighborList();
+    }
+#endif
+
+    if (params.do_plotfile) {
+        MultiFab dummy_mf(ba, dm, 1, 0);
+        dummy_mf.setVal(0.0);
+        WriteSingleLevelPlotfile("NeighborParticles_plt00001", dummy_mf,
+                                 {"dummy"}, geom, 0.0, 0);
+        pc.WritePlotFile("NeighborParticles_plt00001", "neighbors");
+    }
 }