--- trunk/OOPSE/libmdtools/calc_LJ_FF.F90 2003/09/29 17:38:00 789 +++ trunk/OOPSE/libmdtools/calc_LJ_FF.F90 2003/09/29 21:16:11 790 @@ -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.10 2003-07-16 21:30:54 mmeineke Exp $, $Date: 2003-07-16 21:30:54 $, $Name: not supported by cvs2svn $, $Revision: 1.10 $ +!! @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 $ module lj use definitions @@ -138,11 +138,13 @@ contains ! do self mixing rule ljMixed(i,i)%sigma = mySigma_i - ljMixed(i,i)%sigma6 = (ljMixed(i,i)%sigma) ** 6 - ljMixed(i,i)%tp6 = ljMixed(i,i)%sigma6/rcut6 + ljMixed(i,i)%sigma6 = (ljMixed(i,i)%sigma) ** 6 + ljMixed(i,i)%tp6 = (ljMixed(i,i)%sigma6)/rcut6 + ljMixed(i,i)%tp12 = (ljMixed(i,i)%tp6) ** 2 + ljMixed(i,i)%epsilon = myEpsilon_i ljMixed(i,i)%delta = -4.0_DP * ljMixed(i,i)%epsilon * &