aboutsummaryrefslogtreecommitdiff
path: root/Source/Particles/PhotonParticleContainer.cpp
diff options
context:
space:
mode:
authorGravatar Luca Fedeli <luca.fedeli@cea.fr> 2019-10-30 16:27:36 +0100
committerGravatar Luca Fedeli <luca.fedeli@cea.fr> 2019-10-30 16:27:36 +0100
commit3203812de1db4c191eeb246cd92aec25fcef9864 (patch)
tree815b26bd8c934a9c447185c3231e39160c8bf6a8 /Source/Particles/PhotonParticleContainer.cpp
parentdbf66f45b23f2e93dfcba09792ee0339e4a9cc55 (diff)
parentf19c45608a62dfd4cd196d402ddab49bc4df06ee (diff)
downloadWarpX-3203812de1db4c191eeb246cd92aec25fcef9864.tar.gz
WarpX-3203812de1db4c191eeb246cd92aec25fcef9864.tar.zst
WarpX-3203812de1db4c191eeb246cd92aec25fcef9864.zip
fixed merge conflict
Diffstat (limited to 'Source/Particles/PhotonParticleContainer.cpp')
-rw-r--r--Source/Particles/PhotonParticleContainer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp
index 30d010e6b..eb0dfb373 100644
--- a/Source/Particles/PhotonParticleContainer.cpp
+++ b/Source/Particles/PhotonParticleContainer.cpp
@@ -26,9 +26,9 @@ PhotonParticleContainer::PhotonParticleContainer (AmrCore* amr_core, int ispecie
ParmParse pp(species_name);
#ifdef WARPX_QED
- //IF do_qed is enabled, find out if Breit Wheeler process is enabled
- if(do_qed)
- pp.query("do_qed_breit_wheeler", do_qed_breit_wheeler);
+ //IF m_do_qed is enabled, find out if Breit Wheeler process is enabled
+ if(m_do_qed)
+ pp.query("do_qed_breit_wheeler", m_do_qed_breit_wheeler);
//Check for processes which do not make sense for photons
bool test_quantum_sync = false;