diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-07-07 11:32:51 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-07-07 11:32:51 -0700 |
| commit | c8a3273f500e93d87c89a023a88e756e29cdbcc8 (patch) | |
| tree | 8b443ccfd4b3ddfadd7fb2debf559baca66904ae /Source | |
| parent | 1ce5957cb32a3b7ae39ad68b528e5a370854c58f (diff) | |
| parent | a9dde5192caae19bc4198b4ae404c7015c104cf5 (diff) | |
| download | WarpX-c8a3273f500e93d87c89a023a88e756e29cdbcc8.tar.gz WarpX-c8a3273f500e93d87c89a023a88e756e29cdbcc8.tar.zst WarpX-c8a3273f500e93d87c89a023a88e756e29cdbcc8.zip | |
fix merge conflicts. start from merged CD
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Particles/WarpXParticleContainer.H | 50 | ||||
| -rw-r--r-- | Source/Particles/WarpXParticleContainer.cpp | 1 |
2 files changed, 25 insertions, 26 deletions
diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H index ce17ee87b..3098e9296 100644 --- a/Source/Particles/WarpXParticleContainer.H +++ b/Source/Particles/WarpXParticleContainer.H @@ -164,31 +164,31 @@ public: bool local = false); std::unique_ptr<amrex::MultiFab> GetChargeDensity(int lev, bool local = false); - virtual void DepositCharge(WarpXParIter& pti, - RealVector& wp, - amrex::MultiFab* rhomf, - amrex::MultiFab* crhomf, - int icomp, - const long np_current, - const long np, - int thread_num, - int lev ); - -virtual void DepositCurrent(WarpXParIter& pti, - RealVector& wp, - RealVector& uxp, - RealVector& uyp, - RealVector& uzp, - amrex::MultiFab* jx, - amrex::MultiFab* jy, - amrex::MultiFab* jz, - const long offset, - const long np_to_depose, - int thread_num, - int lev, - int depos_lev, - amrex::Real dt, - const long ngJ); + virtual void DepositCharge(WarpXParIter& pti, + RealVector& wp, + amrex::MultiFab* rhomf, + amrex::MultiFab* crhomf, + int icomp, + const long np_current, + const long np, + int thread_num, + int lev ); + + virtual void DepositCurrent(WarpXParIter& pti, + RealVector& wp, + RealVector& uxp, + RealVector& uyp, + RealVector& uzp, + amrex::MultiFab* jx, + amrex::MultiFab* jy, + amrex::MultiFab* jz, + const long offset, + const long np_to_depose, + int thread_num, + int lev, + int depos_lev, + amrex::Real dt, + const long ngJ); // If particles start outside of the domain, ContinuousInjection // makes sure that they are initialized when they enter the domain, and diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp index eb03059f6..95e692c28 100644 --- a/Source/Particles/WarpXParticleContainer.cpp +++ b/Source/Particles/WarpXParticleContainer.cpp @@ -389,7 +389,6 @@ WarpXParticleContainer::DepositCurrent(WarpXParIter& pti, &dt, &dx[0], &dx[1], &dx[2], &WarpX::nox,&WarpX::noy,&WarpX::noz, &j_is_nodal, &lvect,&WarpX::current_deposition_algo); - #ifdef WARPX_RZ warpx_current_deposition_rz_volume_scaling( jx_ptr, &ngJ, jxntot.getVect(), |