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

Comparing trunk/OOPSE_old/src/mdtools/libmdCode/calc_LJ_FF.F90 (file contents):
Revision 329 by gezelter, Wed Mar 12 22:27:59 2003 UTC vs.
Revision 356 by gezelter, Mon Mar 17 20:42:57 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.9 2003-03-12 22:27:59 gezelter Exp $, $Date: 2003-03-12 22:27:59 $, $Name: not supported by cvs2svn $, $Revision: 1.9 $
5 > !! @version $Id: calc_LJ_FF.F90,v 1.10 2003-03-17 20:42:57 gezelter Exp $, $Date: 2003-03-17 20:42:57 $, $Name: not supported by cvs2svn $, $Revision: 1.10 $
6  
7   module lj
8    use simulation
# Line 54 | Line 54 | contains
54      if ((mix_Policy == "standard") .or.  (mix_Policy == "LB")) then
55         LJ_Mixing_Policy = LB_Mixing_Rule
56      else
57 <       if (mix_Policy == "explicit") then
57 >       if (mix_Policy == "EXPLICIT") then
58            LJ_Mixing_Policy = Explicit_Mixing_Rule
59         else
60            write(*,*) 'Unknown Mixing Policy!'
# Line 62 | Line 62 | contains
62            return
63         endif
64      endif
65 <        
65 >    
66      status = 0
67      call createMixingList(myStatus)
68      if (myStatus /= 0) then

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines