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

Timestamp:

May 8, 2012, 2:54:17 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

6f05224

Parents:

4e8206

Message:

Refactored vmg in order to separate the core library and the particle simulation part properly.

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

File:

• src/units/particle/interpolation.cpp (moved) (moved from src/base/interpolate_polynomial.cpp ) (6 diffs)

src/units/particle/interpolation.cpp

@@ -7 +7 @@
 #include "base/helper.hpp"
 #include "base/index.hpp"
-#include "base/interpolate_polynomial.hpp"
 #include "base/vector.hpp"
 #include "grid/grid.hpp"
+#include "units/particle/interpolation.hpp"
+#include "units/particle/particle.hpp"
 
 using namespace VMG;
 
-InterpolatePolynomial::InterpolatePolynomial(const unsigned int& degree) :
+Particle::Interpolation::Interpolation(const unsigned int& degree) :
   deg(degree),
   deg_1(degree+1),
@@ -25 +26 @@
 }
 
-InterpolatePolynomial::~InterpolatePolynomial()
+Particle::Interpolation::~Interpolation()
 {
   delete [] coeff;
@@ -31 +32 @@
 }
 
-void InterpolatePolynomial::ComputeCoefficients(const Grid& grid, const Index& index)
+void Particle::Interpolation::ComputeCoefficients(const Grid& grid, const Index& index)
 {
   Index i;
@@ -63 +64 @@
 }
 
-void InterpolatePolynomial::_compute_coefficients_1d(const Index& index, const unsigned int& direction)
+void Particle::Interpolation::_compute_coefficients_1d(const Index& index, const unsigned int& direction)
 {
   vmg_float power = 1.0;
@@ -84 +85 @@
 }
 
-vmg_float InterpolatePolynomial::Evaluate(const Vector& pos)
-{
-  vmg_float result = 0.0;
-  Vector prod, offset;
-  Index i;
-
-  prod[0] = 1.0;
-  offset[0] = pos[0] - pos_begin[0];
-  for (i[0]=0; i[0]<deg_1; ++i[0]) {
-    prod[1] = prod[0];
-    offset[1] = pos[1] - pos_begin[1];
-    for (i[1]=0; i[1]<deg_1; ++i[1]) {
-      prod[2] = prod[1];
-      offset[2] = pos[2] - pos_begin[2];
-      for (i[2]=0; i[2]<deg_1; ++i[2]) {
-        result += _access_coeff(i) * prod[2];
-        prod[2] *= offset[2];
-        offset[2] -= h[2];
-      }
-      prod[1] *= offset[1];
-      offset[1] -= h[1];
-    }
-    prod[0] *= offset[0];
-    offset[0] -= h[0];
-  }
-
-  return result;
-}
-
-void InterpolatePolynomial::Evaluate(const Vector& pos, vmg_float& pot, Vector& field)
+void Particle::Interpolation::Evaluate(Particle& p)
 {
  Vector offset;
+
+ const Vector& pos = p.Pos();
+ vmg_float& pot = p.Pot();
+ Vector& field = p.Field();
 
  pot = 0.0;
@@ -154 +130 @@
 }
 
-Vector InterpolatePolynomial::EvaluateNegGradient(const Vector& pos)
+vmg_float Particle::Interpolation::EvaluatePotentialLR(const Particle& p)
 {
-  Vector offset, result;
+  vmg_float result = 0.0;
+  Vector prod, offset;
+  Index i;
 
-  buffer[0] = 1.0;
-  offset = pos - pos_begin;
-  for (int i=1; i<deg_1; ++i) {
-    buffer[i] = buffer[i-1] * offset;
-    offset -= h;
+  const Vector& pos = p.Pos();
+
+  prod[0] = 1.0;
+  offset[0] = pos[0] - pos_begin[0];
+  for (i[0]=0; i[0]<deg_1; ++i[0]) {
+    prod[1] = prod[0];
+    offset[1] = pos[1] - pos_begin[1];
+    for (i[1]=0; i[1]<deg_1; ++i[1]) {
+      prod[2] = prod[1];
+      offset[2] = pos[2] - pos_begin[2];
+      for (i[2]=0; i[2]<deg_1; ++i[2]) {
+        result += _access_coeff(i) * prod[2];
+        prod[2] *= offset[2];
+        offset[2] -= h[2];
+      }
+      prod[1] *= offset[1];
+      offset[1] -= h[1];
+    }
+    prod[0] *= offset[0];
+    offset[0] -= h[0];
   }
-
-  offset = pos - pos_begin;
-  for (int i=0; i<deg; ++i) {
-    for (int j=0; j<i; ++j)
-      buffer_diff[i][j] = buffer_diff[i-1][j] * offset;
-    buffer_diff[i][i] = buffer[i];
-    offset -= h;
-  }
-
-  for (int i=1; i<deg; ++i)
-    for (int j=1; j<=i; ++j)
-      buffer_diff[i][0] += buffer_diff[i][j];
-
-  for (int i=0; i<deg_1; ++i)
-    for (int j=0; j<deg_1; ++j)
-      for (int k=0; k<deg; ++k) {
-        result[0] -= _access_coeff(k+1, i, j) * buffer[i][1] * buffer[j][2] * buffer_diff[k][0][0];
-        result[1] -= _access_coeff(i, k+1, j) * buffer[i][0] * buffer[j][2] * buffer_diff[k][0][1];
-        result[2] -= _access_coeff(i, j, k+1) * buffer[i][0] * buffer[j][1] * buffer_diff[k][0][2];
-      }
 
   return result;