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 2461 by gezelter, Mon Nov 21 22:59:02 2005 UTC vs.
Revision 2497 by chuckv, Wed Dec 7 19:58:18 2005 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.19 2005-11-21 22:59:01 gezelter Exp $, $Date: 2005-11-21 22:59:01 $, $Name: not supported by cvs2svn $, $Revision: 1.19 $
46 > !! @version $Id: LJ.F90,v 1.20 2005-12-07 19:58:18 chuckv Exp $, $Date: 2005-12-07 19:58:18 $, $Name: not supported by cvs2svn $, $Revision: 1.20 $
47  
48  
49   module lj
# Line 51 | Line 51 | module lj
51    use vector_class
52    use simulation
53    use status
54 +  use fForceOptions
55   #ifdef IS_MPI
56    use mpiSimulation
57   #endif
# Line 104 | Line 105 | module lj
105    public :: setLJDefaultCutoff
106    public :: getSigma
107    public :: getEpsilon
107  public :: useGeometricMixing
108    public :: do_lj_pair
109    public :: destroyLJtypes
110  
# Line 193 | Line 193 | contains
193  
194    end function getEpsilon
195  
196  subroutine useGeometricMixing()
197    useGeometricDistanceMixing = .true.
198    haveMixingMap = .false.
199    return
200  end subroutine useGeometricMixing
201
196    subroutine createMixingMap()
197      integer :: nLJtypes, i, j
198      real ( kind = dp ) :: s1, s2, e1, e2
# Line 216 | Line 210 | contains
210         allocate(MixingMap(nLJtypes, nLJtypes))
211      endif
212  
213 +    useGeometricDistanceMixing = usesGeometricDistanceMixing()
214      do i = 1, nLJtypes
215  
216         s1 = LJMap%LJtypes(i)%sigma

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines