diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-05-07 14:55:09 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-05-07 14:55:09 -0700 |
| commit | 704f53d270cf173bf86e06901450b8a70610af4c (patch) | |
| tree | 4266d293fe983538076a6c6fcc57db2cd0241cc3 /Source/Particles/WarpXParticleContainer.cpp | |
| parent | f9678d6a615fb151b7f70f78bafa511b03bd562d (diff) | |
| parent | 2b2286fa3221d14feed9961ddeaed70f54f7a4e8 (diff) | |
| download | WarpX-704f53d270cf173bf86e06901450b8a70610af4c.tar.gz WarpX-704f53d270cf173bf86e06901450b8a70610af4c.tar.zst WarpX-704f53d270cf173bf86e06901450b8a70610af4c.zip | |
fix conflicts
Diffstat (limited to 'Source/Particles/WarpXParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/WarpXParticleContainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp index 771e59a80..80f3882a0 100644 --- a/Source/Particles/WarpXParticleContainer.cpp +++ b/Source/Particles/WarpXParticleContainer.cpp @@ -608,7 +608,7 @@ WarpXParticleContainer::DepositCharge ( WarpXParIter& pti, RealVector& wp, const std::array<Real, 3>& xyzmin = xyzmin_tile; #ifdef AMREX_USE_GPU - data_ptr = (*rhomf)[pti].dataPtr(); + data_ptr = (*rhomf)[pti].dataPtr(icomp); auto rholen = (*rhomf)[pti].length(); #else tile_box.grow(ngRho); |