Ascent: SoA Particle Support

Add support for pure SoA layouted particle containers for Ascent.
AMReX-Codes · Jul 25, 2023 · 694251d · 694251d
1 parent ed1b3a1
commit 694251d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/Src/Extern/Conduit/AMReX_Conduit_Blueprint.H b/Src/Extern/Conduit/AMReX_Conduit_Blueprint.H
@@ -96,9 +96,8 @@ namespace amrex
  // coordset and fields used to represent the passed particle container.
  // This allows you to use unique names to wrap multiple particle containers
  // into a single blueprint tree.
- template <int NStructReal, int NStructInt, int NArrayReal, int NArrayInt>
- void ParticleContainerToBlueprint (const ParticleContainer<NStructReal,
- NStructInt,
+ template <typename ParticleType, int NArrayReal, int NArrayInt>
+ void ParticleContainerToBlueprint (const ParticleContainer<ParticleType,
  NArrayReal,
  NArrayInt> &pc,
  const Vector<std::string> &real_comp_names,

diff --git a/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H b/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H
@@ -20,10 +20,9 @@ namespace amrex
 // Note:
 // This is a helper function, it's not part of the AMReX Blueprint Interface.
 //---------------------------------------------------------------------------//
-template <int NStructReal, int NStructInt, int NArrayReal, int NArrayInt>
+template <typename ParticleType, int NArrayReal, int NArrayInt>
 void
-ParticleTileToBlueprint(const ParticleTile<amrex::Particle<NStructReal,
- NStructInt>,
+ParticleTileToBlueprint(const ParticleTile<ParticleType,
  NArrayReal,
  NArrayInt> &ptile,
  const Vector<std::string> &real_comp_names,
@@ -32,7 +31,7 @@ ParticleTileToBlueprint(const ParticleTile<amrex::Particle<NStructReal,
  const std::string &topology_name)
 {
  int num_particles = ptile.GetArrayOfStructs().size();
- int struct_size = sizeof(Particle<NStructReal, NStructInt>);
+ int struct_size = ParticleType::is_soa_particle ? 0 : sizeof(ParticleType);
 
  // knowing the above, we can zero copy the x,y,z positions + id, cpu
  // and any user fields in the AOS
@@ -193,10 +192,9 @@ ParticleTileToBlueprint(const ParticleTile<amrex::Particle<NStructReal,
 //---------------------------------------------------------------------------//
 // Converts a AMReX Particle Container into a Conduit Mesh Blueprint Hierarchy.
 //---------------------------------------------------------------------------//
-template <int NStructReal, int NStructInt, int NArrayReal, int NArrayInt>
+template <typename ParticleType, int NArrayReal, int NArrayInt>
 void
-ParticleContainerToBlueprint(const ParticleContainer<NStructReal,
- NStructInt,
+ParticleContainerToBlueprint(const ParticleContainer<ParticleType,
  NArrayReal,
  NArrayInt> &pc,
  const Vector<std::string> &real_comp_names,
@@ -220,7 +218,7 @@ ParticleContainerToBlueprint(const ParticleContainer<NStructReal,
  int rank = ParallelDescriptor::MyProc();
  int nprocs = ParallelDescriptor::NProcs();
 
- using MyParConstIter = ParConstIter<NStructReal, NStructInt, NArrayReal, NArrayInt>;
+ using MyParConstIter = ParConstIter<ParticleType, NArrayReal, NArrayInt>;
 
  //
  // blueprint expects unique ids for each domain published