--- trunk/OOPSE/libmdtools/calc_LJ_FF.F90	2003/10/28 16:03:37	829
+++ trunk/OOPSE/libmdtools/calc_LJ_FF.F90	2003/10/28 20:09:45	834
@@ -2,7 +2,7 @@
 !! Corresponds to the force field defined in lj_FF.cpp 
 !! @author Charles F. Vardeman II
 !! @author Matthew Meineke
-!! @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 $
+!! @version $Id: calc_LJ_FF.F90,v 1.13 2003-10-28 20:09:37 gezelter Exp $, $Date: 2003-10-28 20:09:37 $, $Name: not supported by cvs2svn $, $Revision: 1.13 $
 
 module lj
   use definitions
@@ -59,11 +59,11 @@ contains
     integer, intent(out) :: status
     integer :: myStatus
     
-    if (mix_Policy == 1) then
-       LJ_Mixing_Policy = 1
+    if (mix_Policy == LB_MIXING_RULE) then
+       LJ_Mixing_Policy = LB_MIXING_RULE
     else
-       if (mix_Policy == 2) then
-          LJ_Mixing_Policy = 2
+       if (mix_Policy == EXPLICIT_MIXING_RULE) then
+          LJ_Mixing_Policy = EXPLICIT_MIXING_RULE
        else
           write(*,*) 'Unknown Mixing Policy!'
           status = -1