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

Comparing trunk/src/nonbonded/Morse.cpp (file contents):
Revision 2032 by jmichalk, Fri Oct 31 18:57:19 2014 UTC vs.
Revision 2033 by gezelter, Sat Nov 1 14:12:16 2014 UTC

# Line 213 | Line 213 | namespace OpenMD {
213      }
214      }
215      
216
216      RealType pot_temp = *(idat.vdwMult) * (myPot - myPotC);
217      *(idat.vpair) += pot_temp;
218      
219      RealType dudr = *(idat.sw) * *(idat.vdwMult) * (myDeriv - myDerivC);
221
220      
221      (*(idat.pot))[VANDERWAALS_FAMILY] += *(idat.sw) * pot_temp;
222      *(idat.f1) = *(idat.d) * dudr / *(idat.rij);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines