Support new AMReX particle interfaces (#921)

Author: AlexanderSinn

src/particles/beam/BeamParticleContainer.H

@@ -27,13 +27,15 @@ struct BeamIdx
     };
 };
 
-struct BeamBins : amrex::DenseBins<amrex::ParticleTile<0, 0, BeamIdx::nattribs, 0>::ParticleType> {
+struct BeamBins : amrex::DenseBins<
+        amrex::ParticleTile<amrex::Particle<0, 0>, BeamIdx::nattribs, 0>::ParticleType> {
 
     template<class...Args>
     void build (Args&&...args) {
         // call build function of the underlying DenseBins object
         // with all of the arguments forwarded
-        amrex::DenseBins<amrex::ParticleTile<0, 0, BeamIdx::nattribs, 0>::ParticleType>::build(args...);
+        amrex::DenseBins<amrex::ParticleTile<
+            amrex::Particle<0, 0>, BeamIdx::nattribs, 0>::ParticleType>::build(args...);
 
         // after every build call copy offsets array form GPU to CPU
         const auto offset_size = numBins() + 1;
@@ -57,12 +59,12 @@ struct BeamBins : amrex::DenseBins<amrex::ParticleTile<0, 0, BeamIdx::nattribs,
 
 /** \brief Container for particles of 1 beam species. */
 class BeamParticleContainer
-    : public amrex::ParticleTile<0, 0, BeamIdx::nattribs, 0>
+    : public amrex::ParticleTile<amrex::Particle<0, 0>, BeamIdx::nattribs, 0>
 {
 public:
     /** Constructor */
     explicit BeamParticleContainer (std::string name) :
-        amrex::ParticleTile<0,0,BeamIdx::nattribs,0>(),
+        amrex::ParticleTile<amrex::Particle<0, 0>, BeamIdx::nattribs, 0>(),
         m_name(name)
     {
         ReadParameters();

src/particles/plasma/PlasmaParticleContainer.H

@@ -174,9 +174,9 @@ private:
 class PlasmaParticleIterator : public amrex::ParIter<0,0,PlasmaIdx::nattribs,PlasmaIdx::int_nattribs>
 {
 public:
-    using amrex::ParIter<0,0,PlasmaIdx::nattribs,PlasmaIdx::int_nattribs>::ParIter;
     /** Constructor */
-    PlasmaParticleIterator (ContainerType& pc, int level): ParIter(pc, level, DfltMfi) {}
+    PlasmaParticleIterator (ContainerType& pc, int level)
+        : amrex::ParIter<0,0,PlasmaIdx::nattribs,PlasmaIdx::int_nattribs>(pc, level, DfltMfi) {}
 };
 
 #endif

src/particles/sorting/BoxSort.cpp

@@ -50,7 +50,7 @@ void BoxSorter::sortParticlesByBox (BeamParticleContainer& a_beam,
 
     amrex::Gpu::exclusive_scan(m_box_counts.begin(), m_box_counts.end(), m_box_offsets.begin());
 
-    amrex::ParticleTile<0, 0, BeamIdx::nattribs, 0> tmp{};
+    amrex::ParticleTile<amrex::Particle<0, 0>, BeamIdx::nattribs, 0> tmp{};
     tmp.resize(np);
 
     auto p_box_offsets = m_box_offsets.dataPtr();
@@ -62,8 +62,8 @@ void BoxSorter::sortParticlesByBox (BeamParticleContainer& a_beam,
         p_dst_indices[i] += p_box_offsets[dst_box];
     });
 
-    amrex::scatterParticles<amrex::ParticleTile<0, 0, BeamIdx::nattribs, 0>>(tmp, a_beam, np,
-                                                                             dst_indices.dataPtr());
+    amrex::scatterParticles<amrex::ParticleTile<amrex::Particle<0, 0>, BeamIdx::nattribs, 0>>(
+        tmp, a_beam, np, dst_indices.dataPtr());
 
     a_beam.swap(tmp);
 #ifdef AMREX_USE_GPU