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 2274 by gezelter, Wed Aug 17 15:26:42 2005 UTC vs.
Revision 2282 by chuckv, Tue Sep 6 17:32:42 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.30 2005-08-17 15:26:37 gezelter Exp $, $Date: 2005-08-17 15:26:37 $, $Name: not supported by cvs2svn $, $Revision: 1.30 $
48 > !! @version $Id: doForces.F90,v 1.36 2005-09-06 17:32:42 chuckv Exp $, $Date: 2005-09-06 17:32:42 $, $Name: not supported by cvs2svn $, $Revision: 1.36 $
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 99 | Line 100 | module doForces
100    logical, save :: SIM_requires_prepair_calc
101    logical, save :: SIM_uses_PBC
102  
103 +  integer, save :: corrMethod
104 +
105    public :: init_FF
106    public :: setDefaultCutoffs
107    public :: do_force_loop
108    public :: createInteractionHash
109    public :: createGtypeCutoffMap
110 +  public :: getStickyCut
111 +  public :: getStickyPowerCut
112 +  public :: getGayBerneCut
113 +  public :: getEAMCut
114 +  public :: getShapeCut
115  
116   #ifdef PROFILE
117    public :: getforcetime
# Line 152 | Line 160 | contains
160      logical :: j_is_GB
161      logical :: j_is_EAM
162      logical :: j_is_Shape
163 <    
163 >    real(kind=dp) :: myRcut
164 >
165      status = 0  
166  
167      if (.not. associated(atypes)) then
# Line 237 | Line 246 | contains
246      haveInteractionHash = .true.
247    end subroutine createInteractionHash
248  
249 <  subroutine createGtypeCutoffMap()
249 >  subroutine createGtypeCutoffMap(stat)
250  
251 +    integer, intent(out), optional :: stat
252      logical :: i_is_LJ
253      logical :: i_is_Elect
254      logical :: i_is_Sticky
# Line 247 | Line 257 | contains
257      logical :: i_is_EAM
258      logical :: i_is_Shape
259  
260 <    integer :: myStatus, nAtypes
261 <    real(kind=dp):: thisSigma, bigSigma
260 >    integer :: myStatus, nAtypes,  i, j, istart, iend, jstart, jend
261 >    integer :: n_in_i, me_i, ia, g, atom1, nGroupTypes
262 >    real(kind=dp):: thisSigma, bigSigma, thisRcut, tol, skin
263 >    real(kind=dp) :: biggestAtypeCutoff
264  
265      stat = 0
266      if (.not. haveInteractionHash) then
# Line 263 | Line 275 | contains
275      nAtypes = getSize(atypes)
276      
277      do i = 1, nAtypes
278 <       if (SimHasAtype(i)) then          
278 >       if (SimHasAtype(i)) then    
279            call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
280            call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
281            call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
# Line 272 | Line 284 | contains
284            call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
285            call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
286            
287 +          atypeMaxCutoff(i) = 0.0_dp
288            if (i_is_LJ) then
289               thisRcut = getSigma(i) * 2.5_dp
290               if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
# Line 284 | Line 297 | contains
297               thisRcut = getStickyCut(i)
298               if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
299            endif
300 <          if (i_is_StickyPower) then
300 >          if (i_is_StickyP) then
301               thisRcut = getStickyPowerCut(i)
302               if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
303            endif
304 <          if (i_is_GayBerne) then
304 >          if (i_is_GB) then
305               thisRcut = getGayBerneCut(i)
306               if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
307            endif
# Line 306 | Line 319 | contains
319            endif
320         endif
321      enddo
322 <
322 >  
323 >    nGroupTypes = 0
324 >    
325      istart = 1
326   #ifdef IS_MPI
327      iend = nGroupsInRow
328   #else
329      iend = nGroups
330   #endif
331 <    outer: do i = istart, iend
332 <
333 <       n_in_i = groupStartRow(i+1) - groupStartRow(i)
334 <
335 < #ifdef IS_MPI
336 <             jstart = 1
337 <             jend = nGroupsInCol
331 >    
332 >    !! allocate the groupToGtype and gtypeMaxCutoff here.
333 >    if(.not.allocated(groupToGtype)) then
334 >       allocate(groupToGtype(iend))
335 >       allocate(groupMaxCutoff(iend))
336 >       allocate(gtypeMaxCutoff(iend))
337 >    endif
338 >    !! first we do a single loop over the cutoff groups to find the
339 >    !! largest cutoff for any atypes present in this group.  We also
340 >    !! create gtypes at this point.
341 >    
342 >    tol = 1.0d-6
343 >    
344 >    do i = istart, iend      
345 >       n_in_i = groupStartRow(i+1) - groupStartRow(i)
346 >       groupMaxCutoff(i) = 0.0_dp
347 >       do ia = groupStartRow(i), groupStartRow(i+1)-1
348 >          atom1 = groupListRow(ia)
349 > #ifdef IS_MPI
350 >          me_i = atid_row(atom1)
351   #else
352 <             jstart = i+1
353 <             jend = nGroups
354 < #endif
355 <
356 <
357 <
358 <            
359 <
360 <
361 <
362 <     haveGtypeCutoffMap = .true.
363 <   end subroutine createGtypeCutoffMap
364 <
365 <   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
366 <     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
367 <     integer, intent(in) :: cutPolicy
368 <
369 <     defaultRcut = defRcut
370 <     defaultRsw = defRsw
371 <     defaultRlist = defRlist
372 <     cutoffPolicy = cutPolicy
373 <   end subroutine setDefaultCutoffs
374 <
375 <   subroutine setCutoffPolicy(cutPolicy)
352 >          me_i = atid(atom1)
353 > #endif          
354 >          if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
355 >             groupMaxCutoff(i)=atypeMaxCutoff(me_i)
356 >          endif
357 >       enddo
358 >       if (nGroupTypes.eq.0) then
359 >          nGroupTypes = nGroupTypes + 1
360 >          gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
361 >          groupToGtype(i) = nGroupTypes
362 >       else
363 >          do g = 1, nGroupTypes
364 >             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).gt.tol) then
365 >                nGroupTypes = nGroupTypes + 1
366 >                gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
367 >                groupToGtype(i) = nGroupTypes
368 >             else
369 >                groupToGtype(i) = g
370 >             endif
371 >          enddo
372 >       endif
373 >    enddo
374 >    
375 >    !! allocate the gtypeCutoffMap here.
376 >    allocate(gtypeCutoffMap(nGroupTypes,nGroupTypes))
377 >    !! then we do a double loop over all the group TYPES to find the cutoff
378 >    !! map between groups of two types
379 >    
380 >    do i = 1, nGroupTypes
381 >       do j = 1, nGroupTypes
382 >      
383 >          select case(cutoffPolicy)
384 >          case(TRADITIONAL_CUTOFF_POLICY)
385 >             thisRcut = maxval(gtypeMaxCutoff)
386 >          case(MIX_CUTOFF_POLICY)
387 >             thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
388 >          case(MAX_CUTOFF_POLICY)
389 >             thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
390 >          case default
391 >             call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
392 >             return
393 >          end select
394 >          gtypeCutoffMap(i,j)%rcut = thisRcut
395 >          gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
396 >          skin = defaultRlist - defaultRcut
397 >          gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
398 >       enddo
399 >    enddo
400 >    
401 >    haveGtypeCutoffMap = .true.
402 >    
403 >  end subroutine createGtypeCutoffMap
404 >  
405 >  subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
406 >    real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
407 >    integer, intent(in) :: cutPolicy
408 >    
409 >    defaultRcut = defRcut
410 >    defaultRsw = defRsw
411 >    defaultRlist = defRlist
412 >    cutoffPolicy = cutPolicy
413 >  end subroutine setDefaultCutoffs
414 >  
415 >  subroutine setCutoffPolicy(cutPolicy)
416  
417       integer, intent(in) :: cutPolicy
418       cutoffPolicy = cutPolicy
419       call createGtypeCutoffMap()
420  
421 <   end subroutine setDefaultCutoffs
421 >   end subroutine setCutoffPolicy
422      
423      
424    subroutine setSimVariables()
# Line 397 | Line 465 | contains
465         call setSimVariables()
466      endif
467  
468 <    if (.not. haveRlist) then
469 <       write(default_error, *) 'rList has not been set in doForces!'
470 <       error = -1
471 <       return
472 <    endif
468 >  !  if (.not. haveRlist) then
469 >  !     write(default_error, *) 'rList has not been set in doForces!'
470 >  !     error = -1
471 >  !     return
472 >  !  endif
473  
474      if (.not. haveNeighborList) then
475         write(default_error, *) 'neighbor list has not been initialized in doForces!'
# Line 426 | Line 494 | contains
494    end subroutine doReadyCheck
495  
496  
497 <  subroutine init_FF(use_RF_c, thisStat)
497 >  subroutine init_FF(use_RF, use_UW, use_DW, thisStat)
498  
499 <    logical, intent(in) :: use_RF_c
500 <
499 >    logical, intent(in) :: use_RF
500 >    logical, intent(in) :: use_UW
501 >    logical, intent(in) :: use_DW
502      integer, intent(out) :: thisStat  
503      integer :: my_status, nMatches
504 +    integer :: corrMethod
505      integer, pointer :: MatchList(:) => null()
506      real(kind=dp) :: rcut, rrf, rt, dielect
507  
# Line 439 | Line 509 | contains
509      thisStat = 0
510  
511      !! Fortran's version of a cast:
512 <    FF_uses_RF = use_RF_c
512 >    FF_uses_RF = use_RF
513  
514 +    !! set the electrostatic correction method
515 +    if (use_UW) then
516 +       corrMethod = 1
517 +    elseif (use_DW) then
518 +       corrMethod = 2
519 +    else
520 +       corrMethod = 0
521 +    endif
522 +    
523      !! init_FF is called *after* all of the atom types have been
524      !! defined in atype_module using the new_atype subroutine.
525      !!
# Line 696 | Line 775 | contains
775                    q_group(:,j), d_grp, rgrpsq)
776   #endif
777  
778 <             if (rgrpsq < InteractionHash(me_i,me_j)%rListsq) then
778 >             if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
779                  if (update_nlist) then
780                     nlist = nlist + 1
781  
# Line 1005 | Line 1084 | contains
1084  
1085      if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1086         call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1087 <            pot, eFrame, f, t, do_pot)
1087 >            pot, eFrame, f, t, do_pot, corrMethod)
1088  
1089         if (FF_uses_RF .and. SIM_uses_RF) then
1090  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines