diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-10-28 16:19:16 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-10-28 16:19:16 -0700 |
| commit | 99823aa7fe9cd7d9ea402d551efc30e7c41c59f1 (patch) | |
| tree | cba11dc88b17f8701e06b650258c10142ca70195 /Source/Particles/RigidInjectedParticleContainer.cpp | |
| parent | 5df58955e32bbd1e2499e484ab50144ec10a9e94 (diff) | |
| parent | f326192ee5140278c6061b1171b98c6a0f932320 (diff) | |
| download | WarpX-99823aa7fe9cd7d9ea402d551efc30e7c41c59f1.tar.gz WarpX-99823aa7fe9cd7d9ea402d551efc30e7c41c59f1.tar.zst WarpX-99823aa7fe9cd7d9ea402d551efc30e7c41c59f1.zip | |
resolve merge conflicts
Diffstat (limited to 'Source/Particles/RigidInjectedParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/RigidInjectedParticleContainer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp index 535ffec6f..507206041 100644 --- a/Source/Particles/RigidInjectedParticleContainer.cpp +++ b/Source/Particles/RigidInjectedParticleContainer.cpp @@ -392,12 +392,12 @@ RigidInjectedParticleContainer::PushP (int lev, Real dt, const FArrayBox& byfab = By[pti]; const FArrayBox& bzfab = Bz[pti]; - Exp.assign(np,WarpX::E_external[0]); - Eyp.assign(np,WarpX::E_external[1]); - Ezp.assign(np,WarpX::E_external[2]); - Bxp.assign(np,WarpX::B_external[0]); - Byp.assign(np,WarpX::B_external[1]); - Bzp.assign(np,WarpX::B_external[2]); + Exp.assign(np,WarpX::E_external_particle[0]); + Eyp.assign(np,WarpX::E_external_particle[1]); + Ezp.assign(np,WarpX::E_external_particle[2]); + Bxp.assign(np,WarpX::B_external_particle[0]); + Byp.assign(np,WarpX::B_external_particle[1]); + Bzp.assign(np,WarpX::B_external_particle[2]); // // copy data from particle container to temp arrays |