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/Particles/WarpXParticleContainer.cpp | |
| 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/Particles/WarpXParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/WarpXParticleContainer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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(), |