ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/UseTheForce/DarkSide/LJ.F90
(Generate patch)

Comparing trunk/OOPSE-4/src/UseTheForce/DarkSide/LJ.F90 (file contents):
Revision 3126 by gezelter, Fri Apr 6 21:53:43 2007 UTC vs.
Revision 3127 by gezelter, Mon Apr 9 18:24:00 2007 UTC

# Line 43 | Line 43
43   !! Calculates Long Range forces Lennard-Jones interactions.
44   !! @author Charles F. Vardeman II
45   !! @author Matthew Meineke
46 < !! @version $Id: LJ.F90,v 1.26 2007-04-06 21:53:42 gezelter Exp $, $Date: 2007-04-06 21:53:42 $, $Name: not supported by cvs2svn $, $Revision: 1.26 $
46 > !! @version $Id: LJ.F90,v 1.27 2007-04-09 18:24:00 gezelter Exp $, $Date: 2007-04-09 18:24:00 $, $Name: not supported by cvs2svn $, $Revision: 1.27 $
47  
48  
49   module lj
# Line 302 | Line 302 | contains
302  
303      ros = rij * sigmai
304      myPotC = 0.0_DP
305 +    myDerivC = 0.0_DP
306  
307      if (isSoftCore) then
308  
# Line 323 | Line 324 | contains
324        
325      endif
326  
327 <    pot_temp = epsilon * (myPot - myPotC)
327 >    !! these are the shifted POTENTIAL variants.
328 >    ! pot_temp = epsilon * (myPot - myPotC)
329 >    ! dudr = sw * epsilon * myDeriv * sigmai
330 >
331 >    !! these are the shifted FORCE variants.
332 >
333 >    pot_temp = epsilon * (myPot - myPotC - myDerivC * (rij - rcut) * sigmai)
334 >    dudr = sw * epsilon * (myDeriv - myDerivC) * sigmai
335 >    
336      vpair = vpair + pot_temp
328    dudr = sw * epsilon * myDeriv * sigmai
337  
338      drdx = d(1) / rij
339      drdy = d(2) / rij

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines