aboutsummaryrefslogtreecommitdiff
path: root/Source/Particles/WarpXParticleContainer.H
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Particles/WarpXParticleContainer.H')
-rw-r--r--Source/Particles/WarpXParticleContainer.H17
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H
index 662b2e1b8..ac5b47ada 100644
--- a/Source/Particles/WarpXParticleContainer.H
+++ b/Source/Particles/WarpXParticleContainer.H
@@ -13,7 +13,7 @@ struct PIdx
enum { // Particle Attributes stored in amrex::ParticleContainer's struct of array
w = 0, // weight
ux, uy, uz, Ex, Ey, Ez, Bx, By, Bz,
-#ifdef WARPX_RZ
+#ifdef WARPX_DIM_RZ
theta, // RZ needs all three position components
#endif
nattribs
@@ -104,8 +104,9 @@ public:
const amrex::Vector<std::unique_ptr<amrex::FabArray<amrex::BaseFab<int> > > >& masks) {}
virtual void FieldGather (int lev,
- 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 amrex::MultiFab& Ex, const amrex::MultiFab& Ey,
+ const amrex::MultiFab& Ez, const amrex::MultiFab& Bx,
+ const amrex::MultiFab& By, const amrex::MultiFab& Bz) {}
#ifdef WARPX_DO_ELECTROSTATIC
virtual void EvolveES (const amrex::Vector<std::array<std::unique_ptr<amrex::MultiFab>, 3> >& E,
@@ -166,13 +167,13 @@ public:
virtual void DepositCharge(WarpXParIter& pti,
RealVector& wp,
- amrex::MultiFab* rhomf,
- amrex::MultiFab* crhomf,
+ amrex::MultiFab* rho,
int icomp,
- const long np_current,
- const long np,
+ const long offset,
+ const long np_to_depose,
int thread_num,
- int lev );
+ int lev,
+ int depos_lev);
virtual void DepositCurrent(WarpXParIter& pti,
RealVector& wp,