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

Comparing branches/development/src/nonbonded/GB.cpp (file contents):
Revision 1674 by gezelter, Thu Feb 16 15:59:20 2012 UTC vs.
Revision 1686 by gezelter, Sat Mar 10 04:21:44 2012 UTC

# Line 374 | Line 374 | namespace OpenMD {
374      Vector3d uxu = cross(ul1, ul2);
375  
376      (*(idat.pot))[VANDERWAALS_FAMILY] += U *  *(idat.sw);
377 <    *(idat.f1) += dUdr * rhat + dUda * ul1 + dUdb * ul2;    
378 <    *(idat.t1) += dUda * rxu1 - dUdg * uxu;
379 <    *(idat.t2) += dUdb * rxu2 + dUdg * uxu;
380 <    *(idat.vpair) += U * *(idat.sw);
377 >    *(idat.f1) += (dUdr * rhat + dUda * ul1 + dUdb * ul2) * *(idat.sw);
378 >    *(idat.t1) += (dUda * rxu1 - dUdg * uxu) * *(idat.sw);
379 >    *(idat.t2) += (dUdb * rxu2 + dUdg * uxu) * *(idat.sw);
380 >    *(idat.vpair) += U;
381  
382      return;
383  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines