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 2280 by gezelter, Thu Sep 1 20:17:55 2005 UTC vs.
Revision 2309 by chrisfen, Sun Sep 18 20:45:38 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.46 2005-09-18 20:45:38 chrisfen Exp $, $Date: 2005-09-18 20:45:38 $, $Name: not supported by cvs2svn $, $Revision: 1.46 $
49  
50  
51   module doForces
# Line 58 | Line 58 | module doForces
58    use lj
59    use sticky
60    use electrostatic_module
61 <  use reaction_field
61 >  use reaction_field_module
62    use gb_pair
63    use shapes
64    use vector_class
# Line 91 | Line 91 | module doForces
91    logical, save :: FF_uses_Dipoles
92    logical, save :: FF_uses_GayBerne
93    logical, save :: FF_uses_EAM
94  logical, save :: FF_uses_RF
94  
95    logical, save :: SIM_uses_DirectionalAtoms
96    logical, save :: SIM_uses_EAM
98  logical, save :: SIM_uses_RF
97    logical, save :: SIM_requires_postpair_calc
98    logical, save :: SIM_requires_prepair_calc
99    logical, save :: SIM_uses_PBC
100  
101 <  integer, save :: corrMethod
101 >  integer, save :: electrostaticSummationMethod
102  
103    public :: init_FF
104    public :: setDefaultCutoffs
# Line 256 | Line 254 | contains
254      logical :: i_is_GB
255      logical :: i_is_EAM
256      logical :: i_is_Shape
257 +    logical :: GtypeFound
258  
259      integer :: myStatus, nAtypes,  i, j, istart, iend, jstart, jend
260      integer :: n_in_i, me_i, ia, g, atom1, nGroupTypes
261 +    integer :: nGroupsInRow
262      real(kind=dp):: thisSigma, bigSigma, thisRcut, tol, skin
263      real(kind=dp) :: biggestAtypeCutoff
264  
# Line 271 | Line 271 | contains
271            return
272         endif
273      endif
274 <
274 > #ifdef IS_MPI
275 >    nGroupsInRow = getNgroupsInRow(plan_group_row)
276 > #endif
277      nAtypes = getSize(atypes)
278 <    
278 > ! Set all of the initial cutoffs to zero.
279 >    atypeMaxCutoff = 0.0_dp
280      do i = 1, nAtypes
281 <       if (SimHasAtype(i)) then          
281 >       if (SimHasAtype(i)) then    
282            call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
283            call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
284            call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
# Line 284 | Line 287 | contains
287            call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
288            call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
289            
290 +
291            if (i_is_LJ) then
292               thisRcut = getSigma(i) * 2.5_dp
293               if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
# Line 327 | Line 331 | contains
331   #else
332      iend = nGroups
333   #endif
334 <
334 >    
335      !! allocate the groupToGtype and gtypeMaxCutoff here.
336 +    if(.not.allocated(groupToGtype)) then
337 +       allocate(groupToGtype(iend))
338 +       allocate(groupMaxCutoff(iend))
339 +       allocate(gtypeMaxCutoff(iend))
340 +       groupMaxCutoff = 0.0_dp
341 +       gtypeMaxCutoff = 0.0_dp
342 +    endif
343 +    !! first we do a single loop over the cutoff groups to find the
344 +    !! largest cutoff for any atypes present in this group.  We also
345 +    !! create gtypes at this point.
346      
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.
347      tol = 1.0d-6
348      
349      do i = istart, iend      
# Line 346 | Line 358 | contains
358   #endif          
359            if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
360               groupMaxCutoff(i)=atypeMaxCutoff(me_i)
361 <          endif
361 >          endif          
362         enddo
363 +
364         if (nGroupTypes.eq.0) then
365            nGroupTypes = nGroupTypes + 1
366            gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
367            groupToGtype(i) = nGroupTypes
368         else
369 +          GtypeFound = .false.
370            do g = 1, nGroupTypes
371 <             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).gt.tol) then
358 <                nGroupTypes = nGroupTypes + 1
359 <                gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
360 <                groupToGtype(i) = nGroupTypes
361 <             else
371 >             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).lt.tol) then
372                  groupToGtype(i) = g
373 +                GtypeFound = .true.
374               endif
375            enddo
376 +          if (.not.GtypeFound) then            
377 +             nGroupTypes = nGroupTypes + 1
378 +             gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
379 +             groupToGtype(i) = nGroupTypes
380 +          endif
381         endif
382 <    enddo
367 <    
368 <    !! allocate the gtypeCutoffMap here.
382 >    enddo    
383  
384 +    !! allocate the gtypeCutoffMap here.
385 +    allocate(gtypeCutoffMap(nGroupTypes,nGroupTypes))
386      !! then we do a double loop over all the group TYPES to find the cutoff
387      !! map between groups of two types
388      
# Line 374 | Line 390 | contains
390         do j = 1, nGroupTypes
391        
392            select case(cutoffPolicy)
393 <             case(TRADITIONAL_CUTOFF_POLICY)
394 <                thisRcut = maxval(gtypeMaxCutoff)
395 <             case(MIX_CUTOFF_POLICY)
396 <                thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
397 <             case(MAX_CUTOFF_POLICY)
398 <                thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
399 <             case default
400 <                call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
401 <                return
402 <          end select      
403 <         gtypeCutoffMap(i,j)%rcut = thisRcut
404 <         gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
405 <         skin = defaultRlist - defaultRcut
406 <         gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
393 >          case(TRADITIONAL_CUTOFF_POLICY)
394 >             thisRcut = maxval(gtypeMaxCutoff)
395 >          case(MIX_CUTOFF_POLICY)
396 >             thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
397 >          case(MAX_CUTOFF_POLICY)
398 >             thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
399 >          case default
400 >             call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
401 >             return
402 >          end select
403 >          gtypeCutoffMap(i,j)%rcut = thisRcut
404 >          gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
405 >          skin = defaultRlist - defaultRcut
406 >          gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
407 >
408         enddo
409      enddo
410      
# Line 409 | Line 426 | contains
426       integer, intent(in) :: cutPolicy
427       cutoffPolicy = cutPolicy
428       call createGtypeCutoffMap()
412
429     end subroutine setCutoffPolicy
430      
431      
432    subroutine setSimVariables()
433      SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms()
434      SIM_uses_EAM = SimUsesEAM()
419    SIM_uses_RF = SimUsesRF()
435      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
436      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
437      SIM_uses_PBC = SimUsesPBC()
# Line 457 | Line 472 | contains
472         call setSimVariables()
473      endif
474  
475 <    if (.not. haveRlist) then
476 <       write(default_error, *) 'rList has not been set in doForces!'
477 <       error = -1
478 <       return
479 <    endif
475 >  !  if (.not. haveRlist) then
476 >  !     write(default_error, *) 'rList has not been set in doForces!'
477 >  !     error = -1
478 >  !     return
479 >  !  endif
480  
481      if (.not. haveNeighborList) then
482         write(default_error, *) 'neighbor list has not been initialized in doForces!'
# Line 486 | Line 501 | contains
501    end subroutine doReadyCheck
502  
503  
504 <  subroutine init_FF(use_RF, use_UW, use_DW, thisStat)
504 >  subroutine init_FF(thisESM, thisStat)
505  
506 <    logical, intent(in) :: use_RF
507 <    logical, intent(in) :: use_UW
493 <    logical, intent(in) :: use_DW
506 >    integer, intent(in) :: thisESM
507 >    real(kind=dp), intent(in) :: dampingAlpha
508      integer, intent(out) :: thisStat  
509      integer :: my_status, nMatches
496    integer :: corrMethod
510      integer, pointer :: MatchList(:) => null()
511      real(kind=dp) :: rcut, rrf, rt, dielect
512  
513      !! assume things are copacetic, unless they aren't
514      thisStat = 0
515  
516 <    !! Fortran's version of a cast:
504 <    FF_uses_RF = use_RF
516 >    electrostaticSummationMethod = thisESM
517  
506    !! set the electrostatic correction method
507    if (use_UW) then
508       corrMethod = 1
509    elseif (use_DW) then
510       corrMethod = 2
511    else
512       corrMethod = 0
513    endif
514    
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 541 | Line 544 | contains
544  
545      haveSaneForceField = .true.
546  
547 <    !! check to make sure the FF_uses_RF setting makes sense
547 >    !! check to make sure the reaction field setting makes sense
548  
549      if (FF_uses_Dipoles) then
550 <       if (FF_uses_RF) then
550 >       if (electrostaticSummationMethod == 3) then
551            dielect = getDielect()
552            call initialize_rf(dielect)
553         endif
554      else
555 <       if (FF_uses_RF) then          
555 >       if (electrostaticSummationMethod == 3) then
556            write(default_error,*) 'Using Reaction Field with no dipoles?  Huh?'
557            thisStat = -1
558            haveSaneForceField = .false.
# Line 967 | Line 970 | contains
970  
971      if (FF_RequiresPostpairCalc() .and. SIM_requires_postpair_calc) then
972  
973 <       if (FF_uses_RF .and. SIM_uses_RF) then
973 >       if (electrostaticSummationMethod == 3) then
974  
975   #ifdef IS_MPI
976            call scatter(rf_Row,rf,plan_atom_row_3d)
# Line 1051 | Line 1054 | contains
1054      real ( kind = dp ), intent(inout) :: rijsq
1055      real ( kind = dp )                :: r
1056      real ( kind = dp ), intent(inout) :: d(3)
1054    real ( kind = dp ) :: ebalance
1057      integer :: me_i, me_j
1058  
1059      integer :: iHash
# Line 1076 | Line 1078 | contains
1078  
1079      if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1080         call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1081 <            pot, eFrame, f, t, do_pot, corrMethod)
1081 >            pot, eFrame, f, t, do_pot)
1082  
1083 <       if (FF_uses_RF .and. SIM_uses_RF) then
1083 >       if (electrostaticSummationMethod == 3) then
1084  
1085            ! CHECK ME (RF needs to know about all electrostatic types)
1086            call accumulate_rf(i, j, r, eFrame, sw)
# Line 1140 | Line 1142 | contains
1142      real ( kind = dp ), intent(inout) :: d(3), dc(3)
1143  
1144      integer :: me_i, me_j, iHash
1145 +
1146 +    r = sqrt(rijsq)
1147  
1148   #ifdef IS_MPI  
1149      me_i = atid_row(i)
# Line 1358 | Line 1362 | contains
1362  
1363    function FF_RequiresPostpairCalc() result(doesit)
1364      logical :: doesit
1365 <    doesit = FF_uses_RF
1365 >    if (electrostaticSummationMethod == 3) doesit = .true.
1366    end function FF_RequiresPostpairCalc
1367  
1368   #ifdef PROFILE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines