Changeset ef94e7 for src/units/particle/interpolation.cpp

Timestamp:

Jul 4, 2012, 6:10:39 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

0260d3

Parents:

290aa3

Message:

vmg: Fix force calculation.

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

File:

• src/units/particle/interpolation.cpp (modified) (4 diffs)

src/units/particle/interpolation.cpp

@@ -30 +30 @@
 #include "units/particle/particle.hpp"
 
+#include "mg.hpp"
+#include "comm/comm.hpp"
+
 using namespace VMG;
 
@@ -54 +57 @@
   Index i;
 
-  const Index begin = index - deg/2 - 1;
+  const Index begin = index - deg/2;
 
   h = grid.Extent().MeshWidth();
@@ -105 +108 @@
 void Particle::Interpolation::Evaluate(Particle& p)
 {
- Vector offset;
+  const Vector& pos = p.Pos();
+  vmg_float& pot = p.Pot();
+  Vector& field = p.Field();
 
- const Vector& pos = p.Pos();
- vmg_float& pot = p.Pot();
- Vector& field = p.Field();
+  pot = 0.0;
+  field = 0.0;
 
- pot = 0.0;
- field = 0.0;
-
+  Vector offset = pos - pos_begin;
   buffer[0] = 1.0;
-  offset = pos - pos_begin;
-  for (int i=1; i<deg_1; ++i) {
-    buffer[i] = buffer[i-1] * offset;
-    offset -= h;
-  }
-
-  offset = pos - pos_begin;
   for (int i=0; i<deg; ++i) {
+    buffer[i+1] = buffer[i] * offset;
     for (int j=0; j<i; ++j)
       buffer_diff[i][j] = buffer_diff[i-1][j] * offset;
@@ -145 +141 @@
         field[2] -= _access_coeff(i, j, k+1) * buffer[i][0] * buffer[j][1] * buffer_diff[k][0][2];
       }
-
 }