More readable code in PushPX, PushXPSingleStep (BLAST-WarpX#6113)

Author: EZoni

Source/Particles/PhysicalParticleContainer.cpp

@@ -1382,47 +1382,38 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti,
 
         scaleFields(xp, yp, zp, Exp, Eyp, Ezp, Bxp, Byp, Bzp);
 
-#ifdef WARPX_QED
-        if (!do_sync)
-#endif
-        {
-            if (do_copy) {
-                //  Copy the old x and u for the BTD
-                copyAttribs(ip);
-            }
+        if (do_copy) {
+            //  Copy the old x and u for the BTD
+            copyAttribs(ip);
+        }
 
+#ifdef WARPX_QED
+        if (!do_sync) {
             doParticleMomentumPush<0>(ux[ip], uy[ip], uz[ip],
                                       Exp, Eyp, Ezp, Bxp, Byp, Bzp,
                                       ion_lev ? ion_lev[ip] : 1,
                                       m, q, pusher_algo, do_crr,
-#ifdef WARPX_QED
                                       t_chi_max,
-#endif
                                       dt);
-
-            UpdatePosition(xp, yp, zp, ux[ip], uy[ip], uz[ip], dt);
-            setPosition(ip, xp, yp, zp);
-        }
-#ifdef WARPX_QED
-        else {
+        } else {
             if constexpr (qed_control == has_qed) {
-                if (do_copy) {
-                    //  Copy the old x and u for the BTD
-                    copyAttribs(ip);
-                }
-
                 doParticleMomentumPush<1>(ux[ip], uy[ip], uz[ip],
                                           Exp, Eyp, Ezp, Bxp, Byp, Bzp,
                                           ion_lev ? ion_lev[ip] : 1,
                                           m, q, pusher_algo, do_crr,
                                           t_chi_max,
                                           dt);
-
-                UpdatePosition(xp, yp, zp, ux[ip], uy[ip], uz[ip], dt);
-                setPosition(ip, xp, yp, zp);
             }
         }
+#else
+        doParticleMomentumPush<0>(ux[ip], uy[ip], uz[ip],
+                                  Exp, Eyp, Ezp, Bxp, Byp, Bzp,
+                                  ion_lev ? ion_lev[ip] : 1,
+                                  m, q, pusher_algo, do_crr,
+                                  dt);
 #endif
+        UpdatePosition(xp, yp, zp, ux[ip], uy[ip], uz[ip], dt);
+        setPosition(ip, xp, yp, zp);
 
 #ifdef WARPX_QED
         [[maybe_unused]] auto foo_local_has_quantum_sync = local_has_quantum_sync;

Source/Particles/Pusher/ImplicitPushPX.cpp

@@ -183,20 +183,14 @@ namespace {
             uz[ip] = uzp_n;
 
 #ifdef WARPX_QED
-            if (!do_sync)
-#endif
-            {
+            if (!do_sync) {
                 doParticleMomentumPush<0>(ux[ip], uy[ip], uz[ip],
                                           Exp, Eyp, Ezp, Bxp, Byp, Bzp,
                                           ion_lev ? ion_lev[ip] : 1,
                                           m, q, pusher_algo, do_crr,
-#ifdef WARPX_QED
                                           t_chi_max,
-#endif
                                           dt);
-            }
-#ifdef WARPX_QED
-            else {
+            } else {
                 if constexpr (qed_control == has_qed) {
                     doParticleMomentumPush<1>(ux[ip], uy[ip], uz[ip],
                                               Exp, Eyp, Ezp, Bxp, Byp, Bzp,
@@ -206,6 +200,12 @@ namespace {
                                               dt);
                 }
             }
+#else
+            doParticleMomentumPush<0>(ux[ip], uy[ip], uz[ip],
+                                      Exp, Eyp, Ezp, Bxp, Byp, Bzp,
+                                      ion_lev ? ion_lev[ip] : 1,
+                                      m, q, pusher_algo, do_crr,
+                                      dt);
 #endif
 
 #ifdef WARPX_QED