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

Comparing trunk/OOPSE-2.0/src/UseTheForce/doForces.F90 (file contents):
Revision 2280 by gezelter, Thu Sep 1 20:17:55 2005 UTC vs.
Revision 2290 by gezelter, Wed Sep 14 20:28:05 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.34 2005-09-01 20:17:55 gezelter Exp $, $Date: 2005-09-01 20:17:55 $, $Name: not supported by cvs2svn $, $Revision: 1.34 $
48 > !! @version $Id: doForces.F90,v 1.41 2005-09-14 20:28:05 gezelter Exp $, $Date: 2005-09-14 20:28:05 $, $Name: not supported by cvs2svn $, $Revision: 1.41 $
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
263 +    integer :: nGroupsInRow
264      real(kind=dp):: thisSigma, bigSigma, thisRcut, tol, skin
265      real(kind=dp) :: biggestAtypeCutoff
266  
# Line 271 | Line 273 | contains
273            return
274         endif
275      endif
276 <
276 > #ifdef IS_MPI
277 >    nGroupsInRow = getNgroupsInRow(plan_group_row)
278 > #endif
279      nAtypes = getSize(atypes)
280      
281      do i = 1, nAtypes
282 <       if (SimHasAtype(i)) then          
282 >       if (SimHasAtype(i)) then    
283            call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
284            call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
285            call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
# Line 284 | Line 288 | contains
288            call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
289            call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
290            
291 +          atypeMaxCutoff(i) = 0.0_dp
292            if (i_is_LJ) then
293               thisRcut = getSigma(i) * 2.5_dp
294               if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
# Line 327 | Line 332 | contains
332   #else
333      iend = nGroups
334   #endif
335 <
335 >    
336      !! allocate the groupToGtype and gtypeMaxCutoff here.
337 +    if(.not.allocated(groupToGtype)) then
338 +       allocate(groupToGtype(iend))
339 +       allocate(groupMaxCutoff(iend))
340 +       allocate(gtypeMaxCutoff(iend))
341 +    endif
342 +    !! first we do a single loop over the cutoff groups to find the
343 +    !! largest cutoff for any atypes present in this group.  We also
344 +    !! create gtypes at this point.
345      
333    !! first we do a single loop over the cutoff groups to find the largest cutoff for any atypes
334    !! present in this group.   We also create gtypes at this point.
346      tol = 1.0d-6
347      
348      do i = istart, iend      
# Line 346 | Line 357 | contains
357   #endif          
358            if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
359               groupMaxCutoff(i)=atypeMaxCutoff(me_i)
360 <          endif
360 >          endif          
361         enddo
362 +
363         if (nGroupTypes.eq.0) then
364            nGroupTypes = nGroupTypes + 1
365            gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
366            groupToGtype(i) = nGroupTypes
367         else
368 +          GtypeFound = .false.
369            do g = 1, nGroupTypes
370 <             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).gt.tol) then
358 <                nGroupTypes = nGroupTypes + 1
359 <                gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
360 <                groupToGtype(i) = nGroupTypes
361 <             else
370 >             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).lt.tol) then
371                  groupToGtype(i) = g
372 +                GtypeFound = .true.
373               endif
374            enddo
375 +          if (.not.GtypeFound) then            
376 +             nGroupTypes = nGroupTypes + 1
377 +             gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
378 +             groupToGtype(i) = nGroupTypes
379 +          endif
380         endif
381 <    enddo
367 <    
368 <    !! allocate the gtypeCutoffMap here.
381 >    enddo    
382  
383 +    !! allocate the gtypeCutoffMap here.
384 +    allocate(gtypeCutoffMap(nGroupTypes,nGroupTypes))
385      !! then we do a double loop over all the group TYPES to find the cutoff
386      !! map between groups of two types
387      
# Line 374 | Line 389 | contains
389         do j = 1, nGroupTypes
390        
391            select case(cutoffPolicy)
392 <             case(TRADITIONAL_CUTOFF_POLICY)
393 <                thisRcut = maxval(gtypeMaxCutoff)
394 <             case(MIX_CUTOFF_POLICY)
395 <                thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
396 <             case(MAX_CUTOFF_POLICY)
397 <                thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
398 <             case default
399 <                call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
400 <                return
401 <          end select      
402 <         gtypeCutoffMap(i,j)%rcut = thisRcut
403 <         gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
404 <         skin = defaultRlist - defaultRcut
405 <         gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
392 >          case(TRADITIONAL_CUTOFF_POLICY)
393 >             thisRcut = maxval(gtypeMaxCutoff)
394 >          case(MIX_CUTOFF_POLICY)
395 >             thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
396 >          case(MAX_CUTOFF_POLICY)
397 >             thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
398 >          case default
399 >             call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
400 >             return
401 >          end select
402 >          gtypeCutoffMap(i,j)%rcut = thisRcut
403 >          gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
404 >          skin = defaultRlist - defaultRcut
405 >          gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
406 >
407         enddo
408      enddo
409      
410      haveGtypeCutoffMap = .true.
411 <   end subroutine createGtypeCutoffMap
412 <
413 <   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
414 <     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
415 <     integer, intent(in) :: cutPolicy
416 <
417 <     defaultRcut = defRcut
418 <     defaultRsw = defRsw
419 <     defaultRlist = defRlist
420 <     cutoffPolicy = cutPolicy
421 <   end subroutine setDefaultCutoffs
422 <
423 <   subroutine setCutoffPolicy(cutPolicy)
411 >    
412 >  end subroutine createGtypeCutoffMap
413 >  
414 >  subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
415 >    real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
416 >    integer, intent(in) :: cutPolicy
417 >    
418 >    defaultRcut = defRcut
419 >    defaultRsw = defRsw
420 >    defaultRlist = defRlist
421 >    cutoffPolicy = cutPolicy
422 >  end subroutine setDefaultCutoffs
423 >  
424 >  subroutine setCutoffPolicy(cutPolicy)
425  
426       integer, intent(in) :: cutPolicy
427       cutoffPolicy = cutPolicy
# Line 457 | Line 474 | contains
474         call setSimVariables()
475      endif
476  
477 <    if (.not. haveRlist) then
478 <       write(default_error, *) 'rList has not been set in doForces!'
479 <       error = -1
480 <       return
481 <    endif
477 >  !  if (.not. haveRlist) then
478 >  !     write(default_error, *) 'rList has not been set in doForces!'
479 >  !     error = -1
480 >  !     return
481 >  !  endif
482  
483      if (.not. haveNeighborList) then
484         write(default_error, *) 'neighbor list has not been initialized in doForces!'
# Line 1140 | Line 1157 | contains
1157      real ( kind = dp ), intent(inout) :: d(3), dc(3)
1158  
1159      integer :: me_i, me_j, iHash
1160 +
1161 +    r = sqrt(rijsq)
1162  
1163   #ifdef IS_MPI  
1164      me_i = atid_row(i)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines