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 828 by mmeineke, Mon Sep 29 21:16:11 2003 UTC vs.
Revision 829 by gezelter, Tue Oct 28 16:03:37 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.11 2003-09-29 21:16:11 mmeineke Exp $, $Date: 2003-09-29 21:16:11 $, $Name: not supported by cvs2svn $, $Revision: 1.11 $
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 $
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 == LB_MIXING_RULE) then
63 <       LJ_Mixing_Policy = LB_MIXING_RULE
62 >    if (mix_Policy == 1) then
63 >       LJ_Mixing_Policy = 1
64      else
65 <       if (mix_Policy == EXPLICIT_MIXING_RULE) then
66 <          LJ_Mixing_Policy = EXPLICIT_MIXING_RULE
65 >       if (mix_Policy == 2) then
66 >          LJ_Mixing_Policy = 2
67         else
68            write(*,*) 'Unknown Mixing Policy!'
69            status = -1
# Line 317 | Line 317 | contains
317      
318      if (present(status)) status = 0
319      select case (LJ_Mixing_Policy)
320 <    case (LB_MIXING_RULE)
320 >    case (1)
321         select case (thisParam)
322         case ("sigma")
323            myMixParam = 0.5_dp * (param1 + param2)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines