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 2284 by gezelter, Wed Sep 7 19:18:54 2005 UTC vs.
Revision 2310 by chrisfen, Mon Sep 19 23:21:46 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
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 $
48 > !! @version $Id: doForces.F90,v 1.47 2005-09-19 23:21:46 chrisfen Exp $, $Date: 2005-09-19 23:21:46 $, $Name: not supported by cvs2svn $, $Revision: 1.47 $
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 75 | Line 75 | module doForces
75   #include "UseTheForce/fSwitchingFunction.h"
76   #include "UseTheForce/fCutoffPolicy.h"
77   #include "UseTheForce/DarkSide/fInteractionMap.h"
78 + #include "UseTheForce/DarkSide/fElectrostaticSummationMethod.h"
79  
80  
81    INTEGER, PARAMETER:: PREPAIR_LOOP = 1
# Line 91 | Line 92 | module doForces
92    logical, save :: FF_uses_Dipoles
93    logical, save :: FF_uses_GayBerne
94    logical, save :: FF_uses_EAM
94  logical, save :: FF_uses_RF
95  
96    logical, save :: SIM_uses_DirectionalAtoms
97    logical, save :: SIM_uses_EAM
98  logical, save :: SIM_uses_RF
98    logical, save :: SIM_requires_postpair_calc
99    logical, save :: SIM_requires_prepair_calc
100    logical, save :: SIM_uses_PBC
101  
102 <  integer, save :: corrMethod
102 >  integer, save :: electrostaticSummationMethod
103  
104    public :: init_FF
105    public :: setDefaultCutoffs
# Line 256 | Line 255 | contains
255      logical :: i_is_GB
256      logical :: i_is_EAM
257      logical :: i_is_Shape
258 +    logical :: GtypeFound
259  
260      integer :: myStatus, nAtypes,  i, j, istart, iend, jstart, jend
261      integer :: n_in_i, me_i, ia, g, atom1, nGroupTypes
262 +    integer :: nGroupsInRow
263      real(kind=dp):: thisSigma, bigSigma, thisRcut, tol, skin
264      real(kind=dp) :: biggestAtypeCutoff
265  
# Line 271 | Line 272 | contains
272            return
273         endif
274      endif
275 <
275 > #ifdef IS_MPI
276 >    nGroupsInRow = getNgroupsInRow(plan_group_row)
277 > #endif
278      nAtypes = getSize(atypes)
279 <    
279 > ! Set all of the initial cutoffs to zero.
280 >    atypeMaxCutoff = 0.0_dp
281      do i = 1, nAtypes
282         if (SimHasAtype(i)) then    
283            call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
# Line 284 | 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
291 >
292            if (i_is_LJ) then
293               thisRcut = getSigma(i) * 2.5_dp
294               if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
# Line 334 | Line 338 | contains
338         allocate(groupToGtype(iend))
339         allocate(groupMaxCutoff(iend))
340         allocate(gtypeMaxCutoff(iend))
341 +       groupMaxCutoff = 0.0_dp
342 +       gtypeMaxCutoff = 0.0_dp
343      endif
344      !! first we do a single loop over the cutoff groups to find the
345      !! largest cutoff for any atypes present in this group.  We also
# Line 353 | Line 359 | contains
359   #endif          
360            if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
361               groupMaxCutoff(i)=atypeMaxCutoff(me_i)
362 <          endif
362 >          endif          
363         enddo
364 +
365         if (nGroupTypes.eq.0) then
366            nGroupTypes = nGroupTypes + 1
367            gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
368            groupToGtype(i) = nGroupTypes
369         else
370 +          GtypeFound = .false.
371            do g = 1, nGroupTypes
372 <             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).gt.tol) then
365 <                nGroupTypes = nGroupTypes + 1
366 <                gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
367 <                groupToGtype(i) = nGroupTypes
368 <             else
372 >             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).lt.tol) then
373                  groupToGtype(i) = g
374 +                GtypeFound = .true.
375               endif
376            enddo
377 +          if (.not.GtypeFound) then            
378 +             nGroupTypes = nGroupTypes + 1
379 +             gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
380 +             groupToGtype(i) = nGroupTypes
381 +          endif
382         endif
383 <    enddo
384 <    
383 >    enddo    
384 >
385      !! allocate the gtypeCutoffMap here.
386      allocate(gtypeCutoffMap(nGroupTypes,nGroupTypes))
387      !! then we do a double loop over all the group TYPES to find the cutoff
# Line 400 | Line 410 | contains
410      enddo
411      
412      haveGtypeCutoffMap = .true.
413 <    
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)
413 >   end subroutine createGtypeCutoffMap
414  
415 +   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
416 +     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
417       integer, intent(in) :: cutPolicy
418 +
419 +     defaultRcut = defRcut
420 +     defaultRsw = defRsw
421 +     defaultRlist = defRlist
422       cutoffPolicy = cutPolicy
423 <     call createGtypeCutoffMap()
423 >   end subroutine setDefaultCutoffs
424  
425 +   subroutine setCutoffPolicy(cutPolicy)
426 +
427 +     integer, intent(in) :: cutPolicy
428 +     cutoffPolicy = cutPolicy
429 +     call createGtypeCutoffMap()
430     end subroutine setCutoffPolicy
431      
432      
433    subroutine setSimVariables()
434      SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms()
435      SIM_uses_EAM = SimUsesEAM()
428    SIM_uses_RF = SimUsesRF()
436      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
437      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
438      SIM_uses_PBC = SimUsesPBC()
# Line 495 | Line 502 | contains
502    end subroutine doReadyCheck
503  
504  
505 <  subroutine init_FF(use_RF, use_UW, use_DW, thisStat)
505 >  subroutine init_FF(thisESM, thisStat)
506  
507 <    logical, intent(in) :: use_RF
501 <    logical, intent(in) :: use_UW
502 <    logical, intent(in) :: use_DW
507 >    integer, intent(in) :: thisESM
508      integer, intent(out) :: thisStat  
509      integer :: my_status, nMatches
505    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:
513 <    FF_uses_RF = use_RF
516 >    electrostaticSummationMethod = thisESM
517  
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    
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 550 | 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 == REACTION_FIELD) then
551            dielect = getDielect()
552            call initialize_rf(dielect)
553         endif
554      else
555 <       if (FF_uses_RF) then          
555 >       if (electrostaticSummationMethod == REACTION_FIELD) then
556            write(default_error,*) 'Using Reaction Field with no dipoles?  Huh?'
557            thisStat = -1
558            haveSaneForceField = .false.
# Line 976 | 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 == REACTION_FIELD) then
974  
975   #ifdef IS_MPI
976            call scatter(rf_Row,rf,plan_atom_row_3d)
# Line 1060 | Line 1054 | contains
1054      real ( kind = dp ), intent(inout) :: rijsq
1055      real ( kind = dp )                :: r
1056      real ( kind = dp ), intent(inout) :: d(3)
1063    real ( kind = dp ) :: ebalance
1057      integer :: me_i, me_j
1058  
1059      integer :: iHash
# Line 1085 | 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 == REACTION_FIELD) then
1084  
1085            ! CHECK ME (RF needs to know about all electrostatic types)
1086            call accumulate_rf(i, j, r, eFrame, sw)
# Line 1150 | Line 1143 | contains
1143  
1144      integer :: me_i, me_j, iHash
1145  
1146 +    r = sqrt(rijsq)
1147 +
1148   #ifdef IS_MPI  
1149      me_i = atid_row(i)
1150      me_j = atid_col(j)  
# Line 1367 | Line 1362 | contains
1362  
1363    function FF_RequiresPostpairCalc() result(doesit)
1364      logical :: doesit
1365 <    doesit = FF_uses_RF
1365 >    if (electrostaticSummationMethod == REACTION_FIELD) doesit = .true.
1366    end function FF_RequiresPostpairCalc
1367  
1368   #ifdef PROFILE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines