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 2285 by gezelter, Wed Sep 7 20:46:46 2005 UTC vs.
Revision 2286 by gezelter, Wed Sep 7 22:08:39 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.38 2005-09-07 20:46:39 gezelter Exp $, $Date: 2005-09-07 20:46:39 $, $Name: not supported by cvs2svn $, $Revision: 1.38 $
48 > !! @version $Id: doForces.F90,v 1.39 2005-09-07 22:08:39 gezelter Exp $, $Date: 2005-09-07 22:08:39 $, $Name: not supported by cvs2svn $, $Revision: 1.39 $
49  
50  
51   module doForces
# Line 256 | Line 256 | contains
256      logical :: i_is_GB
257      logical :: i_is_EAM
258      logical :: i_is_Shape
259 +    logical :: GtypeFound
260  
261      integer :: myStatus, nAtypes,  i, j, istart, iend, jstart, jend
262      integer :: n_in_i, me_i, ia, g, atom1, nGroupTypes
# Line 353 | Line 354 | contains
354   #endif          
355            if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
356               groupMaxCutoff(i)=atypeMaxCutoff(me_i)
357 <          endif
357 >          endif          
358         enddo
359 +
360         if (nGroupTypes.eq.0) then
361            nGroupTypes = nGroupTypes + 1
362            gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
363            groupToGtype(i) = nGroupTypes
364         else
365 +          GtypeFound = .false.
366            do g = 1, nGroupTypes
367 <             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).gt.tol) then
365 <                nGroupTypes = nGroupTypes + 1
366 <                gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
367 <                groupToGtype(i) = nGroupTypes
368 <             else
367 >             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).lt.tol) then
368                  groupToGtype(i) = g
369 +                GtypeFound = .true.
370               endif
371            enddo
372 +          if (.not.GtypeFound) then            
373 +             nGroupTypes = nGroupTypes + 1
374 +             gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
375 +             groupToGtype(i) = nGroupTypes
376 +          endif
377         endif
378 <    enddo
379 <    
378 >    enddo    
379 >
380      !! allocate the gtypeCutoffMap here.
381      allocate(gtypeCutoffMap(nGroupTypes,nGroupTypes))
382      !! then we do a double loop over all the group TYPES to find the cutoff
# Line 380 | Line 385 | contains
385      do i = 1, nGroupTypes
386         do j = 1, nGroupTypes
387        
383          write(*,*) 'cutoffPolicy = ', cutoffPolicy
388            select case(cutoffPolicy)
389            case(TRADITIONAL_CUTOFF_POLICY)
390               thisRcut = maxval(gtypeMaxCutoff)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines