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 2318 by chrisfen, Wed Sep 21 17:20:14 2005 UTC vs.
Revision 2319 by chuckv, Wed Sep 21 23:45:48 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.15 2005-09-21 17:20:14 chrisfen Exp $, $Date: 2005-09-21 17:20:14 $, $Name: not supported by cvs2svn $, $Revision: 1.15 $
46 > !! @version $Id: LJ.F90,v 1.16 2005-09-21 23:45:48 chuckv Exp $, $Date: 2005-09-21 23:45:48 $, $Name: not supported by cvs2svn $, $Revision: 1.16 $
47  
48  
49   module lj
# Line 77 | Line 77 | module lj
77    end type LJtype
78  
79    type, private :: LJList
80 <     integer               :: nLJtypes = 0
80 >     integer               :: Nljtypes = 0
81       integer               :: currentLJtype = 0
82       type(LJtype), pointer :: LJtypes(:)      => null()
83       integer, pointer      :: atidToLJtype(:) => null()
# Line 157 | Line 157 | contains
157      defaultCutoff = thisRcut
158      defaultShift = shiftedPot
159      haveDefaultCutoff = .true.
160 <    call createMixingMap()
160 >    !we only want to build LJ Mixing map if LJ is being used.
161 >    if(LJMap%nLJTypes /= 0) then
162 >       call createMixingMap()
163 >    end if
164    end subroutine setLJDefaultCutoff
165  
166    subroutine setLJUniformCutoff(thisRcut, shiftedPot)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines