diff options
author | 2019-10-25 09:49:12 -0700 | |
---|---|---|
committer | 2019-10-25 09:49:12 -0700 | |
commit | 7a2fe4f3c115eeb9bfb8d48268be53111ffd40e3 (patch) | |
tree | 2a7f2b4e26783359ab965c6aa84efbe1c2e04529 /Source/Particles/PhotonParticleContainer.cpp | |
parent | 8e94555632b0282219d702938fff9fe6f9cf260f (diff) | |
parent | 398166af23cfadfbf989f73c9e973518ed7aca3c (diff) | |
download | WarpX-7a2fe4f3c115eeb9bfb8d48268be53111ffd40e3.tar.gz WarpX-7a2fe4f3c115eeb9bfb8d48268be53111ffd40e3.tar.zst WarpX-7a2fe4f3c115eeb9bfb8d48268be53111ffd40e3.zip |
fix merge conflicts with dev
Diffstat (limited to 'Source/Particles/PhotonParticleContainer.cpp')
-rw-r--r-- | Source/Particles/PhotonParticleContainer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp index 3c70a957f..cf2ffbec4 100644 --- a/Source/Particles/PhotonParticleContainer.cpp +++ b/Source/Particles/PhotonParticleContainer.cpp @@ -31,7 +31,7 @@ PhotonParticleContainer::PhotonParticleContainer (AmrCore* amr_core, int ispecie pp.query("do_qed_breit_wheeler", do_qed_breit_wheeler); //Check for processes which do not make sense for photons - bool test_quantum_sync; + bool test_quantum_sync = false; pp.query("do_qed_quantum_sync", test_quantum_sync); AMREX_ALWAYS_ASSERT_WITH_MESSAGE( test_quantum_sync == 0, @@ -45,9 +45,8 @@ void PhotonParticleContainer::InitData() { AddParticles(0); // Note - add on level 0 - if (maxLevel() > 0) { - Redistribute(); // We then redistribute - } + Redistribute(); // We then redistribute + } void |