Changeset 1a92cf for src/interface/interface_particles.cpp

Timestamp:

Apr 29, 2012, 10:50:41 AM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

39a6d9

Parents:

4571da

Message:

vmg: Prepared force calculation.

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

File:

• src/interface/interface_particles.cpp (modified) (3 diffs)

src/interface/interface_particles.cpp

@@ -101 +101 @@
 {
   Index i;
-  vmg_float length;
 
 #ifdef DEBUG_OUTPUT
@@ -161 +160 @@
     for (p1=lc_1.begin(); p1!=lc_1.end(); ++p1) {
 
-      (*p1)->Pot() = ip.Evaluate((*p1)->Pos()) - (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
+      ip.Evaluate((*p1)->Pos(), (*p1)->Pot(), (*p1)->Field());
+      (*p1)->Pot() -= (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
 
 #ifdef DEBUG_OUTPUT
@@ -177 +177 @@
               if (*p1 != *p2) {
 
-                length = ((*p2)->Pos() - (*p1)->Pos()).Length();
+                const Vector dir = (*p1)->Pos() - (*p2)->Pos();
+                const vmg_float length = dir.Length();
 
                 if (length < r_cut) {
+
                   (*p1)->Pot() += (*p2)->Charge() / length * (1.0 + spl.EvaluatePotential(length));
+                  (*p1)->Field() += (*p2)->Charge() * dir * spl.EvaluateField(length);
 
 #ifdef DEBUG_OUTPUT