Changeset 8180d8 for src/units/particle/bspline.hpp

Timestamp:

Apr 5, 2013, 12:39:30 PM (13 years ago)

Author:

Julian Iseringhausen <julian.iseringhausen@…>

Children:

4a709e

Parents:

f57182

Message:

Merge stashed open boundary stuff.

File:

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

src/units/particle/bspline.hpp

@@ -51 +51 @@
     for (unsigned int i=0; i<intervals.size(); ++i)
       if (val < intervals[i])
-        return spline_nom[i](val) / spline_denom[i](val);
+        return spline_nom[i](val) / spline_denom[i](val);
     return 0.0;
   }
@@ -67 +67 @@
     int c = 0;
 
-    const int index_global_x = (p.Pos().X() - grid.Extent().Begin().X()) / grid.Extent().MeshWidth().X();
-    const int index_global_y = (p.Pos().Y() - grid.Extent().Begin().Y()) / grid.Extent().MeshWidth().Y();
-    const int index_global_z = (p.Pos().Z() - grid.Extent().Begin().Z()) / grid.Extent().MeshWidth().Z();
+    const int index_global_x = grid.Global().GlobalBegin().X() + (p.Pos().X() - grid.Extent().Begin().X()) / grid.Extent().MeshWidth().X();
+    const int index_global_y = grid.Global().GlobalBegin().Y() + (p.Pos().Y() - grid.Extent().Begin().Y()) / grid.Extent().MeshWidth().Y();
+    const int index_global_z = grid.Global().GlobalBegin().Z() + (p.Pos().Z() - grid.Extent().Begin().Z()) / grid.Extent().MeshWidth().Z();
 
     assert(index_global_x >= grid.Global().LocalBegin().X() && index_global_x < grid.Global().LocalEnd().X());
@@ -83 +83 @@
     assert(index_local_z >= grid.Local().Begin().Z() && index_local_z < grid.Local().End().Z());
 
-    const vmg_float pos_beg_x = p.Pos().X() - grid.Extent().Begin().X() - grid.Extent().MeshWidth().X() * (index_global_x - near_field_cells);
-    const vmg_float pos_beg_y = p.Pos().Y() - grid.Extent().Begin().Y() - grid.Extent().MeshWidth().Y() * (index_global_y - near_field_cells);
-    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 pos_beg_x = p.Pos().X() - grid.Extent().Begin().X() - grid.Extent().MeshWidth().X() * (index_global_x - grid.Global().GlobalBegin().X() - near_field_cells);
+    const vmg_float pos_beg_y = p.Pos().Y() - grid.Extent().Begin().Y() - grid.Extent().MeshWidth().Y() * (index_global_y - grid.Global().GlobalBegin().Y() - near_field_cells);
+    const vmg_float pos_beg_z = p.Pos().Z() - grid.Extent().Begin().Z() - grid.Extent().MeshWidth().Z() * (index_global_z - grid.Global().GlobalBegin().Z() - near_field_cells);
 
     const vmg_float& h_x = grid.Extent().MeshWidth().X();
@@ -96 +96 @@
       vmg_float dir_y = pos_beg_y;
       for (int j=-1*near_field_cells; j<=near_field_cells; ++j) {
-        vmg_float dir_z = pos_beg_z;
-        for (int k=-1*near_field_cells; k<=near_field_cells; ++k) {
+        vmg_float dir_z = pos_beg_z;
+        for (int k=-1*near_field_cells; k<=near_field_cells; ++k) {
 
-          // Compute distance from grid point to particle
-          temp_val = EvaluateSpline(std::sqrt(dir_x*dir_x+dir_y*dir_y+dir_z*dir_z));
-          vals[c++] = temp_val * p.Charge();
-          int_val += temp_val;
+          // Compute distance from grid point to particle
+          temp_val = EvaluateSpline(std::sqrt(dir_x*dir_x+dir_y*dir_y+dir_z*dir_z));
+          vals[c++] = temp_val * p.Charge();
+          int_val += temp_val;
 
-          dir_z -= h_z;
-        }
-        dir_y -= h_y;
+          dir_z -= h_z;
+        }
+        dir_y -= h_y;
       }
       dir_x -= h_x;
@@ -117 +117 @@
     for (int i=-1*near_field_cells; i<=near_field_cells; ++i)
       for (int j=-1*near_field_cells; j<=near_field_cells; ++j)
-        for (int k=-1*near_field_cells; k<=near_field_cells; ++k)
-          grid(index_local_x + i,
-               index_local_y + j,
-               index_local_z + k) += vals[c++] * int_val;
+        for (int k=-1*near_field_cells; k<=near_field_cells; ++k)
+          grid(index_local_x + i,
+              index_local_y + j,
+              index_local_z + k) += vals[c++] * int_val;
 
     delete [] vals;
@@ -129 +129 @@
     for (unsigned int i=0; i<intervals.size(); ++i)
       if (val < intervals[i])
-        return potential_nom[i](val) / potential_denom[i](val);
+        return potential_nom[i](val) / potential_denom[i](val);
     return potential_nom.back()(val) / potential_denom.back()(val);
   }
@@ -137 +137 @@
     for (unsigned int i=0; i<intervals.size(); ++i)
       if (val < intervals[i])
-        return field_nom[i](val) / field_denom[i](val);
+        return field_nom[i](val) / field_denom[i](val);
     return 0.0;
   }