ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/UseTheForce/DarkSide/LJ.F90
(Generate patch)

Comparing trunk/OOPSE-4/src/UseTheForce/DarkSide/LJ.F90 (file contents):
Revision 2733 by gezelter, Tue Apr 25 02:09:01 2006 UTC vs.
Revision 2756 by gezelter, Wed May 17 15:37:15 2006 UTC

# Line 43 | Line 43
43   !! Calculates Long Range forces Lennard-Jones interactions.
44   !! @author Charles F. Vardeman II
45   !! @author Matthew Meineke
46 < !! @version $Id: LJ.F90,v 1.24 2006-04-25 02:09:01 gezelter Exp $, $Date: 2006-04-25 02:09:01 $, $Name: not supported by cvs2svn $, $Revision: 1.24 $
46 > !! @version $Id: LJ.F90,v 1.25 2006-05-17 15:37:14 gezelter Exp $, $Date: 2006-05-17 15:37:14 $, $Name: not supported by cvs2svn $, $Revision: 1.25 $
47  
48  
49   module lj
50 +  use definitions
51    use atype_module
52    use vector_class
53    use simulation
# Line 62 | Line 63 | module lj
63   #define __FORTRAN90
64   #include "UseTheForce/DarkSide/fInteractionMap.h"
65  
65  integer, parameter :: DP = selected_real_kind(15)
66
66    logical, save :: useGeometricDistanceMixing = .false.
67    logical, save :: haveMixingMap = .false.
68  
# Line 226 | Line 225 | contains
225  
226            ! only the distance parameter uses different mixing policies
227            if (useGeometricDistanceMixing) then
228 <             MixingMap(i,j)%sigma = dsqrt(s1 * s2)
228 >             MixingMap(i,j)%sigma = sqrt(s1 * s2)
229            else
230               MixingMap(i,j)%sigma = 0.5_dp * (s1 + s2)
231            endif
232            
233 <          MixingMap(i,j)%epsilon = dsqrt(e1 * e2)
233 >          MixingMap(i,j)%epsilon = sqrt(e1 * e2)
234  
235            MixingMap(i,j)%sigmai = 1.0_DP  / (MixingMap(i,j)%sigma)
236  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines