Changeset ac6d04 for src/samples/bspline.hpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

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

File:

• src/samples/bspline.hpp (modified) (4 diffs)

src/samples/bspline.hpp

@@ -36 +36 @@
   void SetSpline(Grid& grid, const Particle::Particle p, const int& near_field_cells)
   {
+    assert(p.Pos().X() >= grid.Extent().Begin().X() && p.Pos().X() < grid.Extent().End().X());
+    assert(p.Pos().Y() >= grid.Extent().Begin().Y() && p.Pos().Y() < grid.Extent().End().Y());
+    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;
@@ -44 +48 @@
 
     index_global = static_cast<Index>((p.Pos() - grid.Extent().Begin()) / grid.Extent().MeshWidth());
-    index_local = index_global - grid.Global().BeginLocal() + grid.Local().Begin();
+    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();
+    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());
 
     // Iterate over all grid points which lie in the support of the interpolating B-Spline
-    for (i.X()=-1*near_field_cells-1; i.X()<=near_field_cells+1; ++i.X())
-      for (i.Y()=-1*near_field_cells-1; i.Y()<=near_field_cells+1; ++i.Y())
-        for (i.Z()=-1*near_field_cells-1; i.Z()<=near_field_cells+1; ++i.Z()) {
+    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()) {
 
           // Compute distance from grid point to particle
@@ -58 +69 @@
           int_val += temp_val;
 
+          assert(temp_val >= 0.0);
+
         }
 
-    int_val = 1.0 / (Helper::pow(grid.MeshWidth(), 3) * int_val);
+    // Reciprocal value of the numerically integrated spline
+    int_val = 1.0 / (int_val * grid.Extent().MeshWidth().Product());
 
     iter = vals.begin();
-
-    for (i.X()=-1*near_field_cells-1; i.X()<=near_field_cells+1; ++i.X())
-      for (i.Y()=-1*near_field_cells-1; i.Y()<=near_field_cells+1; ++i.Y())
-        for (i.Z()=-1*near_field_cells-1; i.Z()<=near_field_cells+1; ++i.Z())
+    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;
 
+    assert(iter == vals.end());
   }
 
@@ -79 +93 @@
   }
 
-  vmg_float EvaluateDerivative(const Vector& v, const int& dv);
-
-  const vmg_float& GetAntiDerivativeZero() const
+  const vmg_float& GetAntiDerivativeAtZero() const
   {
     return antid;