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 2269 by chuckv, Tue Aug 9 19:40:56 2005 UTC vs.
Revision 2342 by chrisfen, Tue Oct 4 19:32:58 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.27 2005-08-09 19:40:56 chuckv Exp $, $Date: 2005-08-09 19:40:56 $, $Name: not supported by cvs2svn $, $Revision: 1.27 $
48 > !! @version $Id: doForces.F90,v 1.50 2005-10-04 19:32:58 chrisfen Exp $, $Date: 2005-10-04 19:32:58 $, $Name: not supported by cvs2svn $, $Revision: 1.50 $
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 73 | Line 73 | module doForces
73  
74   #define __FORTRAN90
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
82    INTEGER, PARAMETER:: PAIR_LOOP    = 2
83  
81  logical, save :: haveRlist = .false.
84    logical, save :: haveNeighborList = .false.
85    logical, save :: haveSIMvariables = .false.
86    logical, save :: haveSaneForceField = .false.
87 <  logical, save :: haveInteractionMap = .false.
87 >  logical, save :: haveInteractionHash = .false.
88 >  logical, save :: haveGtypeCutoffMap = .false.
89 >  logical, save :: haveDefaultCutoffs = .false.
90 >  logical, save :: haveRlist = .false.
91  
92    logical, save :: FF_uses_DirectionalAtoms
88  logical, save :: FF_uses_LennardJones
89  logical, save :: FF_uses_Electrostatics
90  logical, save :: FF_uses_Charges
93    logical, save :: FF_uses_Dipoles
92  logical, save :: FF_uses_Quadrupoles
93  logical, save :: FF_uses_Sticky
94  logical, save :: FF_uses_StickyPower
94    logical, save :: FF_uses_GayBerne
95    logical, save :: FF_uses_EAM
97  logical, save :: FF_uses_Shapes
98  logical, save :: FF_uses_FLARB
99  logical, save :: FF_uses_RF
96  
97    logical, save :: SIM_uses_DirectionalAtoms
102  logical, save :: SIM_uses_LennardJones
103  logical, save :: SIM_uses_Electrostatics
104  logical, save :: SIM_uses_Charges
105  logical, save :: SIM_uses_Dipoles
106  logical, save :: SIM_uses_Quadrupoles
107  logical, save :: SIM_uses_Sticky
108  logical, save :: SIM_uses_StickyPower
109  logical, save :: SIM_uses_GayBerne
98    logical, save :: SIM_uses_EAM
111  logical, save :: SIM_uses_Shapes
112  logical, save :: SIM_uses_FLARB
113  logical, save :: SIM_uses_RF
99    logical, save :: SIM_requires_postpair_calc
100    logical, save :: SIM_requires_prepair_calc
101    logical, save :: SIM_uses_PBC
117  logical, save :: SIM_uses_molecular_cutoffs
102  
103 +  integer, save :: electrostaticSummationMethod
104  
105    public :: init_FF
106 +  public :: setDefaultCutoffs
107    public :: do_force_loop
108 < !  public :: setRlistDF
109 <  !public :: addInteraction
110 <  !public :: setInteractionHash
111 <  !public :: getInteractionHash
112 <  public :: createInteractionMap
113 <  public :: createGroupCutoffs
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 133 | Line 120 | module doForces
120    integer :: nLoops
121   #endif
122    
123 < !! Variables for cutoff mapping and interaction mapping
124 < ! Bit hash to determine pair-pair interactions.
125 <  integer, dimension(:,:),allocatable :: InteractionHash
126 < !! Cuttoffs in OOPSE are handled on a Group-Group pair basis.
140 < ! Largest cutoff for atypes for all potentials
141 <  real(kind=dp), dimension(:), allocatable :: atypeMaxCuttoff
142 < ! Largest cutoff for groups
123 >  !! Variables for cutoff mapping and interaction mapping
124 >  ! Bit hash to determine pair-pair interactions.
125 >  integer, dimension(:,:), allocatable :: InteractionHash
126 >  real(kind=dp), dimension(:), allocatable :: atypeMaxCutoff
127    real(kind=dp), dimension(:), allocatable :: groupMaxCutoff
128 < ! Group to Gtype transformation Map
145 <  integer,dimension(:), allocatable :: groupToGtype
146 < ! Group Type Max Cutoff
128 >  integer, dimension(:), allocatable :: groupToGtype
129    real(kind=dp), dimension(:), allocatable :: gtypeMaxCutoff
130 < ! GroupType definition
131 <  type ::gtype
132 <     real(kind=dp) :: rcut ! Group Cutoff
133 <     real(kind=dp) :: rcutsq ! Group Cutoff Squared
134 <     real(kind=dp) :: rlistsq ! List cutoff Squared    
135 <  end type gtype
130 >  type ::gtypeCutoffs
131 >     real(kind=dp) :: rcut
132 >     real(kind=dp) :: rcutsq
133 >     real(kind=dp) :: rlistsq
134 >  end type gtypeCutoffs
135 >  type(gtypeCutoffs), dimension(:,:), allocatable :: gtypeCutoffMap
136  
137 <  type(gtype), dimension(:,:), allocatable :: gtypeCutoffMap
137 >  integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY
138 >  real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist
139 >  real(kind=dp),save :: listSkin
140    
141   contains
142  
143 <
160 <  subroutine createInteractionMap(status)
143 >  subroutine createInteractionHash(status)
144      integer :: nAtypes
145      integer, intent(out) :: status
146      integer :: i
147      integer :: j
148 <    integer :: ihash
166 <    real(kind=dp) :: myRcut
148 >    integer :: iHash
149      !! Test Types
150      logical :: i_is_LJ
151      logical :: i_is_Elect
# Line 179 | Line 161 | contains
161      logical :: j_is_GB
162      logical :: j_is_EAM
163      logical :: j_is_Shape
164 <    
164 >    real(kind=dp) :: myRcut
165 >
166      status = 0  
167  
168      if (.not. associated(atypes)) then
169 <       call handleError("atype", "atypes was not present before call of createDefaultInteractionHash!")
169 >       call handleError("atype", "atypes was not present before call of createInteractionHash!")
170         status = -1
171         return
172      endif
# Line 198 | Line 181 | contains
181      if (.not. allocated(InteractionHash)) then
182         allocate(InteractionHash(nAtypes,nAtypes))
183      endif
184 +
185 +    if (.not. allocated(atypeMaxCutoff)) then
186 +       allocate(atypeMaxCutoff(nAtypes))
187 +    endif
188          
189      do i = 1, nAtypes
190         call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
# Line 257 | Line 244 | contains
244  
245      end do
246  
247 <    haveInteractionMap = .true.
248 <  end subroutine createInteractionMap
247 >    haveInteractionHash = .true.
248 >  end subroutine createInteractionHash
249  
250 <  subroutine createGroupCutoffs(skinThickness,defaultrList,stat)
264 <    real(kind=dp), intent(in), optional :: defaultRList
265 <    real(kind-dp), intent(in), :: skinThickenss
266 <  ! Query each potential and return the cutoff for that potential. We
267 <  ! build the neighbor list based on the largest cutoff value for that
268 <  ! atype. Each potential can decide whether to calculate the force for
269 <  ! that atype based upon it's own cutoff.
270 <  
250 >  subroutine createGtypeCutoffMap(stat)
251  
252 <    real(kind=dp), intent(in), optional :: defaultRCut, defaultSkinThickness
252 >    integer, intent(out), optional :: stat
253 >    logical :: i_is_LJ
254 >    logical :: i_is_Elect
255 >    logical :: i_is_Sticky
256 >    logical :: i_is_StickyP
257 >    logical :: i_is_GB
258 >    logical :: i_is_EAM
259 >    logical :: i_is_Shape
260 >    logical :: GtypeFound
261  
262 <    integer :: iMap
263 <    integer :: map_i,map_j
264 <    real(kind=dp) :: thisRCut = 0.0_dp
265 <    real(kind=dp) :: actualCutoff = 0.0_dp
266 <    integer, intent(out) :: stat
279 <    integer :: nAtypes
280 <    integer :: myStatus
262 >    integer :: myStatus, nAtypes,  i, j, istart, iend, jstart, jend
263 >    integer :: n_in_i, me_i, ia, g, atom1, nGroupTypes
264 >    integer :: nGroupsInRow
265 >    real(kind=dp):: thisSigma, bigSigma, thisRcut, tol, skin
266 >    real(kind=dp) :: biggestAtypeCutoff
267  
268      stat = 0
269 <    if (.not. haveInteractionMap) then
270 <
285 <       call createInteractionMap(myStatus)
286 <
269 >    if (.not. haveInteractionHash) then
270 >       call createInteractionHash(myStatus)      
271         if (myStatus .ne. 0) then
272 <          write(default_error, *) 'createInteractionMap failed in doForces!'
272 >          write(default_error, *) 'createInteractionHash failed in doForces!'
273            stat = -1
274            return
275         endif
276      endif
277 <
278 <    nAtypes = getSize(atypes)
279 <    !! If we pass a default rcut, set all atypes to that cutoff distance
280 <    if(present(defaultRList)) then
281 <       InteractionMap(:,:)%rCut = defaultRCut
282 <       InteractionMap(:,:)%rCutSq = defaultRCut*defaultRCut
283 <       InteractionMap(:,:)%rListSq = (defaultRCut+defaultSkinThickness)**2
284 <       haveRlist = .true.
285 <       return
286 <    end if
287 <
288 <    do map_i = 1,nAtypes
289 <       do map_j = map_i,nAtypes
290 <          iMap = InteractionMap(map_i, map_j)%InteractionHash
277 > #ifdef IS_MPI
278 >    nGroupsInRow = getNgroupsInRow(plan_group_row)
279 > #endif
280 >    nAtypes = getSize(atypes)
281 > ! Set all of the initial cutoffs to zero.
282 >    atypeMaxCutoff = 0.0_dp
283 >    do i = 1, nAtypes
284 >       if (SimHasAtype(i)) then    
285 >          call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
286 >          call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
287 >          call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
288 >          call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
289 >          call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
290 >          call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
291 >          call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
292            
293 <          if ( iand(iMap, LJ_PAIR).ne.0 ) then
294 <             ! thisRCut = getLJCutOff(map_i,map_j)
295 <             if (thisRcut > actualCutoff) actualCutoff = thisRcut
293 >
294 >          if (haveDefaultCutoffs) then
295 >             atypeMaxCutoff(i) = defaultRcut
296 >          else
297 >             if (i_is_LJ) then          
298 >                thisRcut = getSigma(i) * 2.5_dp
299 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
300 >             endif
301 >             if (i_is_Elect) then
302 >                thisRcut = defaultRcut
303 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
304 >             endif
305 >             if (i_is_Sticky) then
306 >                thisRcut = getStickyCut(i)
307 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
308 >             endif
309 >             if (i_is_StickyP) then
310 >                thisRcut = getStickyPowerCut(i)
311 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
312 >             endif
313 >             if (i_is_GB) then
314 >                thisRcut = getGayBerneCut(i)
315 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
316 >             endif
317 >             if (i_is_EAM) then
318 >                thisRcut = getEAMCut(i)
319 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
320 >             endif
321 >             if (i_is_Shape) then
322 >                thisRcut = getShapeCut(i)
323 >                if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
324 >             endif
325            endif
326            
313          if ( iand(iMap, ELECTROSTATIC_PAIR).ne.0 ) then
314             ! thisRCut = getElectrostaticCutOff(map_i,map_j)
315             if (thisRcut > actualCutoff) actualCutoff = thisRcut
316          endif
327            
328 <          if ( iand(iMap, STICKY_PAIR).ne.0 ) then
329 <             ! thisRCut = getStickyCutOff(map_i,map_j)
330 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
321 <           endif
322 <          
323 <           if ( iand(iMap, STICKYPOWER_PAIR).ne.0 ) then
324 <              ! thisRCut = getStickyPowerCutOff(map_i,map_j)
325 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
326 <           endif
327 <          
328 <           if ( iand(iMap, GAYBERNE_PAIR).ne.0 ) then
329 <              ! thisRCut = getGayberneCutOff(map_i,map_j)
330 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
331 <           endif
332 <          
333 <           if ( iand(iMap, GAYBERNE_LJ).ne.0 ) then
334 < !              thisRCut = getGaybrneLJCutOff(map_i,map_j)
335 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
336 <           endif
337 <          
338 <           if ( iand(iMap, EAM_PAIR).ne.0 ) then      
339 < !              thisRCut = getEAMCutOff(map_i,map_j)
340 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
341 <           endif
342 <          
343 <           if ( iand(iMap, SHAPE_PAIR).ne.0 ) then      
344 < !              thisRCut = getShapeCutOff(map_i,map_j)
345 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
346 <           endif
347 <          
348 <           if ( iand(iMap, SHAPE_LJ).ne.0 ) then      
349 < !              thisRCut = getShapeLJCutOff(map_i,map_j)
350 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
351 <           endif
352 <           InteractionMap(map_i, map_j)%rCut = actualCutoff
353 <           InteractionMap(map_i, map_j)%rCutSq = actualCutoff * actualCutoff
354 <           InteractionMap(map_i, map_j)%rListSq = (actualCutoff + skinThickness)**2
328 >          if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
329 >             biggestAtypeCutoff = atypeMaxCutoff(i)
330 >          endif
331  
332 <           InteractionMap(map_j, map_i)%rCut = InteractionMap(map_i, map_j)%rCut
333 <           InteractionMap(map_j, map_i)%rCutSq = InteractionMap(map_i, map_j)%rCutSq
334 <           InteractionMap(map_j, map_i)%rListSq = InteractionMap(map_i, map_j)%rListSq
335 <        end do
336 <     end do
337 <     ! now the groups
332 >       endif
333 >    enddo
334 >  
335 >    nGroupTypes = 0
336 >    
337 >    istart = 1
338 > #ifdef IS_MPI
339 >    iend = nGroupsInRow
340 > #else
341 >    iend = nGroups
342 > #endif
343 >    
344 >    !! allocate the groupToGtype and gtypeMaxCutoff here.
345 >    if(.not.allocated(groupToGtype)) then
346 >       allocate(groupToGtype(iend))
347 >       allocate(groupMaxCutoff(iend))
348 >       allocate(gtypeMaxCutoff(iend))
349 >       groupMaxCutoff = 0.0_dp
350 >       gtypeMaxCutoff = 0.0_dp
351 >    endif
352 >    !! first we do a single loop over the cutoff groups to find the
353 >    !! largest cutoff for any atypes present in this group.  We also
354 >    !! create gtypes at this point.
355 >    
356 >    tol = 1.0d-6
357 >    
358 >    do i = istart, iend      
359 >       n_in_i = groupStartRow(i+1) - groupStartRow(i)
360 >       groupMaxCutoff(i) = 0.0_dp
361 >       do ia = groupStartRow(i), groupStartRow(i+1)-1
362 >          atom1 = groupListRow(ia)
363 > #ifdef IS_MPI
364 >          me_i = atid_row(atom1)
365 > #else
366 >          me_i = atid(atom1)
367 > #endif          
368 >          if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
369 >             groupMaxCutoff(i)=atypeMaxCutoff(me_i)
370 >          endif          
371 >       enddo
372 >
373 >       if (nGroupTypes.eq.0) then
374 >          nGroupTypes = nGroupTypes + 1
375 >          gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
376 >          groupToGtype(i) = nGroupTypes
377 >       else
378 >          GtypeFound = .false.
379 >          do g = 1, nGroupTypes
380 >             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).lt.tol) then
381 >                groupToGtype(i) = g
382 >                GtypeFound = .true.
383 >             endif
384 >          enddo
385 >          if (.not.GtypeFound) then            
386 >             nGroupTypes = nGroupTypes + 1
387 >             gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
388 >             groupToGtype(i) = nGroupTypes
389 >          endif
390 >       endif
391 >    enddo    
392  
393 +    !! allocate the gtypeCutoffMap here.
394 +    allocate(gtypeCutoffMap(nGroupTypes,nGroupTypes))
395 +    !! then we do a double loop over all the group TYPES to find the cutoff
396 +    !! map between groups of two types
397 +    
398 +    do i = 1, nGroupTypes
399 +       do j = 1, nGroupTypes
400 +      
401 +          select case(cutoffPolicy)
402 +          case(TRADITIONAL_CUTOFF_POLICY)
403 +             thisRcut = maxval(gtypeMaxCutoff)
404 +          case(MIX_CUTOFF_POLICY)
405 +             thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
406 +          case(MAX_CUTOFF_POLICY)
407 +             thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
408 +          case default
409 +             call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
410 +             return
411 +          end select
412 +          gtypeCutoffMap(i,j)%rcut = thisRcut
413 +          gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
414 +          skin = defaultRlist - defaultRcut
415 +          listSkin = skin ! set neighbor list skin thickness
416 +          gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
417  
418 +          ! sanity check
419  
420 <     haveRlist = .true.
421 <   end subroutine createGroupCutoffs
420 >          if (haveDefaultCutoffs) then
421 >             if (abs(gtypeCutoffMap(i,j)%rcut - defaultRcut).gt.0.0001) then
422 >                call handleError("createGtypeCutoffMap", "user-specified rCut does not match computed group Cutoff")
423 >             endif
424 >          endif
425 >       enddo
426 >    enddo
427  
428 +    haveGtypeCutoffMap = .true.
429 +   end subroutine createGtypeCutoffMap
430 +
431 +   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
432 +     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
433 +     integer, intent(in) :: cutPolicy
434 +
435 +     defaultRcut = defRcut
436 +     defaultRsw = defRsw
437 +     defaultRlist = defRlist
438 +     cutoffPolicy = cutPolicy
439 +
440 +     haveDefaultCutoffs = .true.
441 +   end subroutine setDefaultCutoffs
442 +
443 +   subroutine setCutoffPolicy(cutPolicy)
444 +
445 +     integer, intent(in) :: cutPolicy
446 +     cutoffPolicy = cutPolicy
447 +     call createGtypeCutoffMap()
448 +   end subroutine setCutoffPolicy
449 +    
450 +    
451    subroutine setSimVariables()
452      SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms()
370    SIM_uses_LennardJones = SimUsesLennardJones()
371    SIM_uses_Electrostatics = SimUsesElectrostatics()
372    SIM_uses_Charges = SimUsesCharges()
373    SIM_uses_Dipoles = SimUsesDipoles()
374    SIM_uses_Sticky = SimUsesSticky()
375    SIM_uses_StickyPower = SimUsesStickyPower()
376    SIM_uses_GayBerne = SimUsesGayBerne()
453      SIM_uses_EAM = SimUsesEAM()
378    SIM_uses_Shapes = SimUsesShapes()
379    SIM_uses_FLARB = SimUsesFLARB()
380    SIM_uses_RF = SimUsesRF()
454      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
455      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
456      SIM_uses_PBC = SimUsesPBC()
# Line 394 | Line 467 | contains
467  
468      error = 0
469  
470 <    if (.not. haveInteractionMap) then
398 <      
470 >    if (.not. haveInteractionHash) then      
471         myStatus = 0      
472 <       call createInteractionMap(myStatus)
401 <      
472 >       call createInteractionHash(myStatus)      
473         if (myStatus .ne. 0) then
474 <          write(default_error, *) 'createInteractionMap failed in doForces!'
474 >          write(default_error, *) 'createInteractionHash failed in doForces!'
475            error = -1
476            return
477         endif
478      endif
479  
480 +    if (.not. haveGtypeCutoffMap) then        
481 +       myStatus = 0      
482 +       call createGtypeCutoffMap(myStatus)      
483 +       if (myStatus .ne. 0) then
484 +          write(default_error, *) 'createGtypeCutoffMap failed in doForces!'
485 +          error = -1
486 +          return
487 +       endif
488 +    endif
489 +
490      if (.not. haveSIMvariables) then
491         call setSimVariables()
492      endif
493  
494 <    if (.not. haveRlist) then
495 <       write(default_error, *) 'rList has not been set in doForces!'
496 <       error = -1
497 <       return
498 <    endif
494 >  !  if (.not. haveRlist) then
495 >  !     write(default_error, *) 'rList has not been set in doForces!'
496 >  !     error = -1
497 >  !     return
498 >  !  endif
499  
500      if (.not. haveNeighborList) then
501         write(default_error, *) 'neighbor list has not been initialized in doForces!'
# Line 439 | Line 520 | contains
520    end subroutine doReadyCheck
521  
522  
523 <  subroutine init_FF(use_RF_c, thisStat)
523 >  subroutine init_FF(thisESM, thisStat)
524  
525 <    logical, intent(in) :: use_RF_c
445 <
525 >    integer, intent(in) :: thisESM
526      integer, intent(out) :: thisStat  
527      integer :: my_status, nMatches
528      integer, pointer :: MatchList(:) => null()
# Line 451 | Line 531 | contains
531      !! assume things are copacetic, unless they aren't
532      thisStat = 0
533  
534 <    !! Fortran's version of a cast:
455 <    FF_uses_RF = use_RF_c
534 >    electrostaticSummationMethod = thisESM
535  
536      !! init_FF is called *after* all of the atom types have been
537      !! defined in atype_module using the new_atype subroutine.
# Line 461 | Line 540 | contains
540      !! interactions are used by the force field.    
541  
542      FF_uses_DirectionalAtoms = .false.
464    FF_uses_LennardJones = .false.
465    FF_uses_Electrostatics = .false.
466    FF_uses_Charges = .false.    
543      FF_uses_Dipoles = .false.
468    FF_uses_Sticky = .false.
469    FF_uses_StickyPower = .false.
544      FF_uses_GayBerne = .false.
545      FF_uses_EAM = .false.
472    FF_uses_Shapes = .false.
473    FF_uses_FLARB = .false.
546  
547      call getMatchingElementList(atypes, "is_Directional", .true., &
548           nMatches, MatchList)
549      if (nMatches .gt. 0) FF_uses_DirectionalAtoms = .true.
550  
479    call getMatchingElementList(atypes, "is_LennardJones", .true., &
480         nMatches, MatchList)
481    if (nMatches .gt. 0) FF_uses_LennardJones = .true.
482
483    call getMatchingElementList(atypes, "is_Electrostatic", .true., &
484         nMatches, MatchList)
485    if (nMatches .gt. 0) then
486       FF_uses_Electrostatics = .true.
487    endif
488
489    call getMatchingElementList(atypes, "is_Charge", .true., &
490         nMatches, MatchList)
491    if (nMatches .gt. 0) then
492       FF_uses_Charges = .true.  
493       FF_uses_Electrostatics = .true.
494    endif
495
551      call getMatchingElementList(atypes, "is_Dipole", .true., &
552           nMatches, MatchList)
553 <    if (nMatches .gt. 0) then
499 <       FF_uses_Dipoles = .true.
500 <       FF_uses_Electrostatics = .true.
501 <       FF_uses_DirectionalAtoms = .true.
502 <    endif
503 <
504 <    call getMatchingElementList(atypes, "is_Quadrupole", .true., &
505 <         nMatches, MatchList)
506 <    if (nMatches .gt. 0) then
507 <       FF_uses_Quadrupoles = .true.
508 <       FF_uses_Electrostatics = .true.
509 <       FF_uses_DirectionalAtoms = .true.
510 <    endif
511 <
512 <    call getMatchingElementList(atypes, "is_Sticky", .true., nMatches, &
513 <         MatchList)
514 <    if (nMatches .gt. 0) then
515 <       FF_uses_Sticky = .true.
516 <       FF_uses_DirectionalAtoms = .true.
517 <    endif
518 <
519 <    call getMatchingElementList(atypes, "is_StickyPower", .true., nMatches, &
520 <         MatchList)
521 <    if (nMatches .gt. 0) then
522 <       FF_uses_StickyPower = .true.
523 <       FF_uses_DirectionalAtoms = .true.
524 <    endif
553 >    if (nMatches .gt. 0) FF_uses_Dipoles = .true.
554      
555      call getMatchingElementList(atypes, "is_GayBerne", .true., &
556           nMatches, MatchList)
557 <    if (nMatches .gt. 0) then
529 <       FF_uses_GayBerne = .true.
530 <       FF_uses_DirectionalAtoms = .true.
531 <    endif
557 >    if (nMatches .gt. 0) FF_uses_GayBerne = .true.
558  
559      call getMatchingElementList(atypes, "is_EAM", .true., nMatches, MatchList)
560      if (nMatches .gt. 0) FF_uses_EAM = .true.
561  
536    call getMatchingElementList(atypes, "is_Shape", .true., &
537         nMatches, MatchList)
538    if (nMatches .gt. 0) then
539       FF_uses_Shapes = .true.
540       FF_uses_DirectionalAtoms = .true.
541    endif
562  
543    call getMatchingElementList(atypes, "is_FLARB", .true., &
544         nMatches, MatchList)
545    if (nMatches .gt. 0) FF_uses_FLARB = .true.
546
547    !! Assume sanity (for the sake of argument)
563      haveSaneForceField = .true.
564  
565 <    !! check to make sure the FF_uses_RF setting makes sense
565 >    !! check to make sure the reaction field setting makes sense
566  
567 <    if (FF_uses_dipoles) then
568 <       if (FF_uses_RF) then
567 >    if (FF_uses_Dipoles) then
568 >       if (electrostaticSummationMethod == REACTION_FIELD) then
569            dielect = getDielect()
570            call initialize_rf(dielect)
571         endif
572      else
573 <       if (FF_uses_RF) then          
573 >       if (electrostaticSummationMethod == REACTION_FIELD) then
574            write(default_error,*) 'Using Reaction Field with no dipoles?  Huh?'
575            thisStat = -1
576            haveSaneForceField = .false.
# Line 563 | Line 578 | contains
578         endif
579      endif
580  
566    !sticky module does not contain check_sticky_FF anymore
567    !if (FF_uses_sticky) then
568    !   call check_sticky_FF(my_status)
569    !   if (my_status /= 0) then
570    !      thisStat = -1
571    !      haveSaneForceField = .false.
572    !      return
573    !   end if
574    !endif
575
581      if (FF_uses_EAM) then
582         call init_EAM_FF(my_status)
583         if (my_status /= 0) then
# Line 590 | Line 595 | contains
595            haveSaneForceField = .false.
596            return
597         endif
593    endif
594
595    if (FF_uses_GayBerne .and. FF_uses_LennardJones) then
598      endif
599  
600      if (.not. haveNeighborList) then
# Line 658 | Line 660 | contains
660      integer :: localError
661      integer :: propPack_i, propPack_j
662      integer :: loopStart, loopEnd, loop
663 <    integer :: iMap
664 <    real(kind=dp) :: listSkin = 1.0  
663 >    integer :: iHash
664 >  
665  
666      !! initialize local variables  
667  
# Line 750 | Line 752 | contains
752   #endif
753         outer: do i = istart, iend
754  
753 #ifdef IS_MPI
754             me_i = atid_row(i)
755 #else
756             me_i = atid(i)
757 #endif
758
755            if (update_nlist) point(i) = nlist + 1
756  
757            n_in_i = groupStartRow(i+1) - groupStartRow(i)
# Line 790 | Line 786 | contains
786               me_j = atid(j)
787               call get_interatomic_vector(q_group(:,i), &
788                    q_group(:,j), d_grp, rgrpsq)
789 < #endif
789 > #endif      
790  
791 <             if (rgrpsq < InteractionMap(me_i,me_j)%rListsq) then
791 >             if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
792                  if (update_nlist) then
793                     nlist = nlist + 1
794  
# Line 913 | Line 909 | contains
909                  endif
910               end if
911            enddo
912 +
913         enddo outer
914  
915         if (update_nlist) then
# Line 992 | Line 989 | contains
989  
990      if (FF_RequiresPostpairCalc() .and. SIM_requires_postpair_calc) then
991  
992 <       if (FF_uses_RF .and. SIM_uses_RF) then
992 >       if (electrostaticSummationMethod == REACTION_FIELD) then
993  
994   #ifdef IS_MPI
995            call scatter(rf_Row,rf,plan_atom_row_3d)
# Line 1010 | Line 1007 | contains
1007   #else
1008               me_i = atid(i)
1009   #endif
1010 <             iMap = InteractionHash(me_i,me_j)
1010 >             iHash = InteractionHash(me_i,me_j)
1011              
1012 <             if ( iand(iMap, ELECTROSTATIC_PAIR).ne.0 ) then
1012 >             if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1013  
1014                  mu_i = getDipoleMoment(me_i)
1015  
# Line 1076 | Line 1073 | contains
1073      real ( kind = dp ), intent(inout) :: rijsq
1074      real ( kind = dp )                :: r
1075      real ( kind = dp ), intent(inout) :: d(3)
1079    real ( kind = dp ) :: ebalance
1076      integer :: me_i, me_j
1077  
1078 <    integer :: iMap
1078 >    integer :: iHash
1079  
1080      r = sqrt(rijsq)
1081      vpair = 0.0d0
# Line 1093 | Line 1089 | contains
1089      me_j = atid(j)
1090   #endif
1091  
1092 <    iMap = InteractionMap(me_i, me_j)%InteractionHash
1092 >    iHash = InteractionHash(me_i, me_j)
1093  
1094 <    if ( iand(iMap, LJ_PAIR).ne.0 ) then
1094 >    if ( iand(iHash, LJ_PAIR).ne.0 ) then
1095         call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
1096      endif
1097  
1098 <    if ( iand(iMap, ELECTROSTATIC_PAIR).ne.0 ) then
1098 >    if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1099         call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1100              pot, eFrame, f, t, do_pot)
1101  
1102 <       if (FF_uses_RF .and. SIM_uses_RF) then
1102 >       if (electrostaticSummationMethod == REACTION_FIELD) then
1103  
1104            ! CHECK ME (RF needs to know about all electrostatic types)
1105            call accumulate_rf(i, j, r, eFrame, sw)
# Line 1112 | Line 1108 | contains
1108  
1109      endif
1110  
1111 <    if ( iand(iMap, STICKY_PAIR).ne.0 ) then
1111 >    if ( iand(iHash, STICKY_PAIR).ne.0 ) then
1112         call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1113              pot, A, f, t, do_pot)
1114      endif
1115  
1116 <    if ( iand(iMap, STICKYPOWER_PAIR).ne.0 ) then
1116 >    if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then
1117         call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1118              pot, A, f, t, do_pot)
1119      endif
1120  
1121 <    if ( iand(iMap, GAYBERNE_PAIR).ne.0 ) then
1121 >    if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then
1122         call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1123              pot, A, f, t, do_pot)
1124      endif
1125      
1126 <    if ( iand(iMap, GAYBERNE_LJ).ne.0 ) then
1126 >    if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then
1127   !      call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1128   !           pot, A, f, t, do_pot)
1129      endif
1130  
1131 <    if ( iand(iMap, EAM_PAIR).ne.0 ) then      
1131 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1132         call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
1133              do_pot)
1134      endif
1135  
1136 <    if ( iand(iMap, SHAPE_PAIR).ne.0 ) then      
1136 >    if ( iand(iHash, SHAPE_PAIR).ne.0 ) then      
1137         call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1138              pot, A, f, t, do_pot)
1139      endif
1140  
1141 <    if ( iand(iMap, SHAPE_LJ).ne.0 ) then      
1141 >    if ( iand(iHash, SHAPE_LJ).ne.0 ) then      
1142         call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1143              pot, A, f, t, do_pot)
1144      endif
# Line 1164 | Line 1160 | contains
1160      real ( kind = dp )                :: r, rc
1161      real ( kind = dp ), intent(inout) :: d(3), dc(3)
1162  
1163 <    integer :: me_i, me_j, iMap
1163 >    integer :: me_i, me_j, iHash
1164  
1165 +    r = sqrt(rijsq)
1166 +
1167   #ifdef IS_MPI  
1168      me_i = atid_row(i)
1169      me_j = atid_col(j)  
# Line 1174 | Line 1172 | contains
1172      me_j = atid(j)  
1173   #endif
1174  
1175 <    iMap = InteractionMap(me_i, me_j)%InteractionHash
1175 >    iHash = InteractionHash(me_i, me_j)
1176  
1177 <    if ( iand(iMap, EAM_PAIR).ne.0 ) then      
1177 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1178              call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1179      endif
1180      
# Line 1373 | Line 1371 | contains
1371  
1372    function FF_UsesDirectionalAtoms() result(doesit)
1373      logical :: doesit
1374 <    doesit = FF_uses_DirectionalAtoms .or. FF_uses_Dipoles .or. &
1377 <         FF_uses_Quadrupoles .or. FF_uses_Sticky .or. &
1378 <         FF_uses_StickyPower .or. FF_uses_GayBerne .or. FF_uses_Shapes
1374 >    doesit = FF_uses_DirectionalAtoms
1375    end function FF_UsesDirectionalAtoms
1376  
1377    function FF_RequiresPrepairCalc() result(doesit)
# Line 1385 | Line 1381 | contains
1381  
1382    function FF_RequiresPostpairCalc() result(doesit)
1383      logical :: doesit
1384 <    doesit = FF_uses_RF
1384 >    if (electrostaticSummationMethod == REACTION_FIELD) doesit = .true.
1385    end function FF_RequiresPostpairCalc
1386  
1387   #ifdef PROFILE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines