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 2279 by chrisfen, Tue Aug 30 18:23:50 2005 UTC vs.
Revision 2288 by chuckv, Wed Sep 7 22:44:48 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.33 2005-08-30 18:23:29 chrisfen Exp $, $Date: 2005-08-30 18:23:29 $, $Name: not supported by cvs2svn $, $Revision: 1.33 $
48 > !! @version $Id: doForces.F90,v 1.40 2005-09-07 22:44:48 chuckv Exp $, $Date: 2005-09-07 22:44:48 $, $Name: not supported by cvs2svn $, $Revision: 1.40 $
49  
50  
51   module doForces
# Line 85 | Line 85 | module doForces
85    logical, save :: haveSaneForceField = .false.
86    logical, save :: haveInteractionHash = .false.
87    logical, save :: haveGtypeCutoffMap = .false.
88 +  logical, save :: haveRlist = .false.
89  
90    logical, save :: FF_uses_DirectionalAtoms
91    logical, save :: FF_uses_Dipoles
# Line 255 | 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
263 <    real(kind=dp):: thisSigma, bigSigma, thisRcut
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  
267      stat = 0
# Line 270 | 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 283 | 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 317 | Line 323 | contains
323            endif
324         endif
325      enddo
326 <
326 >  
327 >    nGroupTypes = 0
328 >    
329      istart = 1
330   #ifdef IS_MPI
331      iend = nGroupsInRow
332   #else
333      iend = nGroups
334   #endif
335 <    outer: do i = istart, iend
336 <      
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 >    
346 >    tol = 1.0d-6
347 >    
348 >    do i = istart, iend      
349         n_in_i = groupStartRow(i+1) - groupStartRow(i)
350 <      
350 >       groupMaxCutoff(i) = 0.0_dp
351 >       do ia = groupStartRow(i), groupStartRow(i+1)-1
352 >          atom1 = groupListRow(ia)
353   #ifdef IS_MPI
354 <       jstart = 1
333 <       jend = nGroupsInCol
354 >          me_i = atid_row(atom1)
355   #else
356 <       jstart = i+1
357 <       jend = nGroups
358 < #endif
359 <      
360 <      
361 <      
341 <      
342 <      
343 <      
344 <    enddo outer        
345 <    
346 <     haveGtypeCutoffMap = .true.
347 <   end subroutine createGtypeCutoffMap
356 >          me_i = atid(atom1)
357 > #endif          
358 >          if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
359 >             groupMaxCutoff(i)=atypeMaxCutoff(me_i)
360 >          endif          
361 >       enddo
362  
363 <   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
364 <     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
365 <     integer, intent(in) :: cutPolicy
366 <
367 <     defaultRcut = defRcut
368 <     defaultRsw = defRsw
369 <     defaultRlist = defRlist
370 <     cutoffPolicy = cutPolicy
371 <   end subroutine setDefaultCutoffs
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)).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    
382  
383 <   subroutine setCutoffPolicy(cutPolicy)
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 >    
388 >    do i = 1, nGroupTypes
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
406  
407 +       enddo
408 +    enddo
409 +    
410 +    haveGtypeCutoffMap = .true.
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
428       call createGtypeCutoffMap()
# Line 409 | 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 438 | Line 503 | contains
503    end subroutine doReadyCheck
504  
505  
506 <  subroutine init_FF(use_RF_c, use_UW_c, use_DW_c, thisStat)
506 >  subroutine init_FF(use_RF, use_UW, use_DW, thisStat)
507  
508 <    logical, intent(in) :: use_RF_c
509 <    logical, intent(in) :: use_UW_c
510 <    logical, intent(in) :: use_DW_c
508 >    logical, intent(in) :: use_RF
509 >    logical, intent(in) :: use_UW
510 >    logical, intent(in) :: use_DW
511      integer, intent(out) :: thisStat  
512      integer :: my_status, nMatches
513      integer :: corrMethod
# Line 453 | Line 518 | contains
518      thisStat = 0
519  
520      !! Fortran's version of a cast:
521 <    FF_uses_RF = use_RF_c
521 >    FF_uses_RF = use_RF
522  
523      !! set the electrostatic correction method
524 <    if (use_UW_c .eq. .true.) then
524 >    if (use_UW) then
525         corrMethod = 1
526 <    elseif (use_DW_c .eq. .true.) then
526 >    elseif (use_DW) then
527         corrMethod = 2
528      else
529         corrMethod = 0
# Line 719 | Line 784 | contains
784                    q_group(:,j), d_grp, rgrpsq)
785   #endif
786  
787 <             if (rgrpsq < InteractionHash(me_i,me_j)%rListsq) then
787 >             if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
788                  if (update_nlist) then
789                     nlist = nlist + 1
790  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines