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 2016 by gezelter, Mon Jul 1 21:09:37 2013 UTC vs.
Revision 2017 by gezelter, Tue Sep 2 18:31:44 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines