diff options
Diffstat (limited to 'Source/Particles')
| -rw-r--r-- | Source/Particles/ParticleCreation/TransformParticle.H | 2 | ||||
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.H | 32 | ||||
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 20 | ||||
| -rw-r--r-- | Source/Particles/WarpXParticleContainer.cpp | 8 |
4 files changed, 46 insertions, 16 deletions
diff --git a/Source/Particles/ParticleCreation/TransformParticle.H b/Source/Particles/ParticleCreation/TransformParticle.H index 1b71df723..c0158db78 100644 --- a/Source/Particles/ParticleCreation/TransformParticle.H +++ b/Source/Particles/ParticleCreation/TransformParticle.H @@ -21,7 +21,7 @@ void transformSourceParticle( /** * \brief small modifications on product particle * \param i index of particle - * \param particle particle struct + * \param v_particle pointer to vector of particles */ template < ElementaryProcessType ProcessT > AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE diff --git a/Source/Particles/PhysicalParticleContainer.H b/Source/Particles/PhysicalParticleContainer.H index e70b470b8..1cd4ba621 100644 --- a/Source/Particles/PhysicalParticleContainer.H +++ b/Source/Particles/PhysicalParticleContainer.H @@ -163,13 +163,39 @@ public: * \brief Apply NCI Godfrey filter to all components of E and B before gather * \param lev MR level * \param box box onto which the filter is applied - * \param exeli safeguard to avoid destructing arrays between ParIter iterations on GPU + * \param exeli safeguard Elixir object (to avoid de-allocating too early + --between ParIter iterations-- on GPU) for field Ex + * \param eyeli safeguard Elixir object (to avoid de-allocating too early + --between ParIter iterations-- on GPU) for field Ey + * \param ezeli safeguard Elixir object (to avoid de-allocating too early + --between ParIter iterations-- on GPU) for field Ez + * \param bxeli safeguard Elixir object (to avoid de-allocating too early + --between ParIter iterations-- on GPU) for field Bx + * \param byeli safeguard Elixir object (to avoid de-allocating too early + --between ParIter iterations-- on GPU) for field By + * \param bzeli safeguard Elixir object (to avoid de-allocating too early + --between ParIter iterations-- on GPU) for field Bz * \param filtered_Ex Array containing filtered value + * \param filtered_Ey Array containing filtered value + * \param filtered_Ez Array containing filtered value + * \param filtered_Bx Array containing filtered value + * \param filtered_By Array containing filtered value + * \param filtered_Bz Array containing filtered value * \param Ex Field array before filtering (not modified) - * \param ex_ptr pointer to the array used for field gather. + * \param Ey Field array before filtering (not modified) + * \param Ez Field array before filtering (not modified) + * \param Bx Field array before filtering (not modified) + * \param By Field array before filtering (not modified) + * \param Bz Field array before filtering (not modified) + * \param exfab pointer to the Ex field (modified) + * \param eyfab pointer to the Ey field (modified) + * \param ezfab pointer to the Ez field (modified) + * \param bxfab pointer to the Bx field (modified) + * \param byfab pointer to the By field (modified) + * \param bzfab pointer to the Bz field (modified) * * The NCI Godfrey filter is applied on Ex, the result is stored in filtered_Ex - * and the pointer is modified (before this function is called, it points to Ex + * and the pointer exfab is modified (before this function is called, it points to Ex * and after this function is called, it points to Ex_filtered) */ void applyNCIFilter ( diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index c77ddf83b..d5c08074a 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -963,8 +963,12 @@ PhysicalParticleContainer::EvolveES (const Vector<std::array<std::unique_ptr<Mul void PhysicalParticleContainer::FieldGather (int lev, - const MultiFab& Ex, const MultiFab& Ey, const MultiFab& Ez, - const MultiFab& Bx, const MultiFab& By, const MultiFab& Bz) + const amrex::MultiFab& Ex, + const amrex::MultiFab& Ey, + const amrex::MultiFab& Ez, + const amrex::MultiFab& Bx, + const amrex::MultiFab& By, + const amrex::MultiFab& Bz) { const std::array<Real,3>& dx = WarpX::CellSize(lev); @@ -2148,12 +2152,12 @@ PhysicalParticleContainer::FieldGather (WarpXParIter& pti, RealVector& Bxp, RealVector& Byp, RealVector& Bzp, - FArrayBox const * exfab, - FArrayBox const * eyfab, - FArrayBox const * ezfab, - FArrayBox const * bxfab, - FArrayBox const * byfab, - FArrayBox const * bzfab, + amrex::FArrayBox const * exfab, + amrex::FArrayBox const * eyfab, + amrex::FArrayBox const * ezfab, + amrex::FArrayBox const * bxfab, + amrex::FArrayBox const * byfab, + amrex::FArrayBox const * bzfab, const int ngE, const int e_is_nodal, const long offset, const long np_to_gather, diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp index 8926301b2..e6c6d31bd 100644 --- a/Source/Particles/WarpXParticleContainer.cpp +++ b/Source/Particles/WarpXParticleContainer.cpp @@ -420,7 +420,7 @@ WarpXParticleContainer::DepositCurrent(WarpXParIter& pti, void WarpXParticleContainer::DepositCharge (WarpXParIter& pti, RealVector& wp, const int * const ion_lev, - MultiFab* rho, int icomp, + amrex::MultiFab* rho, int icomp, const long offset, const long np_to_depose, int thread_num, int lev, int depos_lev) { @@ -507,7 +507,7 @@ WarpXParticleContainer::DepositCharge (WarpXParIter& pti, RealVector& wp, } void -WarpXParticleContainer::DepositCharge (Vector<std::unique_ptr<MultiFab> >& rho, +WarpXParticleContainer::DepositCharge (amrex::Vector<std::unique_ptr<amrex::MultiFab> >& rho, bool local, bool reset, bool do_rz_volume_scaling) { @@ -760,7 +760,7 @@ WarpXParticleContainer::PushXES (Real dt) } void -WarpXParticleContainer::PushX (Real dt) +WarpXParticleContainer::PushX (amrex::Real dt) { const int nLevels = finestLevel(); for (int lev = 0; lev <= nLevels; ++lev) { @@ -769,7 +769,7 @@ WarpXParticleContainer::PushX (Real dt) } void -WarpXParticleContainer::PushX (int lev, Real dt) +WarpXParticleContainer::PushX (int lev, amrex::Real dt) { BL_PROFILE("WPC::PushX()"); |