fixing merge conflicts

1 files changed, 18 insertions, 32 deletions

diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp
index f049fdb7c..4893b3294 100644
--- a/Source/Particles/RigidInjectedParticleContainer.cpp
+++ b/Source/Particles/RigidInjectedParticleContainer.cpp
@@ -239,15 +239,13 @@ RigidInjectedParticleContainer::PushPX(WarpXParIter& pti,
     Real* const AMREX_RESTRICT Bzp = attribs[PIdx::Bz].dataPtr();
 
     if (!done_injecting_lev) {
-        if (!(WarpX::do_boosted_frame_diagnostic && do_boosted_frame_diags)) {
-            // If the old values are not already saved, create copies here.
-            xp_save = xp;
-            yp_save = yp;
-            zp_save = zp;
-            uxp_save = uxp;
-            uyp_save = uyp;
-            uzp_save = uzp;
-        }
+        // If the old values are not already saved, create copies here.
+        xp_save = xp;
+        yp_save = yp;
+        zp_save = zp;
+        uxp_save = uxp;
+        uyp_save = uyp;
+        uzp_save = uzp;
 
         // Scale the fields of particles about to cross the injection plane.
         // This only approximates what should be happening. The particles
@@ -275,27 +273,12 @@ RigidInjectedParticleContainer::PushPX(WarpXParIter& pti,
 
     if (!done_injecting_lev) {
 
-        Real* AMREX_RESTRICT x_save;
-        Real* AMREX_RESTRICT y_save;
-        Real* AMREX_RESTRICT z_save;
-        Real* AMREX_RESTRICT ux_save;
-        Real* AMREX_RESTRICT uy_save;
-        Real* AMREX_RESTRICT uz_save;
-        if (!(WarpX::do_boosted_frame_diagnostic && do_boosted_frame_diags)) {
-            x_save = xp_save.dataPtr();
-            y_save = yp_save.dataPtr();
-            z_save = zp_save.dataPtr();
-            ux_save = uxp_save.dataPtr();
-            uy_save = uyp_save.dataPtr();
-            uz_save = uzp_save.dataPtr();
-        } else {
-            x_save = pti.GetAttribs(particle_comps["xold"]).dataPtr();
-            y_save = pti.GetAttribs(particle_comps["yold"]).dataPtr();
-            z_save = pti.GetAttribs(particle_comps["zold"]).dataPtr();
-            ux_save = pti.GetAttribs(particle_comps["uxold"]).dataPtr();
-            uy_save = pti.GetAttribs(particle_comps["uyold"]).dataPtr();
-            uz_save = pti.GetAttribs(particle_comps["uzold"]).dataPtr();
-        }
+        Real* AMREX_RESTRICT x_save = xp_save.dataPtr();
+        Real* AMREX_RESTRICT y_save = yp_save.dataPtr();
+        Real* AMREX_RESTRICT z_save = zp_save.dataPtr();
+        Real* AMREX_RESTRICT ux_save = uxp_save.dataPtr();
+        Real* AMREX_RESTRICT uy_save = uyp_save.dataPtr();
+        Real* AMREX_RESTRICT uz_save = uzp_save.dataPtr();
 
         // Undo the push for particles not injected yet.
         // The zp are advanced a fixed amount.
@@ -347,7 +330,9 @@ RigidInjectedParticleContainer::Evolve (int lev,
     // particles have crossed the inject plane.
     const Real* plo = Geom(lev).ProbLo();
     const Real* phi = Geom(lev).ProbHi();
-    done_injecting[lev] = (zinject_plane_levels[lev] < plo[2] || zinject_plane_levels[lev] > phi[2]);
+    const int zdir = AMREX_SPACEDIM-1;
+    done_injecting[lev] = ((zinject_plane_levels[lev] < plo[zdir] && WarpX::moving_window_v + WarpX::beta_boost*PhysConst::c >= 0.) ||
+                           (zinject_plane_levels[lev] > phi[zdir] && WarpX::moving_window_v + WarpX::beta_boost*PhysConst::c <= 0.));
     done_injecting_lev = done_injecting[lev];
 
     PhysicalParticleContainer::Evolve (lev,
@@ -424,7 +409,8 @@ RigidInjectedParticleContainer::PushP (int lev, Real dt,
             int e_is_nodal = Ex.is_nodal() and Ey.is_nodal() and Ez.is_nodal();
             FieldGather(pti, Exp, Eyp, Ezp, Bxp, Byp, Bzp,
                         &exfab, &eyfab, &ezfab, &bxfab, &byfab, &bzfab,
-                        Ex.nGrow(), e_is_nodal, 0, np, thread_num, lev, lev);
+                        Ex.nGrow(), e_is_nodal,
+                        0, np, thread_num, lev, lev);
 
             // Save the position and momenta, making copies
             auto uxp_save = uxp;