Particle Container: Support Pure SoA (#124)

Transition particle containers, iterators, etc. to support also the
new pure SoA layout.

Author: ax3l

cmake/dependencies/AMReX.cmake

@@ -82,7 +82,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON)
 set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)")
-set(pyAMReX_amrex_branch "6b294a5cd3e5c55b36c7d0afe2993501775eb42f"
+set(pyAMReX_amrex_branch "ee492f47704ae8b094ad9bb4b6f758d82606a61e"
     CACHE STRING
     "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")
 

src/Particle/ParticleContainer.H

@@ -5,14 +5,19 @@
  */
 #include "ParticleContainer.H"
 
+#include <AMReX_Particle.H>
+
+
 void init_ParticleContainer_HiPACE(py::module& m);
 void init_ParticleContainer_ImpactX(py::module& m);
 void init_ParticleContainer_WarpX(py::module& m);
 
 void init_ParticleContainer(py::module& m) {
+    using namespace amrex;
+
     // TODO: we might need to move all or most of the defines in here into a
     //       test/example submodule, so they do not collide with downstream projects
-    make_ParticleContainer_and_Iterators< 1, 1, 2, 1> (m);  // tests
+    make_ParticleContainer_and_Iterators<Particle<1, 1>, 2, 1>(m);  // tests
 
     init_ParticleContainer_HiPACE(m);
     init_ParticleContainer_ImpactX(m);

src/Particle/ParticleContainer.cpp

@@ -5,10 +5,14 @@
  */
 #include "ParticleContainer.H"
 
+#include <AMReX_Particle.H>
+
 
 void init_ParticleContainer_HiPACE(py::module& /* m */) {
+    using namespace amrex;
+
     // TODO: we might need to move all or most of the defines in here into a
     //       test/example submodule, so they do not collide with downstream projects
-    //make_ParticleContainer_and_Iterators< 0, 0, 4, 0> (m);   // HiPACE++ 22.07
-    //make_ParticleContainer_and_Iterators< 0, 0, 37, 1> (m);  // HiPACE++ 22.07
+    //make_ParticleContainer_and_Iterators<Particle<0, 0>, 4, 0> (m);   // HiPACE++ 22.07
+    //make_ParticleContainer_and_Iterators<Particle<0, 0>, 37, 1> (m);  // HiPACE++ 22.07
 }

src/Particle/ParticleContainer_HiPACE.cpp

@@ -5,9 +5,15 @@
  */
 #include "ParticleContainer.H"
 
+#include <AMReX_Particle.H>
+#include <AMReX_ParticleTile.H>
+
 
 void init_ParticleContainer_ImpactX(py::module& m) {
+    using namespace amrex;
+
     // TODO: we might need to move all or most of the defines in here into a
     //       test/example submodule, so they do not collide with downstream projects
-    make_ParticleContainer_and_Iterators< 0, 0, 5, 0> (m);   // ImpactX 22.07
+    make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0>(m);     // ImpactX 22.07 - 23.04
+    make_ParticleContainer_and_Iterators<SoAParticle<8, 2>, 8, 2>(m);  // ImpactX 23.05+
 }

src/Particle/ParticleContainer_ImpactX.cpp

@@ -5,10 +5,14 @@
  */
 #include "ParticleContainer.H"
 
+#include <AMReX_Particle.H>
+
 
 void init_ParticleContainer_WarpX(py::module& m) {
+    using namespace amrex;
+
     // TODO: we might need to move all or most of the defines in here into a
     //       test/example submodule, so they do not collide with downstream projects
-    make_ParticleContainer_and_Iterators< 0, 0, 4, 0> (m);   // WarpX 22.07 1D-3D
-    //make_ParticleContainer_and_Iterators< 0, 0, 5, 0> (m);   // WarpX 22.07 RZ
+    make_ParticleContainer_and_Iterators<Particle<0, 0>, 4, 0>(m);   // WarpX 22.07 - 23.04 1D-3D
+    //make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0> (m);   // WarpX 22.07 - 23.04 RZ
 }

src/Particle/ParticleContainer_WarpX.cpp

@@ -72,6 +72,7 @@ void make_StructOfArrays(py::module &m)
 void init_StructOfArrays(py::module& m) {
     make_StructOfArrays< 2, 1>(m);
     make_StructOfArrays< 4, 0>(m);  // HiPACE++ 22.07
-    make_StructOfArrays< 5, 0>(m);  // ImpactX 22.07
+    make_StructOfArrays< 5, 0>(m);  // ImpactX 22.07 - 23.04
+    make_StructOfArrays< 8, 2>(m);  // ImpactX 23.04+
     make_StructOfArrays<37, 1>(m);  // HiPACE++ 22.07
 }