reimplement SortParticlesByCell() in terms of SortParticlesByBin(), r…

…educing code duplication. (#1172)
AMReX-Codes · Jul 23, 2020 · 3b0aec5 · 3b0aec5
1 parent e1b7a28
commit 3b0aec5
Showing 1 changed file with 3 additions and 32 deletions.
diff --git a/Src/Particle/AMReX_ParticleContainerI.H b/Src/Particle/AMReX_ParticleContainerI.H
@@ -985,36 +985,7 @@ template <int NStructReal, int NStructInt, int NArrayReal, int NArrayInt>
 void
 ParticleContainer<NStructReal, NStructInt, NArrayReal, NArrayInt>::SortParticlesByCell ()
 {
-    BL_PROFILE("ParticleContainer::SortParticlesByCell()");
-
-    for (int lev = 0; lev < numLevels(); ++lev)
-    {
-        const Geometry& geom = Geom(lev);
-        const auto dxi = geom.InvCellSizeArray();
-        const auto plo = geom.ProbLoArray();
-        const auto domain = geom.Domain();
-
-        for(MFIter mfi = MakeMFIter(lev); mfi.isValid(); ++mfi)
-        {
-            auto& ptile = ParticlesAt(lev, mfi);
-            auto& aos   = ptile.GetArrayOfStructs();
-            const size_t np = aos.numParticles();
-            auto pstruct_ptr = aos().dataPtr();
-
-            ParticleTileType ptile_tmp;
-            ptile_tmp.define(m_num_runtime_real, m_num_runtime_int);
-            ptile_tmp.resize(np);
-
-            m_bins.build(np, pstruct_ptr, mfi.tilebox(),
-                       [=] AMREX_GPU_HOST_DEVICE (const ParticleType& p) noexcept -> IntVect
-                       {
-                           return getParticleCell(p, plo, dxi, domain);
-                       });
-
-            gatherParticles(ptile_tmp, ptile, np, m_bins.permutationPtr());
-            ptile.swap(ptile_tmp);
-        }
-    }
+    SortParticlesByBin(IntVect(AMREX_D_DECL(1, 1, 1)));
 }
 
 template <int NStructReal, int NStructInt, int NArrayReal, int NArrayInt>
@@ -1043,13 +1014,13 @@ ParticleContainer<NStructReal, NStructInt, NArrayReal, NArrayInt>::SortParticles
 
             const Box& box = mfi.tilebox();
             IntVect lo = box.smallEnd();
-			
+
             m_bins.build(np, pstruct_ptr, mfi.tilebox(),
                        [=] AMREX_GPU_HOST_DEVICE (const ParticleType& p) noexcept -> IntVect
                        {
                            return (getParticleCell(p, plo, dxi, domain) - lo) / bin_size;
                        });
-          
+
             gatherParticles(ptile_tmp, ptile, np, m_bins.permutationPtr());
             ptile.swap(ptile_tmp);
         }