Updating Particles function signature and testing

Author: jessdagostini

Src/Particle/AMReX_ParticleContainer.H

@@ -578,10 +578,9 @@ public:
 
     /**
      * \brief Return capacity of memory for particles at specific grid
-     *  Level is defaulted to 0.
      */
-
-    void CapacityOfParticlesInGrid  (LayoutData<std::size_t>& mem, int lev) const;
+    template <typename I, std::enable_if_t<std::is_integral_v<I> && sizeof(I) >= sizeof(Long), int> = 0>
+    void CapacityOfParticlesInGrid (LayoutData<I>& mem, int lev) const;
 
     /**
     * \brief Returns # of particles at all levels

Src/Particle/AMReX_ParticleContainerI.H

@@ -588,8 +588,9 @@ Long ParticleContainer_impl<ParticleType, NArrayReal, NArrayInt, Allocator, Cell
 
 template <typename ParticleType, int NArrayReal, int NArrayInt,
           template<class> class Allocator, class CellAssignor>
+template <typename I, std::enable_if_t<std::is_integral_v<I> && sizeof(I) >= sizeof(Long), int> FOO>
 void
-ParticleContainer_impl<ParticleType, NArrayReal, NArrayInt, Allocator, CellAssignor>::CapacityOfParticlesInGrid (LayoutData<std::size_t>& mem, int lev) const
+ParticleContainer_impl<ParticleType, NArrayReal, NArrayInt, Allocator, CellAssignor>::CapacityOfParticlesInGrid (LayoutData<I>& mem, int lev) const
 {
     AMREX_ASSERT(lev >= 0 && lev < int(m_particles.size()));
 
@@ -600,7 +601,7 @@ ParticleContainer_impl<ParticleType, NArrayReal, NArrayInt, Allocator, CellAssig
     for (ParConstIterType pti(*this, lev); pti.isValid(); ++pti)
     {
         int gid = pti.index();
-        mem[gid] += (std::size_t)pti.capacity();
+        mem[gid] += static_cast<I>(pti.capacity());
     }
 }
 

Tests/Particles/NeighborList/main.cpp

@@ -138,4 +138,13 @@ void testNeighborList ()
         auto& nlist2 = neighbors_type_2[0][std::make_pair(gid, tid)];
         nlist2.print();
     }
+
+    LayoutData<std::size_t> mem(ba, dm);
+    pc1.CapacityOfParticlesInGrid(mem, 0);
+
+    Vector<Long> particles_in_grid = pc1.NumberOfParticlesInGrid(0, false,true);
+    for (amrex::MFIter mfi(mem); mfi.isValid(); ++mfi) {
+        amrex::Print() << "Box " << mfi.index() << " uses "
+                     << mem[mfi] << " bytes and have " << particles_in_grid[mfi.LocalIndex()] << " particles\n";
+    }
 }