ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/calc_LJ_FF.F90
(Generate patch)

Comparing trunk/OOPSE/libmdtools/calc_LJ_FF.F90 (file contents):
Revision 789 by mmeineke, Wed Jul 16 21:30:56 2003 UTC vs.
Revision 790 by mmeineke, Mon Sep 29 21:16:11 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: calc_LJ_FF.F90,v 1.10 2003-07-16 21:30:54 mmeineke Exp $, $Date: 2003-07-16 21:30:54 $, $Name: not supported by cvs2svn $, $Revision: 1.10 $
5 > !! @version $Id: calc_LJ_FF.F90,v 1.11 2003-09-29 21:16:11 mmeineke Exp $, $Date: 2003-09-29 21:16:11 $, $Name: not supported by cvs2svn $, $Revision: 1.11 $
6  
7   module lj
8    use definitions
# Line 138 | Line 138 | contains
138         ! do self mixing rule
139         ljMixed(i,i)%sigma   = mySigma_i
140        
141 <       ljMixed(i,i)%sigma6  = (ljMixed(i,i)%sigma) ** 6                                                                                                  
142 <       ljMixed(i,i)%tp6     = ljMixed(i,i)%sigma6/rcut6
141 >       ljMixed(i,i)%sigma6  = (ljMixed(i,i)%sigma) ** 6
142  
143 +       ljMixed(i,i)%tp6     = (ljMixed(i,i)%sigma6)/rcut6
144 +
145         ljMixed(i,i)%tp12    = (ljMixed(i,i)%tp6) ** 2
146  
147 +
148         ljMixed(i,i)%epsilon = myEpsilon_i
149  
150         ljMixed(i,i)%delta = -4.0_DP * ljMixed(i,i)%epsilon * &

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines