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 626 by mmeineke, Wed Jul 16 21:30:56 2003 UTC vs.
Revision 900 by chuckv, Tue Jan 6 18:54:57 2004 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.15 2004-01-06 18:54:57 chuckv Exp $, $Date: 2004-01-06 18:54:57 $, $Name: not supported by cvs2svn $, $Revision: 1.15 $
6  
7   module lj
8    use definitions
# Line 131 | Line 131 | contains
131  
132      rcut6 = LJ_rcut**6
133  
134 + ! This loops through all atypes, even those that don't support LJ forces.
135      do i = 1, nAtypes
136  
137         call getElementProperty(atypes, i, "lj_epsilon", myEpsilon_i)
# Line 138 | Line 139 | contains
139         ! do self mixing rule
140         ljMixed(i,i)%sigma   = mySigma_i
141        
142 <       ljMixed(i,i)%sigma6  = (ljMixed(i,i)%sigma) ** 6                                                                                                  
142 <       ljMixed(i,i)%tp6     = ljMixed(i,i)%sigma6/rcut6
142 >       ljMixed(i,i)%sigma6  = (ljMixed(i,i)%sigma) ** 6
143  
144 +       ljMixed(i,i)%tp6     = (ljMixed(i,i)%sigma6)/rcut6
145 +
146         ljMixed(i,i)%tp12    = (ljMixed(i,i)%tp6) ** 2
147  
148 +
149         ljMixed(i,i)%epsilon = myEpsilon_i
150  
151         ljMixed(i,i)%delta = -4.0_DP * ljMixed(i,i)%epsilon * &
# Line 190 | Line 193 | contains
193      integer, intent(in) ::  atom1, atom2
194      real( kind = dp ), intent(in) :: rij, r2
195      real( kind = dp ) :: pot
196 <    real( kind = dp ), dimension(3,getNlocal()) :: f    
196 >    real( kind = dp ), dimension(3,nLocal) :: f    
197      real( kind = dp ), intent(in), dimension(3) :: d
198      logical, intent(in) :: do_pot, do_stress
199  
# Line 315 | Line 318 | contains
318      
319      if (present(status)) status = 0
320      select case (LJ_Mixing_Policy)
321 <    case (LB_MIXING_RULE)
321 >    case (1)
322         select case (thisParam)
323         case ("sigma")
324            myMixParam = 0.5_dp * (param1 + param2)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines