diff options
Diffstat (limited to 'Source/Particles/PhysicalParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index bd8c9435d..c669d976a 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -2118,8 +2118,7 @@ PhysicalParticleContainer::PushP (int lev, Real dt, const auto getPosition = GetParticlePosition(pti); - const auto getExternalE = GetExternalEField(pti); - const auto getExternalB = GetExternalBField(pti); + const auto getExternalEB = GetExternalEBField(pti); const auto& xyzmin = WarpX::GetInstance().LowerCornerWithGalilean(box,m_v_galilean,lev); @@ -2181,10 +2180,8 @@ PhysicalParticleContainer::PushP (int lev, Real dt, dx_arr, xyzmin_arr, lo, n_rz_azimuthal_modes, nox, galerkin_interpolation); } - // Externally applied E-field in Cartesian co-ordinates - getExternalE(ip, Exp, Eyp, Ezp); - // Externally applied B-field in Cartesian co-ordinates - getExternalB(ip, Bxp, Byp, Bzp); + // Externally applied E and B-field in Cartesian co-ordinates + getExternalEB(ip, Exp, Eyp, Ezp, Bxp, Byp, Bzp); if (do_crr) { amrex::Real qp = q; @@ -2467,8 +2464,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, const auto getPosition = GetParticlePosition(pti, offset); auto setPosition = SetParticlePosition(pti, offset); - const auto getExternalE = GetExternalEField(pti, offset); - const auto getExternalB = GetExternalBField(pti, offset); + const auto getExternalEB = GetExternalEBField(pti, offset); // Lower corner of tile box physical domain (take into account Galilean shift) Real cur_time = WarpX::GetInstance().gett_new(lev); @@ -2584,10 +2580,8 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, dx_arr, xyzmin_arr, lo, n_rz_azimuthal_modes, nox, galerkin_interpolation); } - // Externally applied E-field in Cartesian co-ordinates - getExternalE(ip, Exp, Eyp, Ezp); - // Externally applied B-field in Cartesian co-ordinates - getExternalB(ip, Bxp, Byp, Bzp); + // Externally applied E and B-field in Cartesian co-ordinates + getExternalEB(ip, Exp, Eyp, Ezp, Bxp, Byp, Bzp); scaleFields(xp, yp, zp, Exp, Eyp, Ezp, Bxp, Byp, Bzp); |