From 6c624118989d4ed4fe595c3b1f76fea2cb37dd30 Mon Sep 17 00:00:00 2001 From: Andrew Myers Date: Thu, 13 Jul 2023 09:40:15 -0700 Subject: [PATCH] ParticleContainer -> ParticleContainer_impl --- Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptor.H | 2 +- Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptorI.H | 2 +- Src/Extern/SENSEI/AMReX_AmrMeshParticleInSituBridge.H | 4 ++-- Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptor.H | 2 +- Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptorI.H | 2 +- Src/Extern/SENSEI/AMReX_AmrParticleInSituBridge.H | 4 ++-- Src/Extern/SENSEI/AMReX_ParticleDataAdaptor.H | 4 ++-- Src/Extern/SENSEI/AMReX_ParticleDataAdaptorI.H | 2 +- Src/Extern/SENSEI/AMReX_ParticleInSituBridge.H | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptor.H b/Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptor.H index 054291f919a..14499f606a1 100644 --- a/Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptor.H +++ b/Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptor.H @@ -27,7 +27,7 @@ public: AmrMesh *mesh, const std::vector*> &mesh_states, const std::vector> &mesh_names, - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & rStructs = {}, const std::map & iStructs = {}, const std::map> & rArrays = {}, diff --git a/Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptorI.H b/Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptorI.H index 6841e703a65..aaf795f790f 100644 --- a/Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptorI.H +++ b/Src/Extern/SENSEI/AMReX_AmrMeshParticleDataAdaptorI.H @@ -18,7 +18,7 @@ int AmrMeshParticleDataAdaptor::SetDataSour AmrMesh *mesh, const std::vector*> &mesh_states, const std::vector> &mesh_names, - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & rStructs, const std::map & iStructs, const std::map> & rArrays, diff --git a/Src/Extern/SENSEI/AMReX_AmrMeshParticleInSituBridge.H b/Src/Extern/SENSEI/AMReX_AmrMeshParticleInSituBridge.H index d1288077e00..0a85cb7efa9 100644 --- a/Src/Extern/SENSEI/AMReX_AmrMeshParticleInSituBridge.H +++ b/Src/Extern/SENSEI/AMReX_AmrMeshParticleInSituBridge.H @@ -39,7 +39,7 @@ public: amrex::AmrMesh *mesh, const std::vector*> &mesh_states, const std::vector> &mesh_names, - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & particles_rStructs = {}, const std::map & particles_iStructs = {}, const std::map> & particles_rArrays = {}, @@ -52,7 +52,7 @@ int AmrMeshParticleInSituBridge::update( amrex::AmrMesh *mesh, const std::vector*> &mesh_states, const std::vector> &mesh_names, - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & particles_rStructs, const std::map & particles_iStructs, const std::map> & particles_rArrays, diff --git a/Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptor.H b/Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptor.H index d9512a56b06..b54326fb5b3 100644 --- a/Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptor.H +++ b/Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptor.H @@ -25,7 +25,7 @@ public: int SetDataSource( Amr *amr, - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & rStructs = {}, const std::map & iStructs = {}, const std::map> & rArrays = {}, diff --git a/Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptorI.H b/Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptorI.H index 8cd050d01b7..1a01b0972f1 100644 --- a/Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptorI.H +++ b/Src/Extern/SENSEI/AMReX_AmrParticleDataAdaptorI.H @@ -16,7 +16,7 @@ AmrParticleDataAdaptor::New() template int AmrParticleDataAdaptor::SetDataSource( Amr *amr, - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & rStructs, const std::map & iStructs, const std::map> & rArrays, diff --git a/Src/Extern/SENSEI/AMReX_AmrParticleInSituBridge.H b/Src/Extern/SENSEI/AMReX_AmrParticleInSituBridge.H index 4924a5bf8cf..a4d41b677ea 100644 --- a/Src/Extern/SENSEI/AMReX_AmrParticleInSituBridge.H +++ b/Src/Extern/SENSEI/AMReX_AmrParticleInSituBridge.H @@ -32,7 +32,7 @@ public: */ template int update(amrex::Amr *amr, - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & particles_rStructs = {}, const std::map & particles_iStructs = {}, const std::map> & particles_rArrays = {}, @@ -42,7 +42,7 @@ public: template int AmrParticleInSituBridge::update( amrex::Amr *amr, - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & particles_rStructs, const std::map & particles_iStructs, const std::map> & particles_rArrays, diff --git a/Src/Extern/SENSEI/AMReX_ParticleDataAdaptor.H b/Src/Extern/SENSEI/AMReX_ParticleDataAdaptor.H index cfa4bba5b29..173d58148a5 100644 --- a/Src/Extern/SENSEI/AMReX_ParticleDataAdaptor.H +++ b/Src/Extern/SENSEI/AMReX_ParticleDataAdaptor.H @@ -25,7 +25,7 @@ public: // set the source of the simulation data int SetDataSource( - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & rStructs = {}, const std::map & iStructs = {}, const std::map> & rArrays = {}, @@ -86,7 +86,7 @@ private: const std::string m_particlesName = "particles"; - amrex::ParticleContainer* m_particles; + amrex::ParticleContainer_impl* m_particles; using RealDataMapType = std::map>; using IntDataMapType = std::map; diff --git a/Src/Extern/SENSEI/AMReX_ParticleDataAdaptorI.H b/Src/Extern/SENSEI/AMReX_ParticleDataAdaptorI.H index 9a8ac0830ab..f8aff29633e 100644 --- a/Src/Extern/SENSEI/AMReX_ParticleDataAdaptorI.H +++ b/Src/Extern/SENSEI/AMReX_ParticleDataAdaptorI.H @@ -31,7 +31,7 @@ ParticleDataAdaptor::New() //----------------------------------------------------------------------------- template int ParticleDataAdaptor::SetDataSource( - amrex::ParticleContainer * particles, + amrex::ParticleContainer_impl * particles, const std::map> & rStructs, const std::map & iStructs, const std::map> & rArrays, diff --git a/Src/Extern/SENSEI/AMReX_ParticleInSituBridge.H b/Src/Extern/SENSEI/AMReX_ParticleInSituBridge.H index 22daa10dbac..0b3e68810fc 100644 --- a/Src/Extern/SENSEI/AMReX_ParticleInSituBridge.H +++ b/Src/Extern/SENSEI/AMReX_ParticleInSituBridge.H @@ -32,7 +32,7 @@ public: int update( const double time, const int time_step, - amrex::ParticleContainer *particles, + amrex::ParticleContainer_impl *particles, const std::map> & particles_rStructs = {}, const std::map & particles_iStructs = {}, const std::map> & particles_rArrays = {}, @@ -43,7 +43,7 @@ template int ParticleInSituBridge::update( const double time, const int time_step, - amrex::ParticleContainer *particles, + amrex::ParticleContainer_impl *particles, const std::map> & particles_rStructs, const std::map & particles_iStructs, const std::map> & particles_rArrays,