ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/nonbonded/Electrostatic.cpp
(Generate patch)

Comparing trunk/src/nonbonded/Electrostatic.cpp (file contents):
Revision 1893 by gezelter, Wed Jun 19 17:19:07 2013 UTC vs.
Revision 1894 by gezelter, Fri Jun 21 23:21:58 2013 UTC

# Line 398 | Line 398 | namespace OpenMD {
398          v11 = g - gc - rmRc*hc;
399          v21 = g*ri - gc*ric - rmRc*(hc - gc*ric)*ric;
400          v22 = h - g*ri - (hc - gc*ric) - rmRc*(sc - (hc - gc*ric)*ric);
401 <        v31 = (h-g*ri)*ri - (hc-g*ric)*ric - rmRc*(sc-2.0*(hc-gc*ric)*ric)*ric;
401 >        v31 = (h-g*ri)*ri - (hc-gc*ric)*ric - rmRc*(sc-2.0*(hc-gc*ric)*ric)*ric;
402          v32 = (s - 3.0*(h-g*ri)*ri) - (sc - 3.0*(hc-gc*ric)*ric)
403            - rmRc*(tc - 3.0*(sc-2.0*(hc-gc*ric)*ric)*ric);
404          v41 = (h - g*ri)*ri2 - (hc - gc*ric)*ric2
# Line 455 | Line 455 | namespace OpenMD {
455          v11 = g - gc;
456          v21 = g*ri - gc*ric;
457          v22 = h - g*ri - (hc - gc*ric);
458 <        v31 = (h-g*ri)*ri - (hc-g*ric)*ric;
458 >        v31 = (h-g*ri)*ri - (hc-gc*ric)*ric;
459          v32 = (s - 3.0*(h-g*ri)*ri) - (sc - 3.0*(hc-gc*ric)*ric);
460          v41 = (h - g*ri)*ri2 - (hc - gc*ric)*ric2;
461          v42 = (s-3.0*(h-g*ri)*ri)*ri - (sc-3.0*(hc-gc*ric)*ric)*ric;        
# Line 515 | Line 515 | namespace OpenMD {
515          v11 = g - gc;
516          v21 = g*ri - gc*ric;
517          v22 = h - g*ri - (hc - gc*ric);
518 <        v31 = (h-g*ri)*ri - (hc-g*ric)*ric;
518 >        v31 = (h-g*ri)*ri - (hc-gc*ric)*ric;
519          v32 = (s - 3.0*(h-g*ri)*ri) - (sc - 3.0*(hc-gc*ric)*ric);
520          v41 = (h - g*ri)*ri2 - (hc - gc*ric)*ric2;
521          v42 = (s-3.0*(h-g*ri)*ri)*ri - (sc-3.0*(hc-gc*ric)*ric)*ric;        

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines