Changeset 36d56c for src/units/particle/bspline.hpp

Timestamp:

May 11, 2012, 7:45:30 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

2a5451

Parents:

952298

Message:

Improve serial performance.

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

File:

• src/units/particle/bspline.hpp (modified) (6 diffs)

src/units/particle/bspline.hpp

@@ -45 +45 @@
 {
 public:
-  BSpline(const vmg_float& width);
+  BSpline(const int& near_field_cells, const vmg_float& h);
 
   vmg_float EvaluateSpline(const vmg_float& val) const
@@ -55 +55 @@
   }
 
-  void SetSpline(Grid& grid, const Particle& p, const int& near_field_cells) const
+  void SetSpline(Grid& grid, const Particle& p) const
   {
     assert(p.Pos().X() >= grid.Extent().Begin().X() && p.Pos().X() < grid.Extent().End().X());
@@ -61 +61 @@
     assert(p.Pos().Z() >= grid.Extent().Begin().Z() && p.Pos().Z() < grid.Extent().End().Z());
 
-    std::vector<vmg_float> vals(Helper::intpow(2*near_field_cells+1,3));
+    vmg_float* vals = new vmg_float[Helper::intpow(2*near_field_cells+1,3)];
+
     vmg_float temp_val;
     vmg_float int_val = 0.0;
@@ -86 +87 @@
     const vmg_float pos_beg_z = p.Pos().Z() - grid.Extent().Begin().Z() - grid.Extent().MeshWidth().Z() * (index_global_z - near_field_cells);
 
-    const vmg_float h_x = grid.Extent().MeshWidth().X();
-    const vmg_float h_y = grid.Extent().MeshWidth().Y();
-    const vmg_float h_z = grid.Extent().MeshWidth().Z();
+    const vmg_float& h_x = grid.Extent().MeshWidth().X();
+    const vmg_float& h_y = grid.Extent().MeshWidth().Y();
+    const vmg_float& h_z = grid.Extent().MeshWidth().Z();
 
     // Iterate over all grid points which lie in the support of the interpolating B-Spline
-
-    vmg_float dir_x, dir_y, dir_z;
-    dir_x = pos_beg_x;
+    vmg_float dir_x = pos_beg_x;
     for (int i=-1*near_field_cells; i<=near_field_cells; ++i) {
-      dir_y = pos_beg_y;
+      vmg_float dir_y = pos_beg_y;
       for (int j=-1*near_field_cells; j<=near_field_cells; ++j) {
-        dir_z = pos_beg_z;
+        vmg_float dir_z = pos_beg_z;
         for (int k=-1*near_field_cells; k<=near_field_cells; ++k) {
 
@@ -123 +122 @@
                index_local_z + k) += vals[c++] * int_val;
 
+    delete [] vals;
   }
 
@@ -153 +153 @@
   std::vector<vmg_float> intervals;
 
-  vmg_float R;
+  const vmg_float R;
+  const int near_field_cells;
 };