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 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs.
Revision 1536 by gezelter, Wed Jan 5 14:49:05 2011 UTC

# Line 263 | Line 263 | namespace OpenMD {
263      }      
264    }
265    
266 <  void GB::calcForce(InteractionData idat) {
266 >  void GB::calcForce(InteractionData &idat) {
267  
268      if (!initialized_) initialize();
269      
# Line 357 | Line 357 | namespace OpenMD {
357      Vector3d rxu2 = cross(idat.d, ul2);
358      Vector3d uxu = cross(ul1, ul2);
359      
360 <    idat.pot += U*idat.sw;
360 >    idat.pot[0] += U*idat.sw;
361      idat.f1 += dUdr * rhat + dUda * ul1 + dUdb * ul2;    
362      idat.t1 += dUda * rxu1 - dUdg * uxu;
363      idat.t2 += dUdb * rxu2 - dUdg * uxu;
364 <    idat.vpair += U*idat.sw;
364 >    idat.vpair[0] += U*idat.sw;
365  
366      return;
367  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines