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 829 by gezelter, Tue Oct 28 16:03:37 2003 UTC vs.
Revision 898 by chuckv, Mon Jan 5 22:49:14 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.12 2003-10-28 16:03:35 gezelter Exp $, $Date: 2003-10-28 16:03:35 $, $Name: not supported by cvs2svn $, $Revision: 1.12 $
5 > !! @version $Id: calc_LJ_FF.F90,v 1.14 2004-01-05 22:49:14 chuckv Exp $, $Date: 2004-01-05 22:49:14 $, $Name: not supported by cvs2svn $, $Revision: 1.14 $
6  
7   module lj
8    use definitions
# Line 59 | Line 59 | contains
59      integer, intent(out) :: status
60      integer :: myStatus
61      
62 <    if (mix_Policy == 1) then
63 <       LJ_Mixing_Policy = 1
62 >    if (mix_Policy == LB_MIXING_RULE) then
63 >       LJ_Mixing_Policy = LB_MIXING_RULE
64      else
65 <       if (mix_Policy == 2) then
66 <          LJ_Mixing_Policy = 2
65 >       if (mix_Policy == EXPLICIT_MIXING_RULE) then
66 >          LJ_Mixing_Policy = EXPLICIT_MIXING_RULE
67         else
68            write(*,*) 'Unknown Mixing Policy!'
69            status = -1
# Line 192 | Line 192 | contains
192      integer, intent(in) ::  atom1, atom2
193      real( kind = dp ), intent(in) :: rij, r2
194      real( kind = dp ) :: pot
195 <    real( kind = dp ), dimension(3,getNlocal()) :: f    
195 >    real( kind = dp ), dimension(3,nLocal) :: f    
196      real( kind = dp ), intent(in), dimension(3) :: d
197      logical, intent(in) :: do_pot, do_stress
198  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines