Revert "also use atomics in the particle_dx != dx case (AMReX-Codes#1356

)" This reverts commit 81e030b.
ECP-Astro · Sep 28, 2020 · 73867ce · 73867ce
1 parent 3481118
commit 73867ce
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/Src/Particle/AMReX_Particle_mod_K.H b/Src/Particle/AMReX_Particle_mod_K.H
@@ -125,7 +125,7 @@ void amrex_deposit_particle_dx_cic (P const& p, int nc, amrex::Array4<amrex::Rea
         if (i < rho.begin.x || i >= rho.end.x) continue;
         amrex::Real wx = amrex::min(hx - i, amrex::Real(1.0)) - amrex::max(lx - i, amrex::Real(0.0));
         amrex::Real weight = wx*factor;                
-        amrex::Gpu::Atomic::Add(&rho(i, 0, 0, 0), static_cast<Real>(weight*p.rdata(0)));
+        rho(i, 0, 0, 0) += weight*p.rdata(0);                
     }
 
     for (int comp = 1; comp < nc; ++comp)
@@ -134,7 +134,7 @@ void amrex_deposit_particle_dx_cic (P const& p, int nc, amrex::Array4<amrex::Rea
             if (i < rho.begin.x || i >= rho.end.x) continue;
             amrex::Real wx = amrex::min(hx - i, amrex::Real(1.0)) - amrex::max(lx - i, amrex::Real(0.0));            
             amrex::Real weight = wx*factor;
-            amrex::Gpu::Atomic::Add(&rho(i, 0, 0, comp), static_cast<Real>(weight*p.rdata(0)*p.rdata(comp)));
+            rho(i, 0, 0, comp) += weight*p.rdata(0)*p.rdata(comp);
         }
     }
 
@@ -159,8 +159,10 @@ void amrex_deposit_particle_dx_cic (P const& p, int nc, amrex::Array4<amrex::Rea
         for (int i = lo_x; i <= hi_x; ++i) {
             if (i < rho.begin.x || i >= rho.end.x) continue;
             amrex::Real wx = amrex::min(hx - i, amrex::Real(1.0)) - amrex::max(lx - i, amrex::Real(0.0));
+
             amrex::Real weight = wx*wy*factor;
-            amrex::Gpu::Atomic::Add(&rho(i, j, 0, 0), static_cast<Real>(weight*p.rdata(0)));
+
+            rho(i, j, 0, 0) += weight*p.rdata(0);                
         }
     }
 
@@ -172,7 +174,7 @@ void amrex_deposit_particle_dx_cic (P const& p, int nc, amrex::Array4<amrex::Rea
                 if (i < rho.begin.x || i >= rho.end.x) continue;
                 amrex::Real wx = amrex::min(hx - i, amrex::Real(1.0)) - amrex::max(lx - i, amrex::Real(0.0));
                 amrex::Real weight = wx*wy*factor;
-                amrex::Gpu::Atomic::Add(&rho(i, j, 0, comp), static_cast<Real>(weight*p.rdata(0)*p.rdata(comp)));
+                rho(i, j, 0, comp) += weight*p.rdata(0)*p.rdata(comp);
             }
         }
     }
@@ -205,8 +207,10 @@ void amrex_deposit_particle_dx_cic (P const& p, int nc, amrex::Array4<amrex::Rea
             for (int i = lo_x; i <= hi_x; ++i) {
                 if (i < rho.begin.x || i >= rho.end.x) continue;
                 amrex::Real wx = amrex::min(hx - i, amrex::Real(1.0)) - amrex::max(lx - i, amrex::Real(0.0));
+
                 amrex::Real weight = wx*wy*wz*factor;
-                amrex::Gpu::Atomic::Add(&rho(i, j, k, 0), static_cast<Real>(weight*p.rdata(0)));
+
+                rho(i, j, k, 0) += weight*p.rdata(0);                
             }
         }
     }
@@ -222,7 +226,7 @@ void amrex_deposit_particle_dx_cic (P const& p, int nc, amrex::Array4<amrex::Rea
                     if (i < rho.begin.x || i >= rho.end.x) continue;
                     amrex::Real wx = amrex::min(hx - i, amrex::Real(1.0)) - amrex::max(lx - i, amrex::Real(0.0));
                     amrex::Real weight = wx*wy*wz*factor;
-                    amrex::Gpu::Atomic::Add(&rho(i, j, k, comp), static_cast<Real>(weight*p.rdata(0)*p.rdata(comp)));
+                    rho(i, j, k, comp) += weight*p.rdata(0)*p.rdata(comp);
                 }
             }
         }