Changeset ef94e7 for src/units

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

Location:

src/units/particle

Files:

• comm_mpi_particle.cpp (modified) (1 diff)
• interface_fcs.cpp (modified) (1 diff)
• interface_particles.cpp (modified) (1 diff)
• interpolation.cpp (modified) (4 diffs)
• particle.hpp (modified) (1 diff)

src/units/particle/comm_mpi_particle.cpp

@@ -218 +218 @@
     for (vmg_int j=0; j<size_receive[i]; ++j) {
       p[recv_buffer_index[i][j]] = recv_buffer_float[i][4*j];
-      std::memcpy(&f[recv_buffer_index[i][j]], &recv_buffer_float[i][4*j+1], 3*sizeof(vmg_float));
+      std::memcpy(&f[3*recv_buffer_index[i][j]], &recv_buffer_float[i][4*j+1], 3*sizeof(vmg_float));
     }
 #endif

src/units/particle/interface_fcs.cpp

@@ -221 +221 @@
   const Grid& grid = multigrid(multigrid.MaxLevel());
 
-  int error_code;
+  int error_code = 0;
 
   if (!grid.Global().LocalSize().IsComponentwiseGreater(near_field_cells))
     error_code = 1;
-  else
-    error_code = 0;
-
-  error_code = MG::GetComm()->GlobalMax(error_code);
-
-  return error_code;
+
+  return MG::GetComm()->GlobalMax(error_code);
 }
 

src/units/particle/interface_particles.cpp

@@ -179 +179 @@
         for (p1=lc(i,j,k).begin(); p1!=lc(i,j,k).end(); ++p1) {
 
+          // Interpolate long-range part of potential and electric field
           ip.Evaluate(**p1);
+
+          // Subtract self-induced potential
           (*p1)->Pot() -= (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
-          (*p1)->Field() *= 0.5;
 
 #ifdef DEBUG_OUTPUT

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];
       }
-
 }
 

src/units/particle/particle.hpp

@@ -40 +40 @@
 {
 public:
+  Particle() :
+    x_(0.0),
+    f_(0.0),
+    q_(0.0),
+    p_(0.0),
+    rank_(-1),
+    index_(-1)
+  {}
+
   Particle(const vmg_float* x, const vmg_float& q) :
     x_(x),