diff options
| author |  Luca Fedeli <luca.fedeli@cea.fr>
| 2021-03-05 02:36:26 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-03-04 17:36:26 -0800 |
| commit | cf1021dc475f55daa8b2ccd7e636c030e2ce08fe (patch) | |
| tree | 04f8866a1b9d4b2469da782d8a58ae268c93af20 /Source/Particles/RigidInjectedParticleContainer.cpp | |
| parent | 91f8927750a9c12ffd21493a97cdf9debd21ad33 (diff) | |
| download | WarpX-cf1021dc475f55daa8b2ccd7e636c030e2ce08fe.tar.gz WarpX-cf1021dc475f55daa8b2ccd7e636c030e2ce08fe.tar.zst WarpX-cf1021dc475f55daa8b2ccd7e636c030e2ce08fe.zip | |
RigidInjectedParticleContainer: clean duplicated code (#1752)
* avoid code duplication and implicit conversion from int* to bool
* elimitate != nullptr
Diffstat (limited to 'Source/Particles/RigidInjectedParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/RigidInjectedParticleContainer.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp index 00e67b5c2..71bddabdd 100644 --- a/Source/Particles/RigidInjectedParticleContainer.cpp +++ b/Source/Particles/RigidInjectedParticleContainer.cpp @@ -487,27 +487,22 @@ RigidInjectedParticleContainer::PushP (int lev, Real dt, getExternalE(ip, Exp, Eyp, Ezp); getExternalB(ip, Bxp, Byp, Bzp); + amrex::Real qp = q; + if (ion_lev) { qp *= ion_lev[ip]; } + if (do_crr) { - amrex::Real qp = q; - if (ion_lev) { qp *= ion_lev[ip]; } UpdateMomentumBorisWithRadiationReaction(uxpp[ip], uypp[ip], uzpp[ip], Exp, Eyp, Ezp, Bxp, Byp, Bzp, qp, m, dt); } else if (pusher_algo == ParticlePusherAlgo::Boris) { - amrex::Real qp = q; - if (ion_lev) { qp *= ion_lev[ip]; } UpdateMomentumBoris( uxpp[ip], uypp[ip], uzpp[ip], Exp, Eyp, Ezp, Bxp, Byp, Bzp, qp, m, dt); } else if (pusher_algo == ParticlePusherAlgo::Vay) { - amrex::Real qp = q; - if (ion_lev){ qp *= ion_lev[ip]; } UpdateMomentumVay( uxpp[ip], uypp[ip], uzpp[ip], Exp, Eyp, Ezp, Bxp, Byp, Bzp, qp, m, dt); } else if (pusher_algo == ParticlePusherAlgo::HigueraCary) { - amrex::Real qp = q; - if (ion_lev){ qp *= ion_lev[ip]; } UpdateMomentumHigueraCary( uxpp[ip], uypp[ip], uzpp[ip], Exp, Eyp, Ezp, Bxp, Byp, Bzp, qp, m, dt); |