Changeset 4e8206 for src/interface

Timestamp:

May 2, 2012, 1:36:56 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

f003a9

Parents:

49f8653

Message:

Improved serial performance.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1783 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/interface/interface_particles.cpp (modified) (1 diff)

src/interface/interface_particles.cpp

@@ -149 +149 @@
   comm.CommLCListToGhosts(lc);
 
-  for (iter=lc.Iterators().Local().Begin(); iter!=lc.Iterators().Local().End(); ++iter) {
-
-    ip.ComputeCoefficients(particle_grid, *iter - lc.Local().Begin() + particle_grid.Local().Begin());
-
-    std::list<Particle::Particle*>& lc_1 = lc(*iter);
-
-    for (p1=lc_1.begin(); p1!=lc_1.end(); ++p1) {
-
-      ip.Evaluate((*p1)->Pos(), (*p1)->Pot(), (*p1)->Field());
-      (*p1)->Pot() -= (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
-
-#ifdef DEBUG_OUTPUT
-      e_long += 0.5 * (*p1)->Charge() * ip.Evaluate((*p1)->Pos());
-      e_self += 0.5 * (*p1)->Charge() * (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
-#endif
-
-      for (i.X()=-1*near_field_cells; i.X()<=near_field_cells; ++i.X())
-        for (i.Y()=-1*near_field_cells; i.Y()<=near_field_cells; ++i.Y())
-          for (i.Z()=-1*near_field_cells; i.Z()<=near_field_cells; ++i.Z()) {
-
-            std::list<Particle::Particle*>& lc_2 = lc(*iter+i);
-
-            for (p2=lc_2.begin(); p2!=lc_2.end(); ++p2)
-              if (*p1 != *p2) {
-
-                const Vector dir = (*p1)->Pos() - (*p2)->Pos();
-                const vmg_float length = dir.Length();
-
-                if (length < r_cut) {
-
-                  (*p1)->Pot() += (*p2)->Charge() / length * (1.0 + spl.EvaluatePotential(length));
-                  (*p1)->Field() += (*p2)->Charge() * dir * spl.EvaluateField(length);
-
-#ifdef DEBUG_OUTPUT
-                  e_short_peak += 0.5 * (*p1)->Charge() * (*p2)->Charge() / length;
-                  e_short_spline += 0.5 * (*p1)->Charge() * (*p2)->Charge() / length * spl.EvaluatePotential(length);
-#endif
-                }
-              }
-          }
-    }
-  }
+  for (int i=lc.Local().Begin().X(); i<lc.Local().End().X(); ++i)
+    for (int j=lc.Local().Begin().Y(); j<lc.Local().End().Y(); ++j)
+      for (int k=lc.Local().Begin().Z(); k<lc.Local().End().Z(); ++k) {
+
+        if (lc(i,j,k).size() > 0)
+          ip.ComputeCoefficients(particle_grid, Index(i,j,k) - lc.Local().Begin() + particle_grid.Local().Begin());
+
+        for (p1=lc(i,j,k).begin(); p1!=lc(i,j,k).end(); ++p1) {
+
+          ip.Evaluate((*p1)->Pos(), (*p1)->Pot(), (*p1)->Field());
+          (*p1)->Pot() -= (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
+
+#ifdef DEBUG_OUTPUT
+          e_long += 0.5 * (*p1)->Charge() * ip.Evaluate((*p1)->Pos());
+          e_self += 0.5 * (*p1)->Charge() * (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
+#endif
+
+          for (int dx=-1*near_field_cells; dx<=near_field_cells; ++dx)
+            for (int dy=-1*near_field_cells; dy<=near_field_cells; ++dy)
+              for (int dz=-1*near_field_cells; dz<=near_field_cells; ++dz) {
+
+                for (p2=lc(i+dx,j+dy,k+dz).begin(); p2!=lc(i+dx,j+dy,k+dz).end(); ++p2)
+
+                  if (*p1 != *p2) {
+
+                    const Vector dir = (*p1)->Pos() - (*p2)->Pos();
+                    const vmg_float length = dir.Length();
+
+                    if (length < r_cut) {
+
+                      (*p1)->Pot() += (*p2)->Charge() / length * (1.0 + spl.EvaluatePotential(length));
+                      (*p1)->Field() += (*p2)->Charge() * dir * spl.EvaluateField(length);
+
+#ifdef DEBUG_OUTPUT
+                      e_short_peak += 0.5 * (*p1)->Charge() * (*p2)->Charge() / length;
+                      e_short_spline += 0.5 * (*p1)->Charge() * (*p2)->Charge() / length * spl.EvaluatePotential(length);
+#endif
+                    }
+                  }
+              }
+        }
+      }
 
   comm.CommParticlesBack(particles);