Merge pull request #4 from MaxThevenet/cleaning

Cleaning
ECP-WarpX · Jan 29, 2020 · dd34d26 · dd34d26
2 parents 7f840b0 + b591d8b
commit dd34d26
Showing 1 changed file with 31 additions and 30 deletions.
diff --git a/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp b/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp
@@ -1,4 +1,3 @@
-
 #include <cmath>
 #include <limits>
 
@@ -116,52 +115,54 @@ WarpX::Hybrid_QED_Push (int lev, PatchType patch_type, Real a_dt)
         const Box& gez = amrex::grow(tez,1);
 
         FArrayBox tmpEx_fab(gex,1);
-        //Elixir tmp_eli = tmp_fab.elixir();
+        Elixir tmp_eli = tmp_fab.elixir();
         auto const& tmpEx = tmpEx_fab.array();
 
         FArrayBox tmpEy_fab(gey,1);
-        //Elixir tmp_eli = tmp_fab.elixir();
+        Elixir tmp_eli = tmp_fab.elixir();
         auto const& tmpEy = tmpEy_fab.array();
 
         FArrayBox tmpEz_fab(gez,1);
-        //Elixir tmp_eli = tmp_fab.elixir();
+        Elixir tmp_eli = tmp_fab.elixir();
         auto const& tmpEz = tmpEz_fab.array();
 
-//        const Box& iex = gex & Ex[mfi].box();
-//        const Box& iey = gey & Ey[mfi].box();
-//        const Box& iez = gez & Ez[mfi].box();
-
-        AMREX_PARALLEL_FOR_4D (gex, 1, i, j, k, n,
-        {
-            tmpEx(i,j,k,n) = Exfab(i,j,k,n);
-        });
+        AMREX_PARALLEL_FOR_4D(
+            gex, 1, i, j, k, n,
+            { tmpEx(i,j,k,n) = Exfab(i,j,k,n); }
+        );
 
-        AMREX_PARALLEL_FOR_4D (gey, 1, i, j, k, n,
-        {
-                tmpEy(i,j,k,n) = Eyfab(i,j,k,n);
-        });
+        AMREX_PARALLEL_FOR_4D(
+            gey, 1, i, j, k, n,
+            { tmpEy(i,j,k,n) = Eyfab(i,j,k,n); }
+        );
 
-        AMREX_PARALLEL_FOR_4D (gez, 1, i, j, k, n,
-        {
-                tmpEz(i,j,k,n) = Ezfab(i,j,k,n);
-        })
+        AMREX_PARALLEL_FOR_4D(
+            gez, 1, i, j, k, n,
+            { tmpEz(i,j,k,n) = Ezfab(i,j,k,n); }
+        );
 
-        amrex::ParallelFor(tbx,
-        [=] AMREX_GPU_DEVICE (int j, int k, int l)
-        {
-            warpx_hybrid_QED_push(j,k,l, Exfab, Eyfab, Ezfab, Bxfab, Byfab, Bzfab, tmpEx, tmpEy, tmpEz, dx, dy, dz, a_dt);
-        });
+        amrex::ParallelFor(
+            tbx,
+            [=] AMREX_GPU_DEVICE (int j, int k, int l)
+            {
+                warpx_hybrid_QED_push(j,k,l, Exfab, Eyfab, Ezfab, Bxfab, Byfab,
+                                      Bzfab, tmpEx, tmpEy, tmpEz, dx, dy, dz,
+                                      a_dt);
+            }
+        );
 
         if (cost) {
             Box cbx = mfi.tilebox(IntVect{AMREX_D_DECL(0,0,0)});
             if (patch_type == PatchType::coarse) cbx.refine(rr);
             wt = (amrex::second() - wt) / cbx.d_numPts();
             auto costfab = cost->array(mfi);
-            amrex::ParallelFor(cbx,
-            [=] AMREX_GPU_DEVICE (int i, int j, int k)
-            {
-                costfab(i,j,k) += wt;
-            });
+            amrex::ParallelFor(
+                cbx,
+                [=] AMREX_GPU_DEVICE (int i, int j, int k)
+                {
+                    costfab(i,j,k) += wt;
+                }
+            );
         }
     }
 }