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 2317 by chrisfen, Wed Sep 21 17:20:14 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.48 2005-09-21 17:20:10 chrisfen Exp $, $Date: 2005-09-21 17:20:10 $, $Name: not supported by cvs2svn $, $Revision: 1.48 $
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 289 | Line 290 | contains
290            call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
291            
292  
293 <          if (i_is_LJ) then
294 <             thisRcut = getSigma(i) * 2.5_dp
295 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
296 <          endif
297 <          if (i_is_Elect) then
298 <             thisRcut = defaultRcut
299 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
300 <          endif
301 <          if (i_is_Sticky) then
302 <             thisRcut = getStickyCut(i)
303 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
304 <          endif
305 <          if (i_is_StickyP) then
306 <             thisRcut = getStickyPowerCut(i)
307 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
308 <          endif
309 <          if (i_is_GB) then
310 <             thisRcut = getGayBerneCut(i)
311 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
312 <          endif
313 <          if (i_is_EAM) then
314 <             thisRcut = getEAMCut(i)
315 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
316 <          endif
317 <          if (i_is_Shape) then
318 <             thisRcut = getShapeCut(i)
319 <             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
293 >          if (haveDefaultCutoffs) then
294 >             atypeMaxCutoff(i) = defaultRcut
295 >          else
296 >             if (i_is_LJ) then          
297 >                thisRcut = getSigma(i) * 2.5_dp
298 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
299 >             endif
300 >             if (i_is_Elect) then
301 >                thisRcut = defaultRcut
302 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
303 >             endif
304 >             if (i_is_Sticky) then
305 >                thisRcut = getStickyCut(i)
306 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
307 >             endif
308 >             if (i_is_StickyP) then
309 >                thisRcut = getStickyPowerCut(i)
310 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
311 >             endif
312 >             if (i_is_GB) then
313 >                thisRcut = getGayBerneCut(i)
314 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
315 >             endif
316 >             if (i_is_EAM) then
317 >                thisRcut = getEAMCut(i)
318 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
319 >             endif
320 >             if (i_is_Shape) then
321 >                thisRcut = getShapeCut(i)
322 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
323 >             endif
324            endif
325            
326 +          
327            if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
328               biggestAtypeCutoff = atypeMaxCutoff(i)
329            endif
330 +
331         endif
332      enddo
333    
# Line 406 | Line 413 | contains
413            skin = defaultRlist - defaultRcut
414            gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
415  
416 +          ! sanity check
417 +
418 +          if (haveDefaultCutoffs) then
419 +             if (abs(gtypeCutoffMap(i,j)%rcut - defaultRcut).gt.0.0001) then
420 +                call handleError("createGtypeCutoffMap", "user-specified rCut does not match computed group Cutoff")
421 +             endif
422 +          endif
423         enddo
424      enddo
425 <    
425 >
426      haveGtypeCutoffMap = .true.
427     end subroutine createGtypeCutoffMap
428  
# Line 420 | Line 434 | contains
434       defaultRsw = defRsw
435       defaultRlist = defRlist
436       cutoffPolicy = cutPolicy
437 +
438 +     haveDefaultCutoffs = .true.
439     end subroutine setDefaultCutoffs
440  
441     subroutine setCutoffPolicy(cutPolicy)
# Line 768 | Line 784 | contains
784               me_j = atid(j)
785               call get_interatomic_vector(q_group(:,i), &
786                    q_group(:,j), d_grp, rgrpsq)
787 < #endif
787 > #endif      
788  
789               if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
790                  if (update_nlist) then

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines