ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE_old/src/mdtools/libmdCode/lj_FF.F90
(Generate patch)

Comparing trunk/OOPSE_old/src/mdtools/libmdCode/lj_FF.F90 (file contents):
Revision 295 by chuckv, Thu Mar 6 19:57:03 2003 UTC vs.
Revision 297 by gezelter, Thu Mar 6 22:08:29 2003 UTC

# Line 2 | Line 2
2   !! Corresponds to the force field defined in lj_FF.cpp
3   !! @author Charles F. Vardeman II
4   !! @author Matthew Meineke
5 < !! @version $Id: lj_FF.F90,v 1.5 2003-03-06 19:57:03 chuckv Exp $, $Date: 2003-03-06 19:57:03 $, $Name: not supported by cvs2svn $, $Revision: 1.5 $
5 > !! @version $Id: lj_FF.F90,v 1.6 2003-03-06 22:08:29 gezelter Exp $, $Date: 2003-03-06 22:08:29 $, $Name: not supported by cvs2svn $, $Revision: 1.6 $
6  
7  
8  
# Line 111 | Line 111 | contains
111                 tmpPtrInner%sigma)
112            
113            ljMixed(outerCounter,innerCounter)%sigma2  = &
114 <               ljMixed(outerCounter,innerCounter)%sigma &
115 <               * ljMixed(outerCounter,innerCounter)%sigma
114 >               (ljMixed(outerCounter,innerCounter)%sigma)**2
115            
116            ljMixed(outerCounter,innerCounter)%sigma6 = &
117 <               ljMixed(outerCounter,innerCounter)%sigma2 &
119 <               * ljMixed(outerCounter,innerCounter)%sigma2 &
120 <               * ljMixed(outerCounter,innerCounter)%sigma2
117 >               (ljMixed(outerCounter,innerCounter)%sigma)**6
118            
119            ljMixed(outerCounter,innerCounter)%epsilon = &
120                 calcLJMix("epsilon",tmpPtrOuter%epsilon, &

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines