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

Comparing trunk/OOPSE-4/src/UseTheForce/doForces.F90 (file contents):
Revision 2310 by chrisfen, Mon Sep 19 23:21:46 2005 UTC vs.
Revision 2342 by chrisfen, Tue Oct 4 19:32:58 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.47 2005-09-19 23:21:46 chrisfen Exp $, $Date: 2005-09-19 23:21:46 $, $Name: not supported by cvs2svn $, $Revision: 1.47 $
48 > !! @version $Id: doForces.F90,v 1.50 2005-10-04 19:32:58 chrisfen Exp $, $Date: 2005-10-04 19:32:58 $, $Name: not supported by cvs2svn $, $Revision: 1.50 $
49  
50  
51   module doForces
# Line 86 | Line 86 | module doForces
86    logical, save :: haveSaneForceField = .false.
87    logical, save :: haveInteractionHash = .false.
88    logical, save :: haveGtypeCutoffMap = .false.
89 +  logical, save :: haveDefaultCutoffs = .false.
90    logical, save :: haveRlist = .false.
91  
92    logical, save :: FF_uses_DirectionalAtoms
# Line 135 | Line 136 | module doForces
136  
137    integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY
138    real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist
139 +  real(kind=dp),save :: listSkin
140    
141   contains
142  
# Line 289 | Line 291 | contains
291            call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
292            
293  
294 <          if (i_is_LJ) then
295 <             thisRcut = getSigma(i) * 2.5_dp
296 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
297 <          endif
298 <          if (i_is_Elect) then
299 <             thisRcut = defaultRcut
300 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
301 <          endif
302 <          if (i_is_Sticky) then
303 <             thisRcut = getStickyCut(i)
304 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
305 <          endif
306 <          if (i_is_StickyP) then
307 <             thisRcut = getStickyPowerCut(i)
308 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
309 <          endif
310 <          if (i_is_GB) then
311 <             thisRcut = getGayBerneCut(i)
312 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
313 <          endif
314 <          if (i_is_EAM) then
315 <             thisRcut = getEAMCut(i)
316 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
317 <          endif
318 <          if (i_is_Shape) then
319 <             thisRcut = getShapeCut(i)
320 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
294 >          if (haveDefaultCutoffs) then
295 >             atypeMaxCutoff(i) = defaultRcut
296 >          else
297 >             if (i_is_LJ) then          
298 >                thisRcut = getSigma(i) * 2.5_dp
299 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
300 >             endif
301 >             if (i_is_Elect) then
302 >                thisRcut = defaultRcut
303 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
304 >             endif
305 >             if (i_is_Sticky) then
306 >                thisRcut = getStickyCut(i)
307 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
308 >             endif
309 >             if (i_is_StickyP) then
310 >                thisRcut = getStickyPowerCut(i)
311 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
312 >             endif
313 >             if (i_is_GB) then
314 >                thisRcut = getGayBerneCut(i)
315 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
316 >             endif
317 >             if (i_is_EAM) then
318 >                thisRcut = getEAMCut(i)
319 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
320 >             endif
321 >             if (i_is_Shape) then
322 >                thisRcut = getShapeCut(i)
323 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
324 >             endif
325            endif
326            
327 +          
328            if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
329               biggestAtypeCutoff = atypeMaxCutoff(i)
330            endif
331 +
332         endif
333      enddo
334    
# Line 404 | Line 412 | contains
412            gtypeCutoffMap(i,j)%rcut = thisRcut
413            gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
414            skin = defaultRlist - defaultRcut
415 +          listSkin = skin ! set neighbor list skin thickness
416            gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
417  
418 +          ! sanity check
419 +
420 +          if (haveDefaultCutoffs) then
421 +             if (abs(gtypeCutoffMap(i,j)%rcut - defaultRcut).gt.0.0001) then
422 +                call handleError("createGtypeCutoffMap", "user-specified rCut does not match computed group Cutoff")
423 +             endif
424 +          endif
425         enddo
426      enddo
427 <    
427 >
428      haveGtypeCutoffMap = .true.
429     end subroutine createGtypeCutoffMap
430  
# Line 420 | Line 436 | contains
436       defaultRsw = defRsw
437       defaultRlist = defRlist
438       cutoffPolicy = cutPolicy
439 +
440 +     haveDefaultCutoffs = .true.
441     end subroutine setDefaultCutoffs
442  
443     subroutine setCutoffPolicy(cutPolicy)
# Line 643 | Line 661 | contains
661      integer :: propPack_i, propPack_j
662      integer :: loopStart, loopEnd, loop
663      integer :: iHash
664 <    real(kind=dp) :: listSkin = 1.0  
664 >  
665  
666      !! initialize local variables  
667  
# Line 768 | Line 786 | contains
786               me_j = atid(j)
787               call get_interatomic_vector(q_group(:,i), &
788                    q_group(:,j), d_grp, rgrpsq)
789 < #endif
789 > #endif      
790  
791               if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
792                  if (update_nlist) then
# Line 891 | Line 909 | contains
909                  endif
910               end if
911            enddo
912 +
913         enddo outer
914  
915         if (update_nlist) then

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines