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

Comparing trunk/OOPSE-3.0/src/UseTheForce/doForces.F90 (file contents):
Revision 2274 by gezelter, Wed Aug 17 15:26:42 2005 UTC vs.
Revision 2281 by gezelter, Thu Sep 1 22:56:20 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.35 2005-09-01 22:56:20 gezelter Exp $, $Date: 2005-09-01 22:56:20 $, $Name: not supported by cvs2svn $, $Revision: 1.35 $
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 >    
334 >    !! first we do a single loop over the cutoff groups to find the
335 >    !! largest cutoff for any atypes present in this group.  We also
336 >    !! create gtypes at this point.
337 >    
338 >    tol = 1.0d-6
339 >    
340 >    do i = istart, iend      
341 >       n_in_i = groupStartRow(i+1) - groupStartRow(i)
342 >       groupMaxCutoff(i) = 0.0_dp
343 >       do ia = groupStartRow(i), groupStartRow(i+1)-1
344 >          atom1 = groupListRow(ia)
345 > #ifdef IS_MPI
346 >          me_i = atid_row(atom1)
347   #else
348 <             jstart = i+1
349 <             jend = nGroups
350 < #endif
351 <
352 <
353 <
354 <            
355 <
356 <
357 <
358 <     haveGtypeCutoffMap = .true.
359 <   end subroutine createGtypeCutoffMap
360 <
361 <   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
362 <     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
363 <     integer, intent(in) :: cutPolicy
364 <
365 <     defaultRcut = defRcut
366 <     defaultRsw = defRsw
367 <     defaultRlist = defRlist
368 <     cutoffPolicy = cutPolicy
369 <   end subroutine setDefaultCutoffs
370 <
371 <   subroutine setCutoffPolicy(cutPolicy)
348 >          me_i = atid(atom1)
349 > #endif          
350 >          if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
351 >             groupMaxCutoff(i)=atypeMaxCutoff(me_i)
352 >          endif
353 >       enddo
354 >       if (nGroupTypes.eq.0) then
355 >          nGroupTypes = nGroupTypes + 1
356 >          gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
357 >          groupToGtype(i) = nGroupTypes
358 >       else
359 >          do g = 1, nGroupTypes
360 >             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).gt.tol) then
361 >                nGroupTypes = nGroupTypes + 1
362 >                gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
363 >                groupToGtype(i) = nGroupTypes
364 >             else
365 >                groupToGtype(i) = g
366 >             endif
367 >          enddo
368 >       endif
369 >    enddo
370 >    
371 >    !! allocate the gtypeCutoffMap here.
372 >    
373 >    !! then we do a double loop over all the group TYPES to find the cutoff
374 >    !! map between groups of two types
375 >    
376 >    do i = 1, nGroupTypes
377 >       do j = 1, nGroupTypes
378 >      
379 >          select case(cutoffPolicy)
380 >          case(TRADITIONAL_CUTOFF_POLICY)
381 >             thisRcut = maxval(gtypeMaxCutoff)
382 >          case(MIX_CUTOFF_POLICY)
383 >             thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
384 >          case(MAX_CUTOFF_POLICY)
385 >             thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
386 >          case default
387 >             call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
388 >             return
389 >          end select
390 >          gtypeCutoffMap(i,j)%rcut = thisRcut
391 >          gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
392 >          skin = defaultRlist - defaultRcut
393 >          gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
394 >       enddo
395 >    enddo
396 >    
397 >    haveGtypeCutoffMap = .true.
398 >  end subroutine createGtypeCutoffMap
399 >  
400 >  subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
401 >    real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
402 >    integer, intent(in) :: cutPolicy
403 >    
404 >    defaultRcut = defRcut
405 >    defaultRsw = defRsw
406 >    defaultRlist = defRlist
407 >    cutoffPolicy = cutPolicy
408 >  end subroutine setDefaultCutoffs
409 >  
410 >  subroutine setCutoffPolicy(cutPolicy)
411  
412       integer, intent(in) :: cutPolicy
413       cutoffPolicy = cutPolicy
414       call createGtypeCutoffMap()
415  
416 <   end subroutine setDefaultCutoffs
416 >   end subroutine setCutoffPolicy
417      
418      
419    subroutine setSimVariables()
# Line 426 | Line 489 | contains
489    end subroutine doReadyCheck
490  
491  
492 <  subroutine init_FF(use_RF_c, thisStat)
492 >  subroutine init_FF(use_RF, use_UW, use_DW, thisStat)
493  
494 <    logical, intent(in) :: use_RF_c
495 <
494 >    logical, intent(in) :: use_RF
495 >    logical, intent(in) :: use_UW
496 >    logical, intent(in) :: use_DW
497      integer, intent(out) :: thisStat  
498      integer :: my_status, nMatches
499 +    integer :: corrMethod
500      integer, pointer :: MatchList(:) => null()
501      real(kind=dp) :: rcut, rrf, rt, dielect
502  
# Line 439 | Line 504 | contains
504      thisStat = 0
505  
506      !! Fortran's version of a cast:
507 <    FF_uses_RF = use_RF_c
507 >    FF_uses_RF = use_RF
508  
509 +    !! set the electrostatic correction method
510 +    if (use_UW) then
511 +       corrMethod = 1
512 +    elseif (use_DW) then
513 +       corrMethod = 2
514 +    else
515 +       corrMethod = 0
516 +    endif
517 +    
518      !! init_FF is called *after* all of the atom types have been
519      !! defined in atype_module using the new_atype subroutine.
520      !!
# Line 696 | Line 770 | contains
770                    q_group(:,j), d_grp, rgrpsq)
771   #endif
772  
773 <             if (rgrpsq < InteractionHash(me_i,me_j)%rListsq) then
773 >             if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
774                  if (update_nlist) then
775                     nlist = nlist + 1
776  
# Line 1005 | Line 1079 | contains
1079  
1080      if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1081         call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1082 <            pot, eFrame, f, t, do_pot)
1082 >            pot, eFrame, f, t, do_pot, corrMethod)
1083  
1084         if (FF_uses_RF .and. SIM_uses_RF) then
1085  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines