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

Comparing branches/development/src/nonbonded/Morse.cpp (file contents):
Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC vs.
Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

# Line 160 | Line 160 | namespace OpenMD {
160            myDerivC = 0.0;
161          } else if (idat.shiftedForce) {
162            myPotC = De * (expfnc2C - 2.0 * expfncC);
163 <          myDerivC  = 2.0 * De * beta * (expfnc2C - expfnc2C);
163 >          myDerivC  = 2.0 * De * beta * (expfncC - expfnc2C);
164            myPotC += myDerivC * ( *(idat.rij) - *(idat.rcut) );
165          } else {
166            myPotC = 0.0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines