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 2301 by gezelter, Thu Sep 15 22:05:21 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.44 2005-09-15 22:05:17 gezelter Exp $, $Date: 2005-09-15 22:05:17 $, $Name: not supported by cvs2svn $, $Revision: 1.44 $
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 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 136 | Line 135 | module doForces
135  
136    integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY
137    real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist
139  real(kind=dp),save :: rcuti
138    
139   contains
140  
# Line 422 | Line 420 | contains
420       defaultRsw = defRsw
421       defaultRlist = defRlist
422       cutoffPolicy = cutPolicy
425     rcuti = 1.0_dp / defaultRcut
423     end subroutine setDefaultCutoffs
424  
425     subroutine setCutoffPolicy(cutPolicy)
# Line 439 | Line 436 | contains
436      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
437      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
438      SIM_uses_PBC = SimUsesPBC()
442    SIM_uses_RF = SimUsesRF()
439  
440      haveSIMvariables = .true.
441  
# Line 506 | Line 502 | contains
502    end subroutine doReadyCheck
503  
504  
505 <  subroutine init_FF(use_RF, correctionMethod, dampingAlpha, thisStat)
505 >  subroutine init_FF(thisESM, thisStat)
506  
507 <    logical, intent(in) :: use_RF
512 <    integer, intent(in) :: correctionMethod
513 <    real(kind=dp), intent(in) :: dampingAlpha
507 >    integer, intent(in) :: thisESM
508      integer, intent(out) :: thisStat  
509      integer :: my_status, nMatches
510      integer, pointer :: MatchList(:) => null()
# Line 519 | Line 513 | contains
513      !! assume things are copacetic, unless they aren't
514      thisStat = 0
515  
516 <    !! Fortran's version of a cast:
523 <    FF_uses_RF = use_RF
516 >    electrostaticSummationMethod = thisESM
517  
525        
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 552 | 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 ((corrMethod == 3) .or. 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 978 | Line 970 | contains
970  
971      if (FF_RequiresPostpairCalc() .and. SIM_requires_postpair_calc) then
972  
973 <       if ((FF_uses_RF .and. SIM_uses_RF) .or. (corrMethod == 3)) then
973 >       if (electrostaticSummationMethod == REACTION_FIELD) then
974  
975   #ifdef IS_MPI
976            call scatter(rf_Row,rf,plan_atom_row_3d)
# Line 1086 | 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, rcuti)
1081 >            pot, eFrame, f, t, do_pot)
1082  
1083 <       if ((FF_uses_RF .and. SIM_uses_RF) .or. (corrMethod == 3)) 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 1370 | Line 1362 | contains
1362  
1363    function FF_RequiresPostpairCalc() result(doesit)
1364      logical :: doesit
1365 <    doesit = FF_uses_RF
1374 <    if (corrMethod == 3) doesit = .true.
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