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 2273 by gezelter, Thu Aug 11 21:04:03 2005 UTC vs.
Revision 2284 by gezelter, Wed Sep 7 19:18:54 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.29 2005-08-11 21:04:03 gezelter Exp $, $Date: 2005-08-11 21:04:03 $, $Name: not supported by cvs2svn $, $Revision: 1.29 $
48 > !! @version $Id: doForces.F90,v 1.37 2005-09-07 19:18:54 gezelter Exp $, $Date: 2005-09-07 19:18:54 $, $Name: not supported by cvs2svn $, $Revision: 1.37 $
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
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 260 | Line 273 | contains
273      endif
274  
275      nAtypes = getSize(atypes)
276 <
276 >    
277      do i = 1, nAtypes
278 <       call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
279 <       call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
280 <       call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
281 <       call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
282 <       call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
283 <       call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
284 <       call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
285 <      
286 <       if (i_is_LJ) then
287 <          thisCut = getSigma(i) * DEFAULT_SIGMA_MULTIPLIER
288 <          if (thisCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisCut
289 <       endif
290 <       if (i_is_Elect) then
291 <          thisCut =
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)
282 >          call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
283 >          call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
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
291 >          endif
292 >          if (i_is_Elect) then
293 >             thisRcut = defaultRcut
294 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
295 >          endif
296 >          if (i_is_Sticky) then
297 >             thisRcut = getStickyCut(i)
298 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
299 >          endif
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_GB) then
305 >             thisRcut = getGayBerneCut(i)
306 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
307 >          endif
308 >          if (i_is_EAM) then
309 >             thisRcut = getEAMCut(i)
310 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
311 >          endif
312 >          if (i_is_Shape) then
313 >             thisRcut = getShapeCut(i)
314 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
315 >          endif
316 >          
317 >          if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
318 >             biggestAtypeCutoff = atypeMaxCutoff(i)
319 >          endif
320 >       endif
321 >    enddo
322 >  
323 >    nGroupTypes = 0
324      
325 <
326 <
327 <
328 <     haveGtypeCutoffMap = .true.
329 <   end subroutine createGtypeCutoffMap
330 <
331 <   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
332 <     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
333 <     integer, intent(in) :: cutPolicy
334 <
335 <     defaultRcut = defRcut
336 <     defaultRsw = defRsw
337 <     defaultRlist = defRlist
338 <     cutoffPolicy = cutPolicy
339 <   end subroutine setDefaultCutoffs
325 >    istart = 1
326 > #ifdef IS_MPI
327 >    iend = nGroupsInRow
328 > #else
329 >    iend = nGroups
330 > #endif
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 >          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  
399 <   subroutine setCutoffPolicy(cutPolicy)
399 >       enddo
400 >    enddo
401 >    
402 >    haveGtypeCutoffMap = .true.
403 >    
404 >  end subroutine createGtypeCutoffMap
405 >  
406 >  subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
407 >    real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
408 >    integer, intent(in) :: cutPolicy
409 >    
410 >    defaultRcut = defRcut
411 >    defaultRsw = defRsw
412 >    defaultRlist = defRlist
413 >    cutoffPolicy = cutPolicy
414 >  end subroutine setDefaultCutoffs
415 >  
416 >  subroutine setCutoffPolicy(cutPolicy)
417  
418       integer, intent(in) :: cutPolicy
419       cutoffPolicy = cutPolicy
420       call createGtypeCutoffMap()
421  
422 <   end subroutine setDefaultCutoffs
422 >   end subroutine setCutoffPolicy
423      
424      
425    subroutine setSimVariables()
# Line 346 | Line 466 | contains
466         call setSimVariables()
467      endif
468  
469 <    if (.not. haveRlist) then
470 <       write(default_error, *) 'rList has not been set in doForces!'
471 <       error = -1
472 <       return
473 <    endif
469 >  !  if (.not. haveRlist) then
470 >  !     write(default_error, *) 'rList has not been set in doForces!'
471 >  !     error = -1
472 >  !     return
473 >  !  endif
474  
475      if (.not. haveNeighborList) then
476         write(default_error, *) 'neighbor list has not been initialized in doForces!'
# Line 375 | Line 495 | contains
495    end subroutine doReadyCheck
496  
497  
498 <  subroutine init_FF(use_RF_c, thisStat)
498 >  subroutine init_FF(use_RF, use_UW, use_DW, thisStat)
499  
500 <    logical, intent(in) :: use_RF_c
501 <
500 >    logical, intent(in) :: use_RF
501 >    logical, intent(in) :: use_UW
502 >    logical, intent(in) :: use_DW
503      integer, intent(out) :: thisStat  
504      integer :: my_status, nMatches
505 +    integer :: corrMethod
506      integer, pointer :: MatchList(:) => null()
507      real(kind=dp) :: rcut, rrf, rt, dielect
508  
# Line 388 | Line 510 | contains
510      thisStat = 0
511  
512      !! Fortran's version of a cast:
513 <    FF_uses_RF = use_RF_c
513 >    FF_uses_RF = use_RF
514  
515 +    !! set the electrostatic correction method
516 +    if (use_UW) then
517 +       corrMethod = 1
518 +    elseif (use_DW) then
519 +       corrMethod = 2
520 +    else
521 +       corrMethod = 0
522 +    endif
523 +    
524      !! init_FF is called *after* all of the atom types have been
525      !! defined in atype_module using the new_atype subroutine.
526      !!
# Line 608 | Line 739 | contains
739         iend = nGroups - 1
740   #endif
741         outer: do i = istart, iend
611
612 #ifdef IS_MPI
613             me_i = atid_row(i)
614 #else
615             me_i = atid(i)
616 #endif
742  
743            if (update_nlist) point(i) = nlist + 1
744  
# Line 651 | Line 776 | contains
776                    q_group(:,j), d_grp, rgrpsq)
777   #endif
778  
779 <             if (rgrpsq < InteractionHash(me_i,me_j)%rListsq) then
779 >             if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
780                  if (update_nlist) then
781                     nlist = nlist + 1
782  
# Line 960 | Line 1085 | contains
1085  
1086      if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1087         call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1088 <            pot, eFrame, f, t, do_pot)
1088 >            pot, eFrame, f, t, do_pot, corrMethod)
1089  
1090         if (FF_uses_RF .and. SIM_uses_RF) then
1091  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines