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 1833 by gezelter, Tue Jan 15 16:28:22 2013 UTC vs.
Revision 1840 by gezelter, Mon Jan 28 15:44:32 2013 UTC

# Line 233 | Line 233 | namespace OpenMD {
233            }
234          }
235          
236 +
237          RealType wi = 2.0*(xi2-yi2)*zi / r3;
238          RealType wj = 2.0*(xj2-yj2)*zj / r3;
239          RealType w = wi+wj;
# Line 284 | Line 285 | namespace OpenMD {
285                          0.0);
286          
287          if (isPower) {
288 +          cerr << "This is probably an error!\n";
289            RealType frac1 = 0.25;
290            RealType frac2 = 0.75;      
291            RealType wi2 = wi*wi;
# Line 330 | Line 332 | namespace OpenMD {
332          Vector3d fjj = A2trans * radcomj;
333          
334          // now assemble these with the radial-only terms:
335 <        
335 >      
336          *(idat.f1) += RealType(0.5) * ((v0*dsdr*w + v0p*dspdr*wp) * *(idat.d) /
337                                         *(idat.rij)  + fii - fjj);
338          

Diff Legend

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