diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-09-12 13:22:31 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-09-12 13:22:31 -0700 |
| commit | ffe29b742a5c9b3c898cd05ca2cd668f91a5bfaf (patch) | |
| tree | 848dedbb7ee01d213959ef4ecb65ff49f990eb8a /Source/Particles/PhotonParticleContainer.cpp | |
| parent | 50f84adbb5d4a9ecbb004f8d19f4741aec979fe5 (diff) | |
| parent | 21726e22f087b5a66c041798fd4c412db1bcc9a8 (diff) | |
| download | WarpX-ffe29b742a5c9b3c898cd05ca2cd668f91a5bfaf.tar.gz WarpX-ffe29b742a5c9b3c898cd05ca2cd668f91a5bfaf.tar.zst WarpX-ffe29b742a5c9b3c898cd05ca2cd668f91a5bfaf.zip | |
fix merge conflicts with dev
Diffstat (limited to 'Source/Particles/PhotonParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/PhotonParticleContainer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp index 7025d658c..4d11b9bae 100644 --- a/Source/Particles/PhotonParticleContainer.cpp +++ b/Source/Particles/PhotonParticleContainer.cpp @@ -27,7 +27,6 @@ PhotonParticleContainer::PhotonParticleContainer (AmrCore* amr_core, int ispecie // where <species> is the name of your species ParmParse pp(species_name); - #ifdef WARPX_QED //IF do_qed is enabled, find out if Breit Wheeler process is enabled if(do_qed) @@ -108,7 +107,6 @@ PhotonParticleContainer::Evolve (int lev, // This does gather, push and depose. // Push and depose have been re-written for photon, // so they do not do anything. - // Currently, I guess photons do gather fields from the mesh. PhysicalParticleContainer::Evolve (lev, Ex, Ey, Ez, Bx, By, Bz, |