Changeset 39a6d9 for src/samples/bspline.hpp

Timestamp:

Apr 29, 2012, 11:37:31 AM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

51e793

Parents:

1a92cf

Message:

vmg: Improved serial performance.

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

File:

• src/samples/bspline.hpp (modified) (1 diff)

src/samples/bspline.hpp

@@ -40 +40 @@
     assert(p.Pos().Z() >= grid.Extent().Begin().Z() && p.Pos().Z() < grid.Extent().End().Z());
 
-    Index i, index_global, index_local;
-    vmg_float temp_val, length;
-    std::vector<vmg_float> vals;
-    std::vector<vmg_float>::const_iterator iter;
+    vmg_float vals[Helper::intpow(2*near_field_cells+1,3)];
+    vmg_float temp_val;
+    vmg_float int_val = 0.0;
+    int c = 0;
 
-    vmg_float int_val = 0.0;
+    Index i;
+    Vector dir;
 
-    index_global = static_cast<Index>((p.Pos() - grid.Extent().Begin()) / grid.Extent().MeshWidth());
+    const Index index_global = static_cast<Index>((p.Pos() - grid.Extent().Begin()) / grid.Extent().MeshWidth());
     assert(index_global.X() >= grid.Global().LocalBegin().X() && index_global.X() < grid.Global().LocalEnd().X());
     assert(index_global.Y() >= grid.Global().LocalBegin().Y() && index_global.Y() < grid.Global().LocalEnd().Y());
     assert(index_global.Z() >= grid.Global().LocalBegin().Z() && index_global.Z() < grid.Global().LocalEnd().Z());
 
-    index_local = index_global - grid.Global().LocalBegin() + grid.Local().Begin();
+    const Index index_local = index_global - grid.Global().LocalBegin() + grid.Local().Begin();
     assert(index_local.X() >= grid.Local().Begin().X() && index_local.X() < grid.Local().End().X());
     assert(index_local.Y() >= grid.Local().Begin().Y() && index_local.Y() < grid.Local().End().Y());
     assert(index_local.Z() >= grid.Local().Begin().Z() && index_local.Z() < grid.Local().End().Z());
 
+    const Vector pos_beg = p.Pos() - grid.Extent().Begin() - grid.Extent().MeshWidth() * (index_global - near_field_cells);
+    const Vector& h = grid.Extent().MeshWidth();
+
     // Iterate over all grid points which lie in the support of the interpolating B-Spline
-    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())
+    dir[0] = pos_beg[0];
+    for (i.X()=-1*near_field_cells; i.X()<=near_field_cells; ++i.X()) {
+      dir[1] = pos_beg[1];
+      for (i.Y()=-1*near_field_cells; i.Y()<=near_field_cells; ++i.Y()) {
+        dir[2] = pos_beg[2];
         for (i.Z()=-1*near_field_cells; i.Z()<=near_field_cells; ++i.Z()) {
 
           // Compute distance from grid point to particle
-          length = ( p.Pos() - grid.Extent().Begin() - grid.Extent().MeshWidth() * (index_global+i) ).Length();
-
-          temp_val = EvaluateSpline(length);
-          vals.push_back(temp_val * p.Charge());
+          temp_val = EvaluateSpline(dir.Length());
+          vals[c++] = temp_val * p.Charge();
           int_val += temp_val;
 
+          dir[2] -= h[2];
         }
+        dir[1] -= h[1];
+      }
+      dir[0] -= h[0];
+    }
 
     // Reciprocal value of the numerically integrated spline
     int_val = 1.0 / (int_val * grid.Extent().MeshWidth().Product());
 
-    iter = vals.begin();
+    c = 0;
     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())
-          grid(index_local+i) += *iter++ * int_val;
+          grid(index_local+i) += vals[c++] * int_val;
 
-    assert(iter == vals.end());
   }