ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/UseTheForce/doForces.F90
(Generate patch)

Comparing trunk/OOPSE-3.0/src/UseTheForce/doForces.F90 (file contents):
Revision 2085 by gezelter, Tue Mar 8 21:05:46 2005 UTC vs.
Revision 2306 by chrisfen, Fri Sep 16 20:37:05 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.11 2005-03-08 21:05:46 gezelter Exp $, $Date: 2005-03-08 21:05:46 $, $Name: not supported by cvs2svn $, $Revision: 1.11 $
48 > !! @version $Id: doForces.F90,v 1.45 2005-09-16 20:36:55 chrisfen Exp $, $Date: 2005-09-16 20:36:55 $, $Name: not supported by cvs2svn $, $Revision: 1.45 $
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  
79 +
80    INTEGER, PARAMETER:: PREPAIR_LOOP = 1
81    INTEGER, PARAMETER:: PAIR_LOOP    = 2
82  
80  logical, save :: haveRlist = .false.
83    logical, save :: haveNeighborList = .false.
84    logical, save :: haveSIMvariables = .false.
83  logical, save :: havePropertyMap = .false.
85    logical, save :: haveSaneForceField = .false.
86 <  
86 >  logical, save :: haveInteractionHash = .false.
87 >  logical, save :: haveGtypeCutoffMap = .false.
88 >  logical, save :: haveRlist = .false.
89 >
90    logical, save :: FF_uses_DirectionalAtoms
87  logical, save :: FF_uses_LennardJones
88  logical, save :: FF_uses_Electrostatics
89  logical, save :: FF_uses_Charges
91    logical, save :: FF_uses_Dipoles
91  logical, save :: FF_uses_Quadrupoles
92  logical, save :: FF_uses_sticky
92    logical, save :: FF_uses_GayBerne
93    logical, save :: FF_uses_EAM
95  logical, save :: FF_uses_Shapes
96  logical, save :: FF_uses_FLARB
97  logical, save :: FF_uses_RF
94  
95    logical, save :: SIM_uses_DirectionalAtoms
100  logical, save :: SIM_uses_LennardJones
101  logical, save :: SIM_uses_Electrostatics
102  logical, save :: SIM_uses_Charges
103  logical, save :: SIM_uses_Dipoles
104  logical, save :: SIM_uses_Quadrupoles
105  logical, save :: SIM_uses_Sticky
106  logical, save :: SIM_uses_GayBerne
96    logical, save :: SIM_uses_EAM
108  logical, save :: SIM_uses_Shapes
109  logical, save :: SIM_uses_FLARB
110  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
114  logical, save :: SIM_uses_molecular_cutoffs
100  
101 <  real(kind=dp), save :: rlist, rlistsq
101 >  integer, save :: electrostaticSummationMethod
102  
103    public :: init_FF
104 +  public :: setDefaultCutoffs
105    public :: do_force_loop
106 <  public :: setRlistDF
106 >  public :: createInteractionHash
107 >  public :: createGtypeCutoffMap
108 >  public :: getStickyCut
109 >  public :: getStickyPowerCut
110 >  public :: getGayBerneCut
111 >  public :: getEAMCut
112 >  public :: getShapeCut
113  
114   #ifdef PROFILE
115    public :: getforcetime
# Line 125 | Line 117 | module doForces
117    real :: forceTimeInitial, forceTimeFinal
118    integer :: nLoops
119   #endif
120 +  
121 +  !! Variables for cutoff mapping and interaction mapping
122 +  ! Bit hash to determine pair-pair interactions.
123 +  integer, dimension(:,:), allocatable :: InteractionHash
124 +  real(kind=dp), dimension(:), allocatable :: atypeMaxCutoff
125 +  real(kind=dp), dimension(:), allocatable :: groupMaxCutoff
126 +  integer, dimension(:), allocatable :: groupToGtype
127 +  real(kind=dp), dimension(:), allocatable :: gtypeMaxCutoff
128 +  type ::gtypeCutoffs
129 +     real(kind=dp) :: rcut
130 +     real(kind=dp) :: rcutsq
131 +     real(kind=dp) :: rlistsq
132 +  end type gtypeCutoffs
133 +  type(gtypeCutoffs), dimension(:,:), allocatable :: gtypeCutoffMap
134  
135 <  type :: Properties
136 <     logical :: is_Directional   = .false.
137 <     logical :: is_LennardJones  = .false.
138 <     logical :: is_Electrostatic = .false.
133 <     logical :: is_Charge        = .false.
134 <     logical :: is_Dipole        = .false.
135 <     logical :: is_Quadrupole    = .false.
136 <     logical :: is_Sticky        = .false.
137 <     logical :: is_GayBerne      = .false.
138 <     logical :: is_EAM           = .false.
139 <     logical :: is_Shape         = .false.
140 <     logical :: is_FLARB         = .false.
141 <  end type Properties
142 <
143 <  type(Properties), dimension(:),allocatable :: PropertyMap
144 <
135 >  integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY
136 >  real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist
137 >  real(kind=dp),save :: rcuti
138 >  
139   contains
140  
141 <  subroutine setRlistDF( this_rlist )
148 <    
149 <    real(kind=dp) :: this_rlist
150 <
151 <    rlist = this_rlist
152 <    rlistsq = rlist * rlist
153 <    
154 <    haveRlist = .true.
155 <
156 <  end subroutine setRlistDF    
157 <
158 <  subroutine createPropertyMap(status)
141 >  subroutine createInteractionHash(status)
142      integer :: nAtypes
143 <    integer :: status
143 >    integer, intent(out) :: status
144      integer :: i
145 <    logical :: thisProperty
146 <    real (kind=DP) :: thisDPproperty
145 >    integer :: j
146 >    integer :: iHash
147 >    !! Test Types
148 >    logical :: i_is_LJ
149 >    logical :: i_is_Elect
150 >    logical :: i_is_Sticky
151 >    logical :: i_is_StickyP
152 >    logical :: i_is_GB
153 >    logical :: i_is_EAM
154 >    logical :: i_is_Shape
155 >    logical :: j_is_LJ
156 >    logical :: j_is_Elect
157 >    logical :: j_is_Sticky
158 >    logical :: j_is_StickyP
159 >    logical :: j_is_GB
160 >    logical :: j_is_EAM
161 >    logical :: j_is_Shape
162 >    real(kind=dp) :: myRcut
163  
164 <    status = 0
164 >    status = 0  
165  
166 +    if (.not. associated(atypes)) then
167 +       call handleError("atype", "atypes was not present before call of createInteractionHash!")
168 +       status = -1
169 +       return
170 +    endif
171 +    
172      nAtypes = getSize(atypes)
173 <
173 >    
174      if (nAtypes == 0) then
175         status = -1
176         return
177      end if
178 <        
179 <    if (.not. allocated(PropertyMap)) then
180 <       allocate(PropertyMap(nAtypes))
178 >
179 >    if (.not. allocated(InteractionHash)) then
180 >       allocate(InteractionHash(nAtypes,nAtypes))
181      endif
182  
183 +    if (.not. allocated(atypeMaxCutoff)) then
184 +       allocate(atypeMaxCutoff(nAtypes))
185 +    endif
186 +        
187      do i = 1, nAtypes
188 <       call getElementProperty(atypes, i, "is_Directional", thisProperty)
189 <       PropertyMap(i)%is_Directional = thisProperty
188 >       call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
189 >       call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
190 >       call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
191 >       call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
192 >       call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
193 >       call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
194 >       call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
195  
196 <       call getElementProperty(atypes, i, "is_LennardJones", thisProperty)
183 <       PropertyMap(i)%is_LennardJones = thisProperty
184 <      
185 <       call getElementProperty(atypes, i, "is_Electrostatic", thisProperty)
186 <       PropertyMap(i)%is_Electrostatic = thisProperty
196 >       do j = i, nAtypes
197  
198 <       call getElementProperty(atypes, i, "is_Charge", thisProperty)
199 <       PropertyMap(i)%is_Charge = thisProperty
190 <      
191 <       call getElementProperty(atypes, i, "is_Dipole", thisProperty)
192 <       PropertyMap(i)%is_Dipole = thisProperty
198 >          iHash = 0
199 >          myRcut = 0.0_dp
200  
201 <       call getElementProperty(atypes, i, "is_Quadrupole", thisProperty)
202 <       PropertyMap(i)%is_Quadrupole = thisProperty
201 >          call getElementProperty(atypes, j, "is_LennardJones", j_is_LJ)
202 >          call getElementProperty(atypes, j, "is_Electrostatic", j_is_Elect)
203 >          call getElementProperty(atypes, j, "is_Sticky", j_is_Sticky)
204 >          call getElementProperty(atypes, j, "is_StickyPower", j_is_StickyP)
205 >          call getElementProperty(atypes, j, "is_GayBerne", j_is_GB)
206 >          call getElementProperty(atypes, j, "is_EAM", j_is_EAM)
207 >          call getElementProperty(atypes, j, "is_Shape", j_is_Shape)
208  
209 <       call getElementProperty(atypes, i, "is_Sticky", thisProperty)
210 <       PropertyMap(i)%is_Sticky = thisProperty
209 >          if (i_is_LJ .and. j_is_LJ) then
210 >             iHash = ior(iHash, LJ_PAIR)            
211 >          endif
212 >          
213 >          if (i_is_Elect .and. j_is_Elect) then
214 >             iHash = ior(iHash, ELECTROSTATIC_PAIR)
215 >          endif
216 >          
217 >          if (i_is_Sticky .and. j_is_Sticky) then
218 >             iHash = ior(iHash, STICKY_PAIR)
219 >          endif
220  
221 <       call getElementProperty(atypes, i, "is_GayBerne", thisProperty)
222 <       PropertyMap(i)%is_GayBerne = thisProperty
223 <
203 <       call getElementProperty(atypes, i, "is_EAM", thisProperty)
204 <       PropertyMap(i)%is_EAM = thisProperty
221 >          if (i_is_StickyP .and. j_is_StickyP) then
222 >             iHash = ior(iHash, STICKYPOWER_PAIR)
223 >          endif
224  
225 <       call getElementProperty(atypes, i, "is_Shape", thisProperty)
226 <       PropertyMap(i)%is_Shape = thisProperty
225 >          if (i_is_EAM .and. j_is_EAM) then
226 >             iHash = ior(iHash, EAM_PAIR)
227 >          endif
228  
229 <       call getElementProperty(atypes, i, "is_FLARB", thisProperty)
230 <       PropertyMap(i)%is_FLARB = thisProperty
229 >          if (i_is_GB .and. j_is_GB) iHash = ior(iHash, GAYBERNE_PAIR)
230 >          if (i_is_GB .and. j_is_LJ) iHash = ior(iHash, GAYBERNE_LJ)
231 >          if (i_is_LJ .and. j_is_GB) iHash = ior(iHash, GAYBERNE_LJ)
232 >
233 >          if (i_is_Shape .and. j_is_Shape) iHash = ior(iHash, SHAPE_PAIR)
234 >          if (i_is_Shape .and. j_is_LJ) iHash = ior(iHash, SHAPE_LJ)
235 >          if (i_is_LJ .and. j_is_Shape) iHash = ior(iHash, SHAPE_LJ)
236 >
237 >
238 >          InteractionHash(i,j) = iHash
239 >          InteractionHash(j,i) = iHash
240 >
241 >       end do
242 >
243      end do
244  
245 <    havePropertyMap = .true.
245 >    haveInteractionHash = .true.
246 >  end subroutine createInteractionHash
247  
248 <  end subroutine createPropertyMap
248 >  subroutine createGtypeCutoffMap(stat)
249  
250 +    integer, intent(out), optional :: stat
251 +    logical :: i_is_LJ
252 +    logical :: i_is_Elect
253 +    logical :: i_is_Sticky
254 +    logical :: i_is_StickyP
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 +
266 +    stat = 0
267 +    if (.not. haveInteractionHash) then
268 +       call createInteractionHash(myStatus)      
269 +       if (myStatus .ne. 0) then
270 +          write(default_error, *) 'createInteractionHash failed in doForces!'
271 +          stat = -1
272 +          return
273 +       endif
274 +    endif
275 + #ifdef IS_MPI
276 +    nGroupsInRow = getNgroupsInRow(plan_group_row)
277 + #endif
278 +    nAtypes = getSize(atypes)
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)
284 +          call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
285 +          call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
286 +          call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
287 +          call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
288 +          call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
289 +          call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
290 +          
291 +
292 +          if (i_is_LJ) then
293 +             thisRcut = getSigma(i) * 2.5_dp
294 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
295 +          endif
296 +          if (i_is_Elect) then
297 +             thisRcut = defaultRcut
298 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
299 +          endif
300 +          if (i_is_Sticky) then
301 +             thisRcut = getStickyCut(i)
302 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
303 +          endif
304 +          if (i_is_StickyP) then
305 +             thisRcut = getStickyPowerCut(i)
306 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
307 +          endif
308 +          if (i_is_GB) then
309 +             thisRcut = getGayBerneCut(i)
310 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
311 +          endif
312 +          if (i_is_EAM) then
313 +             thisRcut = getEAMCut(i)
314 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
315 +          endif
316 +          if (i_is_Shape) then
317 +             thisRcut = getShapeCut(i)
318 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
319 +          endif
320 +          
321 +          if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
322 +             biggestAtypeCutoff = atypeMaxCutoff(i)
323 +          endif
324 +       endif
325 +    enddo
326 +  
327 +    nGroupTypes = 0
328 +    
329 +    istart = 1
330 + #ifdef IS_MPI
331 +    iend = nGroupsInRow
332 + #else
333 +    iend = nGroups
334 + #endif
335 +    
336 +    !! allocate the groupToGtype and gtypeMaxCutoff here.
337 +    if(.not.allocated(groupToGtype)) then
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
346 +    !! create gtypes at this point.
347 +    
348 +    tol = 1.0d-6
349 +    
350 +    do i = istart, iend      
351 +       n_in_i = groupStartRow(i+1) - groupStartRow(i)
352 +       groupMaxCutoff(i) = 0.0_dp
353 +       do ia = groupStartRow(i), groupStartRow(i+1)-1
354 +          atom1 = groupListRow(ia)
355 + #ifdef IS_MPI
356 +          me_i = atid_row(atom1)
357 + #else
358 +          me_i = atid(atom1)
359 + #endif          
360 +          if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
361 +             groupMaxCutoff(i)=atypeMaxCutoff(me_i)
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)).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 +
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
388 +    !! map between groups of two types
389 +    
390 +    do i = 1, nGroupTypes
391 +       do j = 1, nGroupTypes
392 +      
393 +          select case(cutoffPolicy)
394 +          case(TRADITIONAL_CUTOFF_POLICY)
395 +             thisRcut = maxval(gtypeMaxCutoff)
396 +          case(MIX_CUTOFF_POLICY)
397 +             thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
398 +          case(MAX_CUTOFF_POLICY)
399 +             thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
400 +          case default
401 +             call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
402 +             return
403 +          end select
404 +          gtypeCutoffMap(i,j)%rcut = thisRcut
405 +          gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
406 +          skin = defaultRlist - defaultRcut
407 +          gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
408 +
409 +       enddo
410 +    enddo
411 +    
412 +    haveGtypeCutoffMap = .true.
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 +     rcuti = 1.0_dp / defaultRcut
424 +   end subroutine setDefaultCutoffs
425 +
426 +   subroutine setCutoffPolicy(cutPolicy)
427 +
428 +     integer, intent(in) :: cutPolicy
429 +     cutoffPolicy = cutPolicy
430 +     call createGtypeCutoffMap()
431 +   end subroutine setCutoffPolicy
432 +    
433 +    
434    subroutine setSimVariables()
435      SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms()
219    SIM_uses_LennardJones = SimUsesLennardJones()
220    SIM_uses_Electrostatics = SimUsesElectrostatics()
221    SIM_uses_Charges = SimUsesCharges()
222    SIM_uses_Dipoles = SimUsesDipoles()
223    SIM_uses_Sticky = SimUsesSticky()
224    SIM_uses_GayBerne = SimUsesGayBerne()
436      SIM_uses_EAM = SimUsesEAM()
226    SIM_uses_Shapes = SimUsesShapes()
227    SIM_uses_FLARB = SimUsesFLARB()
228    SIM_uses_RF = SimUsesRF()
437      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
438      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
439      SIM_uses_PBC = SimUsesPBC()
# Line 241 | Line 449 | contains
449      integer :: myStatus
450  
451      error = 0
244    
245    if (.not. havePropertyMap) then
452  
453 <       myStatus = 0
453 >    if (.not. haveInteractionHash) then      
454 >       myStatus = 0      
455 >       call createInteractionHash(myStatus)      
456 >       if (myStatus .ne. 0) then
457 >          write(default_error, *) 'createInteractionHash failed in doForces!'
458 >          error = -1
459 >          return
460 >       endif
461 >    endif
462  
463 <       call createPropertyMap(myStatus)
464 <
463 >    if (.not. haveGtypeCutoffMap) then        
464 >       myStatus = 0      
465 >       call createGtypeCutoffMap(myStatus)      
466         if (myStatus .ne. 0) then
467 <          write(default_error, *) 'createPropertyMap failed in doForces!'
467 >          write(default_error, *) 'createGtypeCutoffMap failed in doForces!'
468            error = -1
469            return
470         endif
# Line 259 | Line 474 | contains
474         call setSimVariables()
475      endif
476  
477 <    if (.not. haveRlist) then
478 <       write(default_error, *) 'rList has not been set in doForces!'
479 <       error = -1
480 <       return
481 <    endif
477 >  !  if (.not. haveRlist) then
478 >  !     write(default_error, *) 'rList has not been set in doForces!'
479 >  !     error = -1
480 >  !     return
481 >  !  endif
482  
483      if (.not. haveNeighborList) then
484         write(default_error, *) 'neighbor list has not been initialized in doForces!'
# Line 286 | Line 501 | contains
501   #endif
502      return
503    end subroutine doReadyCheck
289    
504  
291  subroutine init_FF(use_RF_c, thisStat)
505  
506 <    logical, intent(in) :: use_RF_c
506 >  subroutine init_FF(thisESM, dampingAlpha, thisStat)
507  
508 +    integer, intent(in) :: thisESM
509 +    real(kind=dp), intent(in) :: dampingAlpha
510      integer, intent(out) :: thisStat  
511      integer :: my_status, nMatches
512      integer, pointer :: MatchList(:) => null()
# Line 300 | Line 515 | contains
515      !! assume things are copacetic, unless they aren't
516      thisStat = 0
517  
518 <    !! Fortran's version of a cast:
519 <    FF_uses_RF = use_RF_c
305 <    
518 >    electrostaticSummationMethod = thisESM
519 >
520      !! init_FF is called *after* all of the atom types have been
521      !! defined in atype_module using the new_atype subroutine.
522      !!
523      !! this will scan through the known atypes and figure out what
524      !! interactions are used by the force field.    
525 <  
525 >
526      FF_uses_DirectionalAtoms = .false.
313    FF_uses_LennardJones = .false.
314    FF_uses_Electrostatics = .false.
315    FF_uses_Charges = .false.    
527      FF_uses_Dipoles = .false.
317    FF_uses_Sticky = .false.
528      FF_uses_GayBerne = .false.
529      FF_uses_EAM = .false.
530 <    FF_uses_Shapes = .false.
321 <    FF_uses_FLARB = .false.
322 <    
530 >
531      call getMatchingElementList(atypes, "is_Directional", .true., &
532           nMatches, MatchList)
533      if (nMatches .gt. 0) FF_uses_DirectionalAtoms = .true.
534  
327    call getMatchingElementList(atypes, "is_LennardJones", .true., &
328         nMatches, MatchList)
329    if (nMatches .gt. 0) FF_uses_LennardJones = .true.
330    
331    call getMatchingElementList(atypes, "is_Electrostatic", .true., &
332         nMatches, MatchList)
333    if (nMatches .gt. 0) then
334       FF_uses_Electrostatics = .true.
335    endif
336
337    call getMatchingElementList(atypes, "is_Charge", .true., &
338         nMatches, MatchList)
339    if (nMatches .gt. 0) then
340       FF_uses_Charges = .true.  
341       FF_uses_Electrostatics = .true.
342    endif
343    
535      call getMatchingElementList(atypes, "is_Dipole", .true., &
536           nMatches, MatchList)
537 <    if (nMatches .gt. 0) then
347 <       FF_uses_Dipoles = .true.
348 <       FF_uses_Electrostatics = .true.
349 <       FF_uses_DirectionalAtoms = .true.
350 <    endif
351 <
352 <    call getMatchingElementList(atypes, "is_Quadrupole", .true., &
353 <         nMatches, MatchList)
354 <    if (nMatches .gt. 0) then
355 <       FF_uses_Quadrupoles = .true.
356 <       FF_uses_Electrostatics = .true.
357 <       FF_uses_DirectionalAtoms = .true.
358 <    endif
537 >    if (nMatches .gt. 0) FF_uses_Dipoles = .true.
538      
360    call getMatchingElementList(atypes, "is_Sticky", .true., nMatches, &
361         MatchList)
362    if (nMatches .gt. 0) then
363       FF_uses_Sticky = .true.
364       FF_uses_DirectionalAtoms = .true.
365    endif
366    
539      call getMatchingElementList(atypes, "is_GayBerne", .true., &
540           nMatches, MatchList)
541 <    if (nMatches .gt. 0) then
542 <       FF_uses_GayBerne = .true.
371 <       FF_uses_DirectionalAtoms = .true.
372 <    endif
373 <    
541 >    if (nMatches .gt. 0) FF_uses_GayBerne = .true.
542 >
543      call getMatchingElementList(atypes, "is_EAM", .true., nMatches, MatchList)
544      if (nMatches .gt. 0) FF_uses_EAM = .true.
376    
377    call getMatchingElementList(atypes, "is_Shape", .true., &
378         nMatches, MatchList)
379    if (nMatches .gt. 0) then
380       FF_uses_Shapes = .true.
381       FF_uses_DirectionalAtoms = .true.
382    endif
545  
384    call getMatchingElementList(atypes, "is_FLARB", .true., &
385         nMatches, MatchList)
386    if (nMatches .gt. 0) FF_uses_FLARB = .true.
546  
388    !! Assume sanity (for the sake of argument)
547      haveSaneForceField = .true.
548 <    
549 <    !! check to make sure the FF_uses_RF setting makes sense
550 <    
551 <    if (FF_uses_dipoles) then
552 <       if (FF_uses_RF) then
548 >
549 >    !! check to make sure the reaction field setting makes sense
550 >
551 >    if (FF_uses_Dipoles) then
552 >       if (electrostaticSummationMethod == 3) then
553            dielect = getDielect()
554            call initialize_rf(dielect)
555         endif
556      else
557 <       if (FF_uses_RF) then          
557 >       if (electrostaticSummationMethod == 3) then
558            write(default_error,*) 'Using Reaction Field with no dipoles?  Huh?'
559            thisStat = -1
560            haveSaneForceField = .false.
561            return
562         endif
563 <    endif
563 >    endif
564  
407    !sticky module does not contain check_sticky_FF anymore
408    !if (FF_uses_sticky) then
409    !   call check_sticky_FF(my_status)
410    !   if (my_status /= 0) then
411    !      thisStat = -1
412    !      haveSaneForceField = .false.
413    !      return
414    !   end if
415    !endif
416
565      if (FF_uses_EAM) then
566 <         call init_EAM_FF(my_status)
566 >       call init_EAM_FF(my_status)
567         if (my_status /= 0) then
568            write(default_error, *) "init_EAM_FF returned a bad status"
569            thisStat = -1
# Line 433 | Line 581 | contains
581         endif
582      endif
583  
436    if (FF_uses_GayBerne .and. FF_uses_LennardJones) then
437    endif
438    
584      if (.not. haveNeighborList) then
585         !! Create neighbor lists
586         call expandNeighborList(nLocal, my_status)
# Line 445 | Line 590 | contains
590            return
591         endif
592         haveNeighborList = .true.
593 <    endif    
594 <    
593 >    endif
594 >
595    end subroutine init_FF
451  
596  
597 +
598    !! Does force loop over i,j pairs. Calls do_pair to calculates forces.
599    !------------------------------------------------------------->
600    subroutine do_force_loop(q, q_group, A, eFrame, f, t, tau, pot, &
# Line 499 | Line 644 | contains
644      integer :: localError
645      integer :: propPack_i, propPack_j
646      integer :: loopStart, loopEnd, loop
647 <
647 >    integer :: iHash
648      real(kind=dp) :: listSkin = 1.0  
649 <    
649 >
650      !! initialize local variables  
651 <    
651 >
652   #ifdef IS_MPI
653      pot_local = 0.0_dp
654      nAtomsInRow   = getNatomsInRow(plan_atom_row)
# Line 513 | Line 658 | contains
658   #else
659      natoms = nlocal
660   #endif
661 <    
661 >
662      call doReadyCheck(localError)
663      if ( localError .ne. 0 ) then
664         call handleError("do_force_loop", "Not Initialized")
# Line 521 | Line 666 | contains
666         return
667      end if
668      call zero_work_arrays()
669 <        
669 >
670      do_pot = do_pot_c
671      do_stress = do_stress_c
672 <    
672 >
673      ! Gather all information needed by all force loops:
674 <    
674 >
675   #ifdef IS_MPI    
676 <    
676 >
677      call gather(q, q_Row, plan_atom_row_3d)
678      call gather(q, q_Col, plan_atom_col_3d)
679  
680      call gather(q_group, q_group_Row, plan_group_row_3d)
681      call gather(q_group, q_group_Col, plan_group_col_3d)
682 <        
682 >
683      if (FF_UsesDirectionalAtoms() .and. SIM_uses_DirectionalAtoms) then
684         call gather(eFrame, eFrame_Row, plan_atom_row_rotation)
685         call gather(eFrame, eFrame_Col, plan_atom_col_rotation)
686 <      
686 >
687         call gather(A, A_Row, plan_atom_row_rotation)
688         call gather(A, A_Col, plan_atom_col_rotation)
689      endif
690 <    
690 >
691   #endif
692 <    
692 >
693      !! Begin force loop timing:
694   #ifdef PROFILE
695      call cpu_time(forceTimeInitial)
696      nloops = nloops + 1
697   #endif
698 <    
698 >
699      loopEnd = PAIR_LOOP
700      if (FF_RequiresPrepairCalc() .and. SIM_requires_prepair_calc) then
701         loopStart = PREPAIR_LOOP
# Line 565 | Line 710 | contains
710         if (loop .eq. loopStart) then
711   #ifdef IS_MPI
712            call checkNeighborList(nGroupsInRow, q_group_row, listSkin, &
713 <             update_nlist)
713 >               update_nlist)
714   #else
715            call checkNeighborList(nGroups, q_group, listSkin, &
716 <             update_nlist)
716 >               update_nlist)
717   #endif
718         endif
719 <      
719 >
720         if (update_nlist) then
721            !! save current configuration and construct neighbor list
722   #ifdef IS_MPI
# Line 582 | Line 727 | contains
727            neighborListSize = size(list)
728            nlist = 0
729         endif
730 <      
730 >
731         istart = 1
732   #ifdef IS_MPI
733         iend = nGroupsInRow
# Line 592 | Line 737 | contains
737         outer: do i = istart, iend
738  
739            if (update_nlist) point(i) = nlist + 1
740 <          
740 >
741            n_in_i = groupStartRow(i+1) - groupStartRow(i)
742 <          
742 >
743            if (update_nlist) then
744   #ifdef IS_MPI
745               jstart = 1
# Line 609 | Line 754 | contains
754               ! make sure group i has neighbors
755               if (jstart .gt. jend) cycle outer
756            endif
757 <          
757 >
758            do jnab = jstart, jend
759               if (update_nlist) then
760                  j = jnab
# Line 618 | Line 763 | contains
763               endif
764  
765   #ifdef IS_MPI
766 +             me_j = atid_col(j)
767               call get_interatomic_vector(q_group_Row(:,i), &
768                    q_group_Col(:,j), d_grp, rgrpsq)
769   #else
770 +             me_j = atid(j)
771               call get_interatomic_vector(q_group(:,i), &
772                    q_group(:,j), d_grp, rgrpsq)
773   #endif
774  
775 <             if (rgrpsq < rlistsq) then
775 >             if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
776                  if (update_nlist) then
777                     nlist = nlist + 1
778 <                  
778 >
779                     if (nlist > neighborListSize) then
780   #ifdef IS_MPI                
781                        call expandNeighborList(nGroupsInRow, listerror)
# Line 642 | Line 789 | contains
789                        end if
790                        neighborListSize = size(list)
791                     endif
792 <                  
792 >
793                     list(nlist) = j
794                  endif
795 <                
795 >
796                  if (loop .eq. PAIR_LOOP) then
797                     vij = 0.0d0
798                     fij(1:3) = 0.0d0
799                  endif
800 <                
800 >
801                  call get_switch(rgrpsq, sw, dswdr, rgrp, group_switch, &
802                       in_switching_region)
803 <                
803 >
804                  n_in_j = groupStartCol(j+1) - groupStartCol(j)
805 <                
805 >
806                  do ia = groupStartRow(i), groupStartRow(i+1)-1
807 <                  
807 >
808                     atom1 = groupListRow(ia)
809 <                  
809 >
810                     inner: do jb = groupStartCol(j), groupStartCol(j+1)-1
811 <                      
811 >
812                        atom2 = groupListCol(jb)
813 <                      
813 >
814                        if (skipThisPair(atom1, atom2)) cycle inner
815  
816                        if ((n_in_i .eq. 1).and.(n_in_j .eq. 1)) then
# Line 705 | Line 852 | contains
852                        endif
853                     enddo inner
854                  enddo
855 <                
855 >
856                  if (loop .eq. PAIR_LOOP) then
857                     if (in_switching_region) then
858                        swderiv = vij*dswdr/rgrp
859                        fij(1) = fij(1) + swderiv*d_grp(1)
860                        fij(2) = fij(2) + swderiv*d_grp(2)
861                        fij(3) = fij(3) + swderiv*d_grp(3)
862 <                      
862 >
863                        do ia=groupStartRow(i), groupStartRow(i+1)-1
864                           atom1=groupListRow(ia)
865                           mf = mfactRow(atom1)
# Line 726 | Line 873 | contains
873                           f(3,atom1) = f(3,atom1) + swderiv*d_grp(3)*mf
874   #endif
875                        enddo
876 <                      
876 >
877                        do jb=groupStartCol(j), groupStartCol(j+1)-1
878                           atom2=groupListCol(jb)
879                           mf = mfactCol(atom2)
# Line 741 | Line 888 | contains
888   #endif
889                        enddo
890                     endif
891 <                  
891 >
892                     if (do_stress) call add_stress_tensor(d_grp, fij)
893                  endif
894               end if
895            enddo
896         enddo outer
897 <      
897 >
898         if (update_nlist) then
899   #ifdef IS_MPI
900            point(nGroupsInRow + 1) = nlist + 1
# Line 761 | Line 908 | contains
908               update_nlist = .false.                              
909            endif
910         endif
911 <            
911 >
912         if (loop .eq. PREPAIR_LOOP) then
913            call do_preforce(nlocal, pot)
914         endif
915 <      
915 >
916      enddo
917 <    
917 >
918      !! Do timing
919   #ifdef PROFILE
920      call cpu_time(forceTimeFinal)
921      forceTime = forceTime + forceTimeFinal - forceTimeInitial
922   #endif    
923 <    
923 >
924   #ifdef IS_MPI
925      !!distribute forces
926 <    
926 >
927      f_temp = 0.0_dp
928      call scatter(f_Row,f_temp,plan_atom_row_3d)
929      do i = 1,nlocal
930         f(1:3,i) = f(1:3,i) + f_temp(1:3,i)
931      end do
932 <    
932 >
933      f_temp = 0.0_dp
934      call scatter(f_Col,f_temp,plan_atom_col_3d)
935      do i = 1,nlocal
936         f(1:3,i) = f(1:3,i) + f_temp(1:3,i)
937      end do
938 <    
938 >
939      if (FF_UsesDirectionalAtoms() .and. SIM_uses_DirectionalAtoms) then
940         t_temp = 0.0_dp
941         call scatter(t_Row,t_temp,plan_atom_row_3d)
# Line 797 | Line 944 | contains
944         end do
945         t_temp = 0.0_dp
946         call scatter(t_Col,t_temp,plan_atom_col_3d)
947 <      
947 >
948         do i = 1,nlocal
949            t(1:3,i) = t(1:3,i) + t_temp(1:3,i)
950         end do
951      endif
952 <    
952 >
953      if (do_pot) then
954         ! scatter/gather pot_row into the members of my column
955         call scatter(pot_Row, pot_Temp, plan_atom_row)
956 <      
956 >
957         ! scatter/gather pot_local into all other procs
958         ! add resultant to get total pot
959         do i = 1, nlocal
960            pot_local = pot_local + pot_Temp(i)
961         enddo
962 <      
962 >
963         pot_Temp = 0.0_DP
964 <      
964 >
965         call scatter(pot_Col, pot_Temp, plan_atom_col)
966         do i = 1, nlocal
967            pot_local = pot_local + pot_Temp(i)
968         enddo
969 <      
969 >
970      endif
971   #endif
972 <    
972 >
973      if (FF_RequiresPostpairCalc() .and. SIM_requires_postpair_calc) then
974 <      
975 <       if (FF_uses_RF .and. SIM_uses_RF) then
976 <          
974 >
975 >       if (electrostaticSummationMethod == 3) then
976 >
977   #ifdef IS_MPI
978            call scatter(rf_Row,rf,plan_atom_row_3d)
979            call scatter(rf_Col,rf_Temp,plan_atom_col_3d)
# Line 834 | Line 981 | contains
981               rf(1:3,i) = rf(1:3,i) + rf_Temp(1:3,i)
982            end do
983   #endif
984 <          
984 >
985            do i = 1, nLocal
986 <            
986 >
987               rfpot = 0.0_DP
988   #ifdef IS_MPI
989               me_i = atid_row(i)
990   #else
991               me_i = atid(i)
992   #endif
993 +             iHash = InteractionHash(me_i,me_j)
994              
995 <             if (PropertyMap(me_i)%is_Dipole) then
996 <                
995 >             if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
996 >
997                  mu_i = getDipoleMoment(me_i)
998 <                
998 >
999                  !! The reaction field needs to include a self contribution
1000                  !! to the field:
1001                  call accumulate_self_rf(i, mu_i, eFrame)
# Line 858 | Line 1006 | contains
1006                  pot_local = pot_local + rfpot
1007   #else
1008                  pot = pot + rfpot
1009 <      
1009 >
1010   #endif
1011 <             endif            
1011 >             endif
1012            enddo
1013         endif
1014      endif
1015 <    
1016 <    
1015 >
1016 >
1017   #ifdef IS_MPI
1018 <    
1018 >
1019      if (do_pot) then
1020         pot = pot + pot_local
1021         !! we assume the c code will do the allreduce to get the total potential
1022         !! we could do it right here if we needed to...
1023      endif
1024 <    
1024 >
1025      if (do_stress) then
1026         call mpi_allreduce(tau_Temp, tau, 9,mpi_double_precision,mpi_sum, &
1027              mpi_comm_world,mpi_err)
1028         call mpi_allreduce(virial_Temp, virial,1,mpi_double_precision,mpi_sum, &
1029              mpi_comm_world,mpi_err)
1030      endif
1031 <    
1031 >
1032   #else
1033 <    
1033 >
1034      if (do_stress) then
1035         tau = tau_Temp
1036         virial = virial_Temp
1037      endif
1038 <    
1038 >
1039   #endif
1040 <      
1040 >
1041    end subroutine do_force_loop
1042 <  
1042 >
1043    subroutine do_pair(i, j, rijsq, d, sw, do_pot, &
1044         eFrame, A, f, t, pot, vpair, fpair)
1045  
# Line 910 | Line 1058 | contains
1058      real ( kind = dp ), intent(inout) :: d(3)
1059      integer :: me_i, me_j
1060  
1061 +    integer :: iHash
1062 +
1063      r = sqrt(rijsq)
1064      vpair = 0.0d0
1065      fpair(1:3) = 0.0d0
# Line 922 | Line 1072 | contains
1072      me_j = atid(j)
1073   #endif
1074  
1075 < !    write(*,*) i, j, me_i, me_j
1076 <    
1077 <    if (FF_uses_LennardJones .and. SIM_uses_LennardJones) then
1078 <      
929 <       if ( PropertyMap(me_i)%is_LennardJones .and. &
930 <            PropertyMap(me_j)%is_LennardJones ) then
931 <          call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
932 <       endif
933 <      
1075 >    iHash = InteractionHash(me_i, me_j)
1076 >
1077 >    if ( iand(iHash, LJ_PAIR).ne.0 ) then
1078 >       call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
1079      endif
935    
936    if (FF_uses_Electrostatics .and. SIM_uses_Electrostatics) then
937      
938       if (PropertyMap(me_i)%is_Electrostatic .and. &
939            PropertyMap(me_j)%is_Electrostatic) then
940          call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
941               pot, eFrame, f, t, do_pot)
942       endif
943      
944       if (FF_uses_dipoles .and. SIM_uses_dipoles) then      
945          if ( PropertyMap(me_i)%is_Dipole .and. &
946               PropertyMap(me_j)%is_Dipole) then
947             if (FF_uses_RF .and. SIM_uses_RF) then
948                call accumulate_rf(i, j, r, eFrame, sw)
949                call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair)
950             endif
951          endif
952       endif
953    endif
1080  
1081 +    if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1082 +       call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1083 +            pot, eFrame, f, t, do_pot)
1084  
1085 <    if (FF_uses_Sticky .and. SIM_uses_sticky) then
1085 >       if (electrostaticSummationMethod == 3) then
1086  
1087 <       if ( PropertyMap(me_i)%is_Sticky .and. PropertyMap(me_j)%is_Sticky) then
1088 <          call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1089 <               pot, A, f, t, do_pot)
1087 >          ! CHECK ME (RF needs to know about all electrostatic types)
1088 >          call accumulate_rf(i, j, r, eFrame, sw)
1089 >          call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair)
1090         endif
1091 <      
1091 >
1092      endif
1093  
1094 +    if ( iand(iHash, STICKY_PAIR).ne.0 ) then
1095 +       call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1096 +            pot, A, f, t, do_pot)
1097 +    endif
1098  
1099 <    if (FF_uses_GayBerne .and. SIM_uses_GayBerne) then
1100 <      
1101 <       if ( PropertyMap(me_i)%is_GayBerne .and. &
969 <            PropertyMap(me_j)%is_GayBerne) then
970 <          call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
971 <               pot, A, f, t, do_pot)
972 <       endif
973 <      
1099 >    if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then
1100 >       call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1101 >            pot, A, f, t, do_pot)
1102      endif
1103 +
1104 +    if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then
1105 +       call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1106 +            pot, A, f, t, do_pot)
1107 +    endif
1108      
1109 <    if (FF_uses_EAM .and. SIM_uses_EAM) then
1110 <      
1111 <       if ( PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) then
979 <          call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
980 <               do_pot)
981 <       endif
982 <      
1109 >    if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then
1110 > !      call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1111 > !           pot, A, f, t, do_pot)
1112      endif
1113  
1114 +    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1115 +       call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
1116 +            do_pot)
1117 +    endif
1118  
1119 < !    write(*,*) PropertyMap(me_i)%is_Shape,PropertyMap(me_j)%is_Shape
1119 >    if ( iand(iHash, SHAPE_PAIR).ne.0 ) then      
1120 >       call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1121 >            pot, A, f, t, do_pot)
1122 >    endif
1123  
1124 <    if (FF_uses_Shapes .and. SIM_uses_Shapes) then
1125 <       if ( PropertyMap(me_i)%is_Shape .and. &
1126 <            PropertyMap(me_j)%is_Shape ) then
991 <          call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
992 <               pot, A, f, t, do_pot)
993 <       endif
994 <      
1124 >    if ( iand(iHash, SHAPE_LJ).ne.0 ) then      
1125 >       call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1126 >            pot, A, f, t, do_pot)
1127      endif
1128      
1129    end subroutine do_pair
# Line 999 | Line 1131 | contains
1131    subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, &
1132         do_pot, do_stress, eFrame, A, f, t, pot)
1133  
1134 <   real( kind = dp ) :: pot, sw
1135 <   real( kind = dp ), dimension(9,nLocal) :: eFrame
1136 <   real (kind=dp), dimension(9,nLocal) :: A
1137 <   real (kind=dp), dimension(3,nLocal) :: f
1138 <   real (kind=dp), dimension(3,nLocal) :: t
1007 <  
1008 <   logical, intent(inout) :: do_pot, do_stress
1009 <   integer, intent(in) :: i, j
1010 <   real ( kind = dp ), intent(inout)    :: rijsq, rcijsq
1011 <   real ( kind = dp )                :: r, rc
1012 <   real ( kind = dp ), intent(inout) :: d(3), dc(3)
1013 <  
1014 <   logical :: is_EAM_i, is_EAM_j
1015 <  
1016 <   integer :: me_i, me_j
1017 <  
1134 >    real( kind = dp ) :: pot, sw
1135 >    real( kind = dp ), dimension(9,nLocal) :: eFrame
1136 >    real (kind=dp), dimension(9,nLocal) :: A
1137 >    real (kind=dp), dimension(3,nLocal) :: f
1138 >    real (kind=dp), dimension(3,nLocal) :: t
1139  
1140 +    logical, intent(inout) :: do_pot, do_stress
1141 +    integer, intent(in) :: i, j
1142 +    real ( kind = dp ), intent(inout)    :: rijsq, rcijsq
1143 +    real ( kind = dp )                :: r, rc
1144 +    real ( kind = dp ), intent(inout) :: d(3), dc(3)
1145 +
1146 +    integer :: me_i, me_j, iHash
1147 +
1148      r = sqrt(rijsq)
1020    if (SIM_uses_molecular_cutoffs) then
1021       rc = sqrt(rcijsq)
1022    else
1023       rc = r
1024    endif
1025  
1149  
1150   #ifdef IS_MPI  
1151 <   me_i = atid_row(i)
1152 <   me_j = atid_col(j)  
1151 >    me_i = atid_row(i)
1152 >    me_j = atid_col(j)  
1153   #else  
1154 <   me_i = atid(i)
1155 <   me_j = atid(j)  
1154 >    me_i = atid(i)
1155 >    me_j = atid(j)  
1156   #endif
1034  
1035   if (FF_uses_EAM .and. SIM_uses_EAM) then
1036      
1037      if (PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) &
1038           call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1039      
1040   endif
1041  
1042 end subroutine do_prepair
1043
1044
1045 subroutine do_preforce(nlocal,pot)
1046   integer :: nlocal
1047   real( kind = dp ) :: pot
1048  
1049   if (FF_uses_EAM .and. SIM_uses_EAM) then
1050      call calc_EAM_preforce_Frho(nlocal,pot)
1051   endif
1052  
1053  
1054 end subroutine do_preforce
1055
1056
1057 subroutine get_interatomic_vector(q_i, q_j, d, r_sq)
1058  
1059   real (kind = dp), dimension(3) :: q_i
1060   real (kind = dp), dimension(3) :: q_j
1061   real ( kind = dp ), intent(out) :: r_sq
1062   real( kind = dp ) :: d(3), scaled(3)
1063   integer i
1064  
1065   d(1:3) = q_j(1:3) - q_i(1:3)
1066  
1067   ! Wrap back into periodic box if necessary
1068   if ( SIM_uses_PBC ) then
1069      
1070      if( .not.boxIsOrthorhombic ) then
1071         ! calc the scaled coordinates.
1072        
1073         scaled = matmul(HmatInv, d)
1074        
1075         ! wrap the scaled coordinates
1076        
1077         scaled = scaled  - anint(scaled)
1078        
1079        
1080         ! calc the wrapped real coordinates from the wrapped scaled
1081         ! coordinates
1082        
1083         d = matmul(Hmat,scaled)
1084        
1085      else
1086         ! calc the scaled coordinates.
1087        
1088         do i = 1, 3
1089            scaled(i) = d(i) * HmatInv(i,i)
1090            
1091            ! wrap the scaled coordinates
1092            
1093            scaled(i) = scaled(i) - anint(scaled(i))
1094            
1095            ! calc the wrapped real coordinates from the wrapped scaled
1096            ! coordinates
1097            
1098            d(i) = scaled(i)*Hmat(i,i)
1099         enddo
1100      endif
1101      
1102   endif
1103  
1104   r_sq = dot_product(d,d)
1105  
1106 end subroutine get_interatomic_vector
1107
1108 subroutine zero_work_arrays()
1109  
1110 #ifdef IS_MPI
1111  
1112   q_Row = 0.0_dp
1113   q_Col = 0.0_dp
1157  
1158 <   q_group_Row = 0.0_dp
1159 <   q_group_Col = 0.0_dp  
1160 <  
1161 <   eFrame_Row = 0.0_dp
1162 <   eFrame_Col = 0.0_dp
1163 <  
1164 <   A_Row = 0.0_dp
1165 <   A_Col = 0.0_dp
1166 <  
1167 <   f_Row = 0.0_dp
1168 <   f_Col = 0.0_dp
1169 <   f_Temp = 0.0_dp
1170 <  
1171 <   t_Row = 0.0_dp
1172 <   t_Col = 0.0_dp
1173 <   t_Temp = 0.0_dp
1174 <  
1175 <   pot_Row = 0.0_dp
1176 <   pot_Col = 0.0_dp
1177 <   pot_Temp = 0.0_dp
1178 <  
1179 <   rf_Row = 0.0_dp
1180 <   rf_Col = 0.0_dp
1181 <   rf_Temp = 0.0_dp
1182 <  
1183 < #endif
1184 <
1185 <   if (FF_uses_EAM .and. SIM_uses_EAM) then
1186 <      call clean_EAM()
1187 <   endif
1188 <  
1189 <   rf = 0.0_dp
1190 <   tau_Temp = 0.0_dp
1191 <   virial_Temp = 0.0_dp
1192 < end subroutine zero_work_arrays
1193 <
1194 < function skipThisPair(atom1, atom2) result(skip_it)
1195 <   integer, intent(in) :: atom1
1196 <   integer, intent(in), optional :: atom2
1197 <   logical :: skip_it
1198 <   integer :: unique_id_1, unique_id_2
1199 <   integer :: me_i,me_j
1200 <   integer :: i
1201 <  
1202 <   skip_it = .false.
1203 <  
1204 <   !! there are a number of reasons to skip a pair or a particle
1205 <   !! mostly we do this to exclude atoms who are involved in short
1206 <   !! range interactions (bonds, bends, torsions), but we also need
1207 <   !! to exclude some overcounted interactions that result from
1208 <   !! the parallel decomposition
1209 <  
1210 < #ifdef IS_MPI
1211 <   !! in MPI, we have to look up the unique IDs for each atom
1212 <   unique_id_1 = AtomRowToGlobal(atom1)
1213 < #else
1214 <   !! in the normal loop, the atom numbers are unique
1215 <   unique_id_1 = atom1
1216 < #endif
1217 <  
1218 <   !! We were called with only one atom, so just check the global exclude
1219 <   !! list for this atom
1220 <   if (.not. present(atom2)) then
1221 <      do i = 1, nExcludes_global
1222 <         if (excludesGlobal(i) == unique_id_1) then
1223 <            skip_it = .true.
1224 <            return
1225 <         end if
1226 <      end do
1227 <      return
1228 <   end if
1229 <  
1230 < #ifdef IS_MPI
1231 <   unique_id_2 = AtomColToGlobal(atom2)
1189 < #else
1190 <   unique_id_2 = atom2
1191 < #endif
1192 <  
1158 >    iHash = InteractionHash(me_i, me_j)
1159 >
1160 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1161 >            call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1162 >    endif
1163 >    
1164 >  end subroutine do_prepair
1165 >
1166 >
1167 >  subroutine do_preforce(nlocal,pot)
1168 >    integer :: nlocal
1169 >    real( kind = dp ) :: pot
1170 >
1171 >    if (FF_uses_EAM .and. SIM_uses_EAM) then
1172 >       call calc_EAM_preforce_Frho(nlocal,pot)
1173 >    endif
1174 >
1175 >
1176 >  end subroutine do_preforce
1177 >
1178 >
1179 >  subroutine get_interatomic_vector(q_i, q_j, d, r_sq)
1180 >
1181 >    real (kind = dp), dimension(3) :: q_i
1182 >    real (kind = dp), dimension(3) :: q_j
1183 >    real ( kind = dp ), intent(out) :: r_sq
1184 >    real( kind = dp ) :: d(3), scaled(3)
1185 >    integer i
1186 >
1187 >    d(1:3) = q_j(1:3) - q_i(1:3)
1188 >
1189 >    ! Wrap back into periodic box if necessary
1190 >    if ( SIM_uses_PBC ) then
1191 >
1192 >       if( .not.boxIsOrthorhombic ) then
1193 >          ! calc the scaled coordinates.
1194 >
1195 >          scaled = matmul(HmatInv, d)
1196 >
1197 >          ! wrap the scaled coordinates
1198 >
1199 >          scaled = scaled  - anint(scaled)
1200 >
1201 >
1202 >          ! calc the wrapped real coordinates from the wrapped scaled
1203 >          ! coordinates
1204 >
1205 >          d = matmul(Hmat,scaled)
1206 >
1207 >       else
1208 >          ! calc the scaled coordinates.
1209 >
1210 >          do i = 1, 3
1211 >             scaled(i) = d(i) * HmatInv(i,i)
1212 >
1213 >             ! wrap the scaled coordinates
1214 >
1215 >             scaled(i) = scaled(i) - anint(scaled(i))
1216 >
1217 >             ! calc the wrapped real coordinates from the wrapped scaled
1218 >             ! coordinates
1219 >
1220 >             d(i) = scaled(i)*Hmat(i,i)
1221 >          enddo
1222 >       endif
1223 >
1224 >    endif
1225 >
1226 >    r_sq = dot_product(d,d)
1227 >
1228 >  end subroutine get_interatomic_vector
1229 >
1230 >  subroutine zero_work_arrays()
1231 >
1232   #ifdef IS_MPI
1233 <   !! this situation should only arise in MPI simulations
1234 <   if (unique_id_1 == unique_id_2) then
1235 <      skip_it = .true.
1236 <      return
1237 <   end if
1238 <  
1239 <   !! this prevents us from doing the pair on multiple processors
1240 <   if (unique_id_1 < unique_id_2) then
1241 <      if (mod(unique_id_1 + unique_id_2,2) == 0) then
1242 <         skip_it = .true.
1243 <         return
1244 <      endif
1245 <   else                
1246 <      if (mod(unique_id_1 + unique_id_2,2) == 1) then
1247 <         skip_it = .true.
1248 <         return
1249 <      endif
1250 <   endif
1233 >
1234 >    q_Row = 0.0_dp
1235 >    q_Col = 0.0_dp
1236 >
1237 >    q_group_Row = 0.0_dp
1238 >    q_group_Col = 0.0_dp  
1239 >
1240 >    eFrame_Row = 0.0_dp
1241 >    eFrame_Col = 0.0_dp
1242 >
1243 >    A_Row = 0.0_dp
1244 >    A_Col = 0.0_dp
1245 >
1246 >    f_Row = 0.0_dp
1247 >    f_Col = 0.0_dp
1248 >    f_Temp = 0.0_dp
1249 >
1250 >    t_Row = 0.0_dp
1251 >    t_Col = 0.0_dp
1252 >    t_Temp = 0.0_dp
1253 >
1254 >    pot_Row = 0.0_dp
1255 >    pot_Col = 0.0_dp
1256 >    pot_Temp = 0.0_dp
1257 >
1258 >    rf_Row = 0.0_dp
1259 >    rf_Col = 0.0_dp
1260 >    rf_Temp = 0.0_dp
1261 >
1262   #endif
1263 <  
1264 <   !! the rest of these situations can happen in all simulations:
1265 <   do i = 1, nExcludes_global      
1266 <      if ((excludesGlobal(i) == unique_id_1) .or. &
1267 <           (excludesGlobal(i) == unique_id_2)) then
1268 <         skip_it = .true.
1269 <         return
1270 <      endif
1271 <   enddo
1272 <  
1273 <   do i = 1, nSkipsForAtom(atom1)
1274 <      if (skipsForAtom(atom1, i) .eq. unique_id_2) then
1275 <         skip_it = .true.
1276 <         return
1277 <      endif
1278 <   end do
1279 <  
1280 <   return
1281 < end function skipThisPair
1282 <
1283 < function FF_UsesDirectionalAtoms() result(doesit)
1284 <   logical :: doesit
1285 <   doesit = FF_uses_DirectionalAtoms .or. FF_uses_Dipoles .or. &
1286 <        FF_uses_Quadrupoles .or. FF_uses_Sticky .or. &
1287 <        FF_uses_GayBerne .or. FF_uses_Shapes
1288 < end function FF_UsesDirectionalAtoms
1289 <
1290 < function FF_RequiresPrepairCalc() result(doesit)
1291 <   logical :: doesit
1292 <   doesit = FF_uses_EAM
1293 < end function FF_RequiresPrepairCalc
1294 <
1295 < function FF_RequiresPostpairCalc() result(doesit)
1296 <   logical :: doesit
1297 <   doesit = FF_uses_RF
1298 < end function FF_RequiresPostpairCalc
1299 <
1263 >
1264 >    if (FF_uses_EAM .and. SIM_uses_EAM) then
1265 >       call clean_EAM()
1266 >    endif
1267 >
1268 >    rf = 0.0_dp
1269 >    tau_Temp = 0.0_dp
1270 >    virial_Temp = 0.0_dp
1271 >  end subroutine zero_work_arrays
1272 >
1273 >  function skipThisPair(atom1, atom2) result(skip_it)
1274 >    integer, intent(in) :: atom1
1275 >    integer, intent(in), optional :: atom2
1276 >    logical :: skip_it
1277 >    integer :: unique_id_1, unique_id_2
1278 >    integer :: me_i,me_j
1279 >    integer :: i
1280 >
1281 >    skip_it = .false.
1282 >
1283 >    !! there are a number of reasons to skip a pair or a particle
1284 >    !! mostly we do this to exclude atoms who are involved in short
1285 >    !! range interactions (bonds, bends, torsions), but we also need
1286 >    !! to exclude some overcounted interactions that result from
1287 >    !! the parallel decomposition
1288 >
1289 > #ifdef IS_MPI
1290 >    !! in MPI, we have to look up the unique IDs for each atom
1291 >    unique_id_1 = AtomRowToGlobal(atom1)
1292 > #else
1293 >    !! in the normal loop, the atom numbers are unique
1294 >    unique_id_1 = atom1
1295 > #endif
1296 >
1297 >    !! We were called with only one atom, so just check the global exclude
1298 >    !! list for this atom
1299 >    if (.not. present(atom2)) then
1300 >       do i = 1, nExcludes_global
1301 >          if (excludesGlobal(i) == unique_id_1) then
1302 >             skip_it = .true.
1303 >             return
1304 >          end if
1305 >       end do
1306 >       return
1307 >    end if
1308 >
1309 > #ifdef IS_MPI
1310 >    unique_id_2 = AtomColToGlobal(atom2)
1311 > #else
1312 >    unique_id_2 = atom2
1313 > #endif
1314 >
1315 > #ifdef IS_MPI
1316 >    !! this situation should only arise in MPI simulations
1317 >    if (unique_id_1 == unique_id_2) then
1318 >       skip_it = .true.
1319 >       return
1320 >    end if
1321 >
1322 >    !! this prevents us from doing the pair on multiple processors
1323 >    if (unique_id_1 < unique_id_2) then
1324 >       if (mod(unique_id_1 + unique_id_2,2) == 0) then
1325 >          skip_it = .true.
1326 >          return
1327 >       endif
1328 >    else                
1329 >       if (mod(unique_id_1 + unique_id_2,2) == 1) then
1330 >          skip_it = .true.
1331 >          return
1332 >       endif
1333 >    endif
1334 > #endif
1335 >
1336 >    !! the rest of these situations can happen in all simulations:
1337 >    do i = 1, nExcludes_global      
1338 >       if ((excludesGlobal(i) == unique_id_1) .or. &
1339 >            (excludesGlobal(i) == unique_id_2)) then
1340 >          skip_it = .true.
1341 >          return
1342 >       endif
1343 >    enddo
1344 >
1345 >    do i = 1, nSkipsForAtom(atom1)
1346 >       if (skipsForAtom(atom1, i) .eq. unique_id_2) then
1347 >          skip_it = .true.
1348 >          return
1349 >       endif
1350 >    end do
1351 >
1352 >    return
1353 >  end function skipThisPair
1354 >
1355 >  function FF_UsesDirectionalAtoms() result(doesit)
1356 >    logical :: doesit
1357 >    doesit = FF_uses_DirectionalAtoms
1358 >  end function FF_UsesDirectionalAtoms
1359 >
1360 >  function FF_RequiresPrepairCalc() result(doesit)
1361 >    logical :: doesit
1362 >    doesit = FF_uses_EAM
1363 >  end function FF_RequiresPrepairCalc
1364 >
1365 >  function FF_RequiresPostpairCalc() result(doesit)
1366 >    logical :: doesit
1367 >    if (electrostaticSummationMethod == 3) doesit = .true.
1368 >  end function FF_RequiresPostpairCalc
1369 >
1370   #ifdef PROFILE
1371 < function getforcetime() result(totalforcetime)
1372 <   real(kind=dp) :: totalforcetime
1373 <   totalforcetime = forcetime
1374 < end function getforcetime
1371 >  function getforcetime() result(totalforcetime)
1372 >    real(kind=dp) :: totalforcetime
1373 >    totalforcetime = forcetime
1374 >  end function getforcetime
1375   #endif
1256
1257 !! This cleans componets of force arrays belonging only to fortran
1376  
1377 < subroutine add_stress_tensor(dpair, fpair)
1378 <  
1379 <   real( kind = dp ), dimension(3), intent(in) :: dpair, fpair
1380 <  
1381 <   ! because the d vector is the rj - ri vector, and
1382 <   ! because fx, fy, fz are the force on atom i, we need a
1383 <   ! negative sign here:  
1384 <  
1385 <   tau_Temp(1) = tau_Temp(1) - dpair(1) * fpair(1)
1386 <   tau_Temp(2) = tau_Temp(2) - dpair(1) * fpair(2)
1387 <   tau_Temp(3) = tau_Temp(3) - dpair(1) * fpair(3)
1388 <   tau_Temp(4) = tau_Temp(4) - dpair(2) * fpair(1)
1389 <   tau_Temp(5) = tau_Temp(5) - dpair(2) * fpair(2)
1390 <   tau_Temp(6) = tau_Temp(6) - dpair(2) * fpair(3)
1391 <   tau_Temp(7) = tau_Temp(7) - dpair(3) * fpair(1)
1392 <   tau_Temp(8) = tau_Temp(8) - dpair(3) * fpair(2)
1393 <   tau_Temp(9) = tau_Temp(9) - dpair(3) * fpair(3)
1394 <  
1395 <   virial_Temp = virial_Temp + &
1396 <        (tau_Temp(1) + tau_Temp(5) + tau_Temp(9))
1397 <  
1398 < end subroutine add_stress_tensor
1399 <
1377 >  !! This cleans componets of force arrays belonging only to fortran
1378 >
1379 >  subroutine add_stress_tensor(dpair, fpair)
1380 >
1381 >    real( kind = dp ), dimension(3), intent(in) :: dpair, fpair
1382 >
1383 >    ! because the d vector is the rj - ri vector, and
1384 >    ! because fx, fy, fz are the force on atom i, we need a
1385 >    ! negative sign here:  
1386 >
1387 >    tau_Temp(1) = tau_Temp(1) - dpair(1) * fpair(1)
1388 >    tau_Temp(2) = tau_Temp(2) - dpair(1) * fpair(2)
1389 >    tau_Temp(3) = tau_Temp(3) - dpair(1) * fpair(3)
1390 >    tau_Temp(4) = tau_Temp(4) - dpair(2) * fpair(1)
1391 >    tau_Temp(5) = tau_Temp(5) - dpair(2) * fpair(2)
1392 >    tau_Temp(6) = tau_Temp(6) - dpair(2) * fpair(3)
1393 >    tau_Temp(7) = tau_Temp(7) - dpair(3) * fpair(1)
1394 >    tau_Temp(8) = tau_Temp(8) - dpair(3) * fpair(2)
1395 >    tau_Temp(9) = tau_Temp(9) - dpair(3) * fpair(3)
1396 >
1397 >    virial_Temp = virial_Temp + &
1398 >         (tau_Temp(1) + tau_Temp(5) + tau_Temp(9))
1399 >
1400 >  end subroutine add_stress_tensor
1401 >
1402   end module doForces

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines