diff options
author | 2019-10-29 10:38:54 +0100 | |
---|---|---|
committer | 2019-10-29 10:38:54 +0100 | |
commit | 880ae78922d3b55e046064b5efaca25d0a654b69 (patch) | |
tree | fb89572f76ff931ac107d9585c2a610cbab02b23 /Source/Particles/PhotonParticleContainer.cpp | |
parent | 9f74a221eca6db8747f68b6e33f3d8b164566985 (diff) | |
download | WarpX-880ae78922d3b55e046064b5efaca25d0a654b69.tar.gz WarpX-880ae78922d3b55e046064b5efaca25d0a654b69.tar.zst WarpX-880ae78922d3b55e046064b5efaca25d0a654b69.zip |
fixed conflict due to merging
Diffstat (limited to 'Source/Particles/PhotonParticleContainer.cpp')
-rw-r--r-- | Source/Particles/PhotonParticleContainer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp index b33383b76..9197be6e3 100644 --- a/Source/Particles/PhotonParticleContainer.cpp +++ b/Source/Particles/PhotonParticleContainer.cpp @@ -181,13 +181,13 @@ PhotonParticleContainer::DoBreitWheeler(int lev, 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]); + 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[0]); - Byp.assign(np,WarpX::B_external[1]); - Bzp.assign(np,WarpX::B_external[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 |