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 2290 by gezelter, Wed Sep 14 20:28:05 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.41 2005-09-14 20:28:05 gezelter Exp $, $Date: 2005-09-14 20:28:05 $, $Name: not supported by cvs2svn $, $Revision: 1.41 $
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 277 | Line 275 | contains
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    
282            call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
# Line 288 | 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 <          atypeMaxCutoff(i) = 0.0_dp
290 >
291            if (i_is_LJ) then
292               thisRcut = getSigma(i) * 2.5_dp
293               if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
# Line 338 | Line 337 | contains
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
# Line 408 | Line 409 | contains
409      enddo
410      
411      haveGtypeCutoffMap = .true.
412 <    
412 <  end subroutine createGtypeCutoffMap
413 <  
414 <  subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
415 <    real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
416 <    integer, intent(in) :: cutPolicy
417 <    
418 <    defaultRcut = defRcut
419 <    defaultRsw = defRsw
420 <    defaultRlist = defRlist
421 <    cutoffPolicy = cutPolicy
422 <  end subroutine setDefaultCutoffs
423 <  
424 <  subroutine setCutoffPolicy(cutPolicy)
412 >   end subroutine createGtypeCutoffMap
413  
414 +   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
415 +     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
416       integer, intent(in) :: cutPolicy
417 +
418 +     defaultRcut = defRcut
419 +     defaultRsw = defRsw
420 +     defaultRlist = defRlist
421       cutoffPolicy = cutPolicy
422 <     call createGtypeCutoffMap()
422 >   end subroutine setDefaultCutoffs
423  
424 +   subroutine setCutoffPolicy(cutPolicy)
425 +
426 +     integer, intent(in) :: cutPolicy
427 +     cutoffPolicy = cutPolicy
428 +     call createGtypeCutoffMap()
429     end subroutine setCutoffPolicy
430      
431      
432    subroutine setSimVariables()
433      SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms()
434      SIM_uses_EAM = SimUsesEAM()
436    SIM_uses_RF = SimUsesRF()
435      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
436      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
437      SIM_uses_PBC = SimUsesPBC()
# Line 503 | 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
510 <    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
513    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:
521 <    FF_uses_RF = use_RF
516 >    electrostaticSummationMethod = thisESM
517  
523    !! set the electrostatic correction method
524    if (use_UW) then
525       corrMethod = 1
526    elseif (use_DW) then
527       corrMethod = 2
528    else
529       corrMethod = 0
530    endif
531    
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 558 | 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 984 | 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 1068 | Line 1054 | contains
1054      real ( kind = dp ), intent(inout) :: rijsq
1055      real ( kind = dp )                :: r
1056      real ( kind = dp ), intent(inout) :: d(3)
1071    real ( kind = dp ) :: ebalance
1057      integer :: me_i, me_j
1058  
1059      integer :: iHash
# Line 1093 | 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 1377 | 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