Changeset 881e4b

Timestamp:

Apr 20, 2013, 1:53:20 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

da7c98

Parents:

534af9

Message:

Adapted Bspline class to open boundary conditions.

File:

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

src/units/particle/bspline.hpp

@@ -77 +77 @@
     assert(index_global_z >= grid.Global().LocalBegin().Z() && index_global_z < grid.Global().LocalEnd().Z());
 
-    const int index_local_x = index_global_x - grid.Global().LocalBegin().X() + grid.Local().Begin().X();
-    const int index_local_y = index_global_y - grid.Global().LocalBegin().Y() + grid.Local().Begin().Y();
-    const int index_local_z = index_global_z - grid.Global().LocalBegin().Z() + grid.Local().Begin().Z();
+    const int index_local_x = index_global_x - grid.Global().LocalBegin().X() + grid.Local().HaloSize1().X();
+    const int index_local_y = index_global_y - grid.Global().LocalBegin().Y() + grid.Local().HaloSize1().Y();
+    const int index_local_z = index_global_z - grid.Global().LocalBegin().Z() + grid.Local().HaloSize1().Z();
 
     assert(index_local_x >= grid.Local().Begin().X() && index_local_x < grid.Local().End().X());
@@ -85 +85 @@
     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 - 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 pos_beg_x =  grid.Extent().Begin().X() + grid.Extent().MeshWidth().X() * (index_global_x - grid.Global().GlobalBegin().X() - near_field_cells) - p.Pos().X();
+    const vmg_float pos_beg_y =  grid.Extent().Begin().Y() + grid.Extent().MeshWidth().Y() * (index_global_y - grid.Global().GlobalBegin().Y() - near_field_cells) - p.Pos().Y();
+    const vmg_float pos_beg_z =  grid.Extent().Begin().Z() + grid.Extent().MeshWidth().Z() * (index_global_z - grid.Global().GlobalBegin().Z() - near_field_cells) - p.Pos().Z();
 
     const vmg_float& h_x = grid.Extent().MeshWidth().X();
@@ -106 +106 @@
           int_val += temp_val;
 
-          dir_z -= h_z;
+          dir_z += h_z;
         }
-        dir_y -= h_y;
+        dir_y += h_y;
       }
-      dir_x -= h_x;
+      dir_x += h_x;
     }