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

Comparing branches/development/src/nonbonded/Sticky.cpp (file contents):
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC vs.
Revision 1833 by gezelter, Tue Jan 15 16:28:22 2013 UTC

# Line 112 | Line 112 | namespace OpenMD {
112        mixer.rup  = 0.5 * ( sticky1.getRup() + sticky2.getRup() );
113        mixer.rbig = max(mixer.ru, mixer.rup);
114        mixer.w0  = sqrt( sticky1.getW0()   * sticky2.getW0()  );
115 <      mixer.v0  = sqrt( sticky1.getW0()   * sticky2.getV0()  );
115 >      mixer.v0  = sqrt( sticky1.getV0()   * sticky2.getV0()  );
116        mixer.v0p = sqrt( sticky1.getV0p()  * sticky2.getV0p() );
117        mixer.isPower = sticky1.isStickyPower() && sticky2.isStickyPower();
118  
# Line 303 | Line 303 | namespace OpenMD {
303            dspdr = 0.0;
304          }
305          
306 +
307 +
308          *(idat.vpair) += RealType(0.5)*(v0*s*w + v0p*sp*wp);
309          (*(idat.pot))[HYDROGENBONDING_FAMILY] += RealType(0.5)*(v0*s*w + v0p*sp*wp)* *(idat.sw) ;
310          

Diff Legend

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