Changeset b2154a3 for src

Timestamp:

Apr 25, 2012, 7:31:43 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

4571da

Parents:

3bd250

Message:

vmg: Improved performance of potential interpolation.

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

File:

• src/interface/interface_particles.cpp (modified) (3 diffs)

src/interface/interface_particles.cpp

@@ -151 +151 @@
 
   /*
-   * Do potential back-interpolation
-   */
-  std::list<Particle::Particle>::iterator p_iter;
-  for (p_iter=particles.begin(); p_iter!=particles.end(); ++p_iter) {
-
-    const Index global_index = (p_iter->Pos() - particle_grid.Extent().Begin()) / particle_grid.Extent().MeshWidth();
-    const Index local_index = global_index - particle_grid.Global().LocalBegin() + particle_grid.Local().Begin();
-
-    ip.ComputeCoefficients(particle_grid, local_index);
-
-    // Interpolate long range part of potential minus self-interaction
-    p_iter->Pot() = ip.Evaluate(p_iter->Pos()) - p_iter->Charge() * spl.GetAntiDerivativeAtZero();
-    p_iter->Field() = ip.EvaluateGradient(p_iter->Pos());
-
-#ifdef DEBUG_OUTPUT
-    // TODO The scaling with 1/2 may not be correct. Check that.
-    e_long += 0.5 * p_iter->Charge() * Helper::InterpolateTrilinear(p_iter->Pos(), particle_grid);
-    e_self += 0.5 * p_iter->Charge() * p_iter->Charge() * spl.GetAntiDerivativeAtZero();
-#endif
-
-  }
-
-  /*
-   * Compute near field correction
+   * Compute potentials
    */
   Particle::LinkedCellList lc(particles, near_field_cells, grid);
@@ -183 +160 @@
 
   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)
+
+    for (p1=lc_1.begin(); p1!=lc_1.end(); ++p1) {
+
+      (*p1)->Pot() = ip.Evaluate((*p1)->Pos()) - (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
+
+#ifdef DEBUG_OUTPUT
+    // TODO The scaling with 1/2 may not be correct. Check that.
+      e_long += 0.5 * (*p1)->Charge() * Helper::InterpolateTrilinear((*p1)->Pos(), particle_grid);
+      e_self += 0.5 * (*p1)->Charge() * (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
+#endif
+
       for (index.X()=-1*near_field_cells-1; index.X()<=near_field_cells+1; ++index.X())
         for (index.Y()=-1*near_field_cells-1; index.Y()<=near_field_cells+1; ++index.Y())
@@ -207 +197 @@
               }
           }
+    }
   }