diff options
| author |  lucafedeli88 <luca.fedeli@cea.fr>
| 2019-10-11 19:14:03 -0500 |
|---|---|---|
| committer | lucafedeli88 <luca.fedeli@cea.fr>
| 2019-10-11 19:14:03 -0500 |
| commit | 3e3670639e3f57cdc9f1a43a6c69d7e8308f100d (patch) | |
| tree | 07105e9e871dad770971c69df527122a6fa06636 /Source/Particles/PhysicalParticleContainer.cpp | |
| parent | 78e21013ae3c36d5bf83dadb07f7187a93ddd1b4 (diff) | |
| download | WarpX-3e3670639e3f57cdc9f1a43a6c69d7e8308f100d.tar.gz WarpX-3e3670639e3f57cdc9f1a43a6c69d7e8308f100d.tar.zst WarpX-3e3670639e3f57cdc9f1a43a6c69d7e8308f100d.zip | |
Removed merge conflict from file
Diffstat (limited to 'Source/Particles/PhysicalParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index 7f6b2daa9..c3ea3b763 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -2205,14 +2205,13 @@ PhysicalParticleContainer::buildIonizationMask (const amrex::MFIter& mfi, const ); } -<<<<<<< HEAD //This function return true if the PhysicalParticleContainer contains electrons //or positrons, false otherwise bool PhysicalParticleContainer::AmIALepton(){ return (this-> mass == PhysConst::m_e); } -======= + #ifdef WARPX_QED bool PhysicalParticleContainer::has_quantum_sync() @@ -2239,4 +2238,3 @@ set_quantum_sync_engine_ptr(std::shared_ptr<QuantumSynchrotronEngine> ptr) shr_ptr_qs_engine = ptr; } #endif ->>>>>>> upstream/dev |