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 2231 by chrisfen, Wed May 18 18:31:40 2005 UTC vs.
Revision 2274 by gezelter, Wed Aug 17 15:26:42 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.18 2005-05-18 18:31:40 chrisfen Exp $, $Date: 2005-05-18 18:31:40 $, $Name: not supported by cvs2svn $, $Revision: 1.18 $
48 > !! @version $Id: doForces.F90,v 1.30 2005-08-17 15:26:37 gezelter Exp $, $Date: 2005-08-17 15:26:37 $, $Name: not supported by cvs2svn $, $Revision: 1.30 $
49  
50  
51   module doForces
# 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 +  logical, save :: haveInteractionHash = .false.
87 +  logical, save :: haveGtypeCutoffMap = .false.
88  
89    logical, save :: FF_uses_DirectionalAtoms
87  logical, save :: FF_uses_LennardJones
88  logical, save :: FF_uses_Electrostatics
89  logical, save :: FF_uses_Charges
90    logical, save :: FF_uses_Dipoles
91  logical, save :: FF_uses_Quadrupoles
92  logical, save :: FF_uses_Sticky
93  logical, save :: FF_uses_StickyPower
91    logical, save :: FF_uses_GayBerne
92    logical, save :: FF_uses_EAM
96  logical, save :: FF_uses_Shapes
97  logical, save :: FF_uses_FLARB
93    logical, save :: FF_uses_RF
94  
95    logical, save :: SIM_uses_DirectionalAtoms
101  logical, save :: SIM_uses_LennardJones
102  logical, save :: SIM_uses_Electrostatics
103  logical, save :: SIM_uses_Charges
104  logical, save :: SIM_uses_Dipoles
105  logical, save :: SIM_uses_Quadrupoles
106  logical, save :: SIM_uses_Sticky
107  logical, save :: SIM_uses_StickyPower
108  logical, save :: SIM_uses_GayBerne
96    logical, save :: SIM_uses_EAM
110  logical, save :: SIM_uses_Shapes
111  logical, save :: SIM_uses_FLARB
97    logical, save :: SIM_uses_RF
98    logical, save :: SIM_requires_postpair_calc
99    logical, save :: SIM_requires_prepair_calc
100    logical, save :: SIM_uses_PBC
116  logical, save :: SIM_uses_molecular_cutoffs
101  
118  real(kind=dp), save :: rlist, rlistsq
119
102    public :: init_FF
103 +  public :: setDefaultCutoffs
104    public :: do_force_loop
105 <  public :: setRlistDF
105 >  public :: createInteractionHash
106 >  public :: createGtypeCutoffMap
107  
108   #ifdef PROFILE
109    public :: getforcetime
# Line 127 | Line 111 | module doForces
111    real :: forceTimeInitial, forceTimeFinal
112    integer :: nLoops
113   #endif
114 +  
115 +  !! Variables for cutoff mapping and interaction mapping
116 +  ! Bit hash to determine pair-pair interactions.
117 +  integer, dimension(:,:), allocatable :: InteractionHash
118 +  real(kind=dp), dimension(:), allocatable :: atypeMaxCutoff
119 +  real(kind=dp), dimension(:), allocatable :: groupMaxCutoff
120 +  integer, dimension(:), allocatable :: groupToGtype
121 +  real(kind=dp), dimension(:), allocatable :: gtypeMaxCutoff
122 +  type ::gtypeCutoffs
123 +     real(kind=dp) :: rcut
124 +     real(kind=dp) :: rcutsq
125 +     real(kind=dp) :: rlistsq
126 +  end type gtypeCutoffs
127 +  type(gtypeCutoffs), dimension(:,:), allocatable :: gtypeCutoffMap
128  
129 <  type :: Properties
130 <     logical :: is_Directional   = .false.
131 <     logical :: is_LennardJones  = .false.
134 <     logical :: is_Electrostatic = .false.
135 <     logical :: is_Charge        = .false.
136 <     logical :: is_Dipole        = .false.
137 <     logical :: is_Quadrupole    = .false.
138 <     logical :: is_Sticky        = .false.
139 <     logical :: is_StickyPower   = .false.
140 <     logical :: is_GayBerne      = .false.
141 <     logical :: is_EAM           = .false.
142 <     logical :: is_Shape         = .false.
143 <     logical :: is_FLARB         = .false.
144 <  end type Properties
145 <
146 <  type(Properties), dimension(:),allocatable :: PropertyMap
147 <
129 >  integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY
130 >  real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist
131 >  
132   contains
133  
134 <  subroutine setRlistDF( this_rlist )
151 <
152 <    real(kind=dp) :: this_rlist
153 <
154 <    rlist = this_rlist
155 <    rlistsq = rlist * rlist
156 <
157 <    haveRlist = .true.
158 <
159 <  end subroutine setRlistDF
160 <
161 <  subroutine createPropertyMap(status)
134 >  subroutine createInteractionHash(status)
135      integer :: nAtypes
136 <    integer :: status
136 >    integer, intent(out) :: status
137      integer :: i
138 <    logical :: thisProperty
139 <    real (kind=DP) :: thisDPproperty
138 >    integer :: j
139 >    integer :: iHash
140 >    !! Test Types
141 >    logical :: i_is_LJ
142 >    logical :: i_is_Elect
143 >    logical :: i_is_Sticky
144 >    logical :: i_is_StickyP
145 >    logical :: i_is_GB
146 >    logical :: i_is_EAM
147 >    logical :: i_is_Shape
148 >    logical :: j_is_LJ
149 >    logical :: j_is_Elect
150 >    logical :: j_is_Sticky
151 >    logical :: j_is_StickyP
152 >    logical :: j_is_GB
153 >    logical :: j_is_EAM
154 >    logical :: j_is_Shape
155 >    
156 >    status = 0  
157  
158 <    status = 0
159 <
158 >    if (.not. associated(atypes)) then
159 >       call handleError("atype", "atypes was not present before call of createInteractionHash!")
160 >       status = -1
161 >       return
162 >    endif
163 >    
164      nAtypes = getSize(atypes)
165 <
165 >    
166      if (nAtypes == 0) then
167         status = -1
168         return
169      end if
170  
171 <    if (.not. allocated(PropertyMap)) then
172 <       allocate(PropertyMap(nAtypes))
171 >    if (.not. allocated(InteractionHash)) then
172 >       allocate(InteractionHash(nAtypes,nAtypes))
173      endif
174  
175 +    if (.not. allocated(atypeMaxCutoff)) then
176 +       allocate(atypeMaxCutoff(nAtypes))
177 +    endif
178 +        
179      do i = 1, nAtypes
180 <       call getElementProperty(atypes, i, "is_Directional", thisProperty)
181 <       PropertyMap(i)%is_Directional = thisProperty
180 >       call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
181 >       call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
182 >       call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
183 >       call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
184 >       call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
185 >       call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
186 >       call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
187  
188 <       call getElementProperty(atypes, i, "is_LennardJones", thisProperty)
186 <       PropertyMap(i)%is_LennardJones = thisProperty
188 >       do j = i, nAtypes
189  
190 <       call getElementProperty(atypes, i, "is_Electrostatic", thisProperty)
191 <       PropertyMap(i)%is_Electrostatic = thisProperty
190 >          iHash = 0
191 >          myRcut = 0.0_dp
192  
193 <       call getElementProperty(atypes, i, "is_Charge", thisProperty)
194 <       PropertyMap(i)%is_Charge = thisProperty
193 >          call getElementProperty(atypes, j, "is_LennardJones", j_is_LJ)
194 >          call getElementProperty(atypes, j, "is_Electrostatic", j_is_Elect)
195 >          call getElementProperty(atypes, j, "is_Sticky", j_is_Sticky)
196 >          call getElementProperty(atypes, j, "is_StickyPower", j_is_StickyP)
197 >          call getElementProperty(atypes, j, "is_GayBerne", j_is_GB)
198 >          call getElementProperty(atypes, j, "is_EAM", j_is_EAM)
199 >          call getElementProperty(atypes, j, "is_Shape", j_is_Shape)
200  
201 <       call getElementProperty(atypes, i, "is_Dipole", thisProperty)
202 <       PropertyMap(i)%is_Dipole = thisProperty
203 <
204 <       call getElementProperty(atypes, i, "is_Quadrupole", thisProperty)
205 <       PropertyMap(i)%is_Quadrupole = thisProperty
201 >          if (i_is_LJ .and. j_is_LJ) then
202 >             iHash = ior(iHash, LJ_PAIR)            
203 >          endif
204 >          
205 >          if (i_is_Elect .and. j_is_Elect) then
206 >             iHash = ior(iHash, ELECTROSTATIC_PAIR)
207 >          endif
208 >          
209 >          if (i_is_Sticky .and. j_is_Sticky) then
210 >             iHash = ior(iHash, STICKY_PAIR)
211 >          endif
212  
213 <       call getElementProperty(atypes, i, "is_Sticky", thisProperty)
214 <       PropertyMap(i)%is_Sticky = thisProperty
215 <      
203 <       call getElementProperty(atypes, i, "is_StickyPower", thisProperty)
204 <       PropertyMap(i)%is_StickyPower = thisProperty
213 >          if (i_is_StickyP .and. j_is_StickyP) then
214 >             iHash = ior(iHash, STICKYPOWER_PAIR)
215 >          endif
216  
217 <       call getElementProperty(atypes, i, "is_GayBerne", thisProperty)
218 <       PropertyMap(i)%is_GayBerne = thisProperty
217 >          if (i_is_EAM .and. j_is_EAM) then
218 >             iHash = ior(iHash, EAM_PAIR)
219 >          endif
220  
221 <       call getElementProperty(atypes, i, "is_EAM", thisProperty)
222 <       PropertyMap(i)%is_EAM = thisProperty
221 >          if (i_is_GB .and. j_is_GB) iHash = ior(iHash, GAYBERNE_PAIR)
222 >          if (i_is_GB .and. j_is_LJ) iHash = ior(iHash, GAYBERNE_LJ)
223 >          if (i_is_LJ .and. j_is_GB) iHash = ior(iHash, GAYBERNE_LJ)
224  
225 <       call getElementProperty(atypes, i, "is_Shape", thisProperty)
226 <       PropertyMap(i)%is_Shape = thisProperty
225 >          if (i_is_Shape .and. j_is_Shape) iHash = ior(iHash, SHAPE_PAIR)
226 >          if (i_is_Shape .and. j_is_LJ) iHash = ior(iHash, SHAPE_LJ)
227 >          if (i_is_LJ .and. j_is_Shape) iHash = ior(iHash, SHAPE_LJ)
228  
229 <       call getElementProperty(atypes, i, "is_FLARB", thisProperty)
230 <       PropertyMap(i)%is_FLARB = thisProperty
229 >
230 >          InteractionHash(i,j) = iHash
231 >          InteractionHash(j,i) = iHash
232 >
233 >       end do
234 >
235      end do
236  
237 <    havePropertyMap = .true.
237 >    haveInteractionHash = .true.
238 >  end subroutine createInteractionHash
239  
240 <  end subroutine createPropertyMap
240 >  subroutine createGtypeCutoffMap()
241 >
242 >    logical :: i_is_LJ
243 >    logical :: i_is_Elect
244 >    logical :: i_is_Sticky
245 >    logical :: i_is_StickyP
246 >    logical :: i_is_GB
247 >    logical :: i_is_EAM
248 >    logical :: i_is_Shape
249 >
250 >    integer :: myStatus, nAtypes
251 >    real(kind=dp):: thisSigma, bigSigma
252 >
253 >    stat = 0
254 >    if (.not. haveInteractionHash) then
255 >       call createInteractionHash(myStatus)      
256 >       if (myStatus .ne. 0) then
257 >          write(default_error, *) 'createInteractionHash failed in doForces!'
258 >          stat = -1
259 >          return
260 >       endif
261 >    endif
262 >
263 >    nAtypes = getSize(atypes)
264 >    
265 >    do i = 1, nAtypes
266 >       if (SimHasAtype(i)) then          
267 >          call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
268 >          call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
269 >          call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
270 >          call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
271 >          call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
272 >          call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
273 >          call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
274 >          
275 >          if (i_is_LJ) then
276 >             thisRcut = getSigma(i) * 2.5_dp
277 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
278 >          endif
279 >          if (i_is_Elect) then
280 >             thisRcut = defaultRcut
281 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
282 >          endif
283 >          if (i_is_Sticky) then
284 >             thisRcut = getStickyCut(i)
285 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
286 >          endif
287 >          if (i_is_StickyPower) then
288 >             thisRcut = getStickyPowerCut(i)
289 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
290 >          endif
291 >          if (i_is_GayBerne) then
292 >             thisRcut = getGayBerneCut(i)
293 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
294 >          endif
295 >          if (i_is_EAM) then
296 >             thisRcut = getEAMCut(i)
297 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
298 >          endif
299 >          if (i_is_Shape) then
300 >             thisRcut = getShapeCut(i)
301 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
302 >          endif
303 >          
304 >          if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
305 >             biggestAtypeCutoff = atypeMaxCutoff(i)
306 >          endif
307 >       endif
308 >    enddo
309 >
310 >    istart = 1
311 > #ifdef IS_MPI
312 >    iend = nGroupsInRow
313 > #else
314 >    iend = nGroups
315 > #endif
316 >    outer: do i = istart, iend
317 >
318 >       n_in_i = groupStartRow(i+1) - groupStartRow(i)
319 >
320 > #ifdef IS_MPI
321 >             jstart = 1
322 >             jend = nGroupsInCol
323 > #else
324 >             jstart = i+1
325 >             jend = nGroups
326 > #endif
327 >
328 >
329 >
330 >            
331 >
332 >
333 >
334 >     haveGtypeCutoffMap = .true.
335 >   end subroutine createGtypeCutoffMap
336 >
337 >   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
338 >     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
339 >     integer, intent(in) :: cutPolicy
340  
341 +     defaultRcut = defRcut
342 +     defaultRsw = defRsw
343 +     defaultRlist = defRlist
344 +     cutoffPolicy = cutPolicy
345 +   end subroutine setDefaultCutoffs
346 +
347 +   subroutine setCutoffPolicy(cutPolicy)
348 +
349 +     integer, intent(in) :: cutPolicy
350 +     cutoffPolicy = cutPolicy
351 +     call createGtypeCutoffMap()
352 +
353 +   end subroutine setDefaultCutoffs
354 +    
355 +    
356    subroutine setSimVariables()
357      SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms()
225    SIM_uses_LennardJones = SimUsesLennardJones()
226    SIM_uses_Electrostatics = SimUsesElectrostatics()
227    SIM_uses_Charges = SimUsesCharges()
228    SIM_uses_Dipoles = SimUsesDipoles()
229    SIM_uses_Sticky = SimUsesSticky()
230    SIM_uses_StickyPower = SimUsesStickyPower()
231    SIM_uses_GayBerne = SimUsesGayBerne()
358      SIM_uses_EAM = SimUsesEAM()
233    SIM_uses_Shapes = SimUsesShapes()
234    SIM_uses_FLARB = SimUsesFLARB()
359      SIM_uses_RF = SimUsesRF()
360      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
361      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
# Line 249 | Line 373 | contains
373  
374      error = 0
375  
376 <    if (.not. havePropertyMap) then
376 >    if (.not. haveInteractionHash) then      
377 >       myStatus = 0      
378 >       call createInteractionHash(myStatus)      
379 >       if (myStatus .ne. 0) then
380 >          write(default_error, *) 'createInteractionHash failed in doForces!'
381 >          error = -1
382 >          return
383 >       endif
384 >    endif
385  
386 <       myStatus = 0
387 <
388 <       call createPropertyMap(myStatus)
257 <
386 >    if (.not. haveGtypeCutoffMap) then        
387 >       myStatus = 0      
388 >       call createGtypeCutoffMap(myStatus)      
389         if (myStatus .ne. 0) then
390 <          write(default_error, *) 'createPropertyMap failed in doForces!'
390 >          write(default_error, *) 'createGtypeCutoffMap failed in doForces!'
391            error = -1
392            return
393         endif
# Line 317 | Line 448 | contains
448      !! interactions are used by the force field.    
449  
450      FF_uses_DirectionalAtoms = .false.
320    FF_uses_LennardJones = .false.
321    FF_uses_Electrostatics = .false.
322    FF_uses_Charges = .false.    
451      FF_uses_Dipoles = .false.
324    FF_uses_Sticky = .false.
325    FF_uses_StickyPower = .false.
452      FF_uses_GayBerne = .false.
453      FF_uses_EAM = .false.
328    FF_uses_Shapes = .false.
329    FF_uses_FLARB = .false.
454  
455      call getMatchingElementList(atypes, "is_Directional", .true., &
456           nMatches, MatchList)
457      if (nMatches .gt. 0) FF_uses_DirectionalAtoms = .true.
458  
335    call getMatchingElementList(atypes, "is_LennardJones", .true., &
336         nMatches, MatchList)
337    if (nMatches .gt. 0) FF_uses_LennardJones = .true.
338
339    call getMatchingElementList(atypes, "is_Electrostatic", .true., &
340         nMatches, MatchList)
341    if (nMatches .gt. 0) then
342       FF_uses_Electrostatics = .true.
343    endif
344
345    call getMatchingElementList(atypes, "is_Charge", .true., &
346         nMatches, MatchList)
347    if (nMatches .gt. 0) then
348       FF_uses_Charges = .true.  
349       FF_uses_Electrostatics = .true.
350    endif
351
459      call getMatchingElementList(atypes, "is_Dipole", .true., &
460           nMatches, MatchList)
461 <    if (nMatches .gt. 0) then
355 <       FF_uses_Dipoles = .true.
356 <       FF_uses_Electrostatics = .true.
357 <       FF_uses_DirectionalAtoms = .true.
358 <    endif
359 <
360 <    call getMatchingElementList(atypes, "is_Quadrupole", .true., &
361 <         nMatches, MatchList)
362 <    if (nMatches .gt. 0) then
363 <       FF_uses_Quadrupoles = .true.
364 <       FF_uses_Electrostatics = .true.
365 <       FF_uses_DirectionalAtoms = .true.
366 <    endif
367 <
368 <    call getMatchingElementList(atypes, "is_Sticky", .true., nMatches, &
369 <         MatchList)
370 <    if (nMatches .gt. 0) then
371 <       FF_uses_Sticky = .true.
372 <       FF_uses_DirectionalAtoms = .true.
373 <    endif
374 <
375 <    call getMatchingElementList(atypes, "is_StickyPower", .true., nMatches, &
376 <         MatchList)
377 <    if (nMatches .gt. 0) then
378 <       FF_uses_StickyPower = .true.
379 <       FF_uses_DirectionalAtoms = .true.
380 <    endif
461 >    if (nMatches .gt. 0) FF_uses_Dipoles = .true.
462      
463      call getMatchingElementList(atypes, "is_GayBerne", .true., &
464           nMatches, MatchList)
465 <    if (nMatches .gt. 0) then
385 <       FF_uses_GayBerne = .true.
386 <       FF_uses_DirectionalAtoms = .true.
387 <    endif
465 >    if (nMatches .gt. 0) FF_uses_GayBerne = .true.
466  
467      call getMatchingElementList(atypes, "is_EAM", .true., nMatches, MatchList)
468      if (nMatches .gt. 0) FF_uses_EAM = .true.
391
392    call getMatchingElementList(atypes, "is_Shape", .true., &
393         nMatches, MatchList)
394    if (nMatches .gt. 0) then
395       FF_uses_Shapes = .true.
396       FF_uses_DirectionalAtoms = .true.
397    endif
469  
399    call getMatchingElementList(atypes, "is_FLARB", .true., &
400         nMatches, MatchList)
401    if (nMatches .gt. 0) FF_uses_FLARB = .true.
470  
403    !! Assume sanity (for the sake of argument)
471      haveSaneForceField = .true.
472  
473      !! check to make sure the FF_uses_RF setting makes sense
474  
475 <    if (FF_uses_dipoles) then
475 >    if (FF_uses_Dipoles) then
476         if (FF_uses_RF) then
477            dielect = getDielect()
478            call initialize_rf(dielect)
# Line 419 | Line 486 | contains
486         endif
487      endif
488  
422    !sticky module does not contain check_sticky_FF anymore
423    !if (FF_uses_sticky) then
424    !   call check_sticky_FF(my_status)
425    !   if (my_status /= 0) then
426    !      thisStat = -1
427    !      haveSaneForceField = .false.
428    !      return
429    !   end if
430    !endif
431
489      if (FF_uses_EAM) then
490         call init_EAM_FF(my_status)
491         if (my_status /= 0) then
# Line 446 | Line 503 | contains
503            haveSaneForceField = .false.
504            return
505         endif
449    endif
450
451    if (FF_uses_GayBerne .and. FF_uses_LennardJones) then
506      endif
507  
508      if (.not. haveNeighborList) then
# Line 514 | Line 568 | contains
568      integer :: localError
569      integer :: propPack_i, propPack_j
570      integer :: loopStart, loopEnd, loop
571 <
571 >    integer :: iHash
572      real(kind=dp) :: listSkin = 1.0  
573  
574      !! initialize local variables  
# Line 633 | Line 687 | contains
687               endif
688  
689   #ifdef IS_MPI
690 +             me_j = atid_col(j)
691               call get_interatomic_vector(q_group_Row(:,i), &
692                    q_group_Col(:,j), d_grp, rgrpsq)
693   #else
694 +             me_j = atid(j)
695               call get_interatomic_vector(q_group(:,i), &
696                    q_group(:,j), d_grp, rgrpsq)
697   #endif
698  
699 <             if (rgrpsq < rlistsq) then
699 >             if (rgrpsq < InteractionHash(me_i,me_j)%rListsq) then
700                  if (update_nlist) then
701                     nlist = nlist + 1
702  
# Line 858 | Line 914 | contains
914   #else
915               me_i = atid(i)
916   #endif
917 <
918 <             if (PropertyMap(me_i)%is_Dipole) then
917 >             iHash = InteractionHash(me_i,me_j)
918 >            
919 >             if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
920  
921                  mu_i = getDipoleMoment(me_i)
922  
# Line 926 | Line 983 | contains
983      real ( kind = dp ) :: ebalance
984      integer :: me_i, me_j
985  
986 +    integer :: iHash
987 +
988      r = sqrt(rijsq)
989      vpair = 0.0d0
990      fpair(1:3) = 0.0d0
# Line 938 | Line 997 | contains
997      me_j = atid(j)
998   #endif
999  
1000 <    !    write(*,*) i, j, me_i, me_j
1000 >    iHash = InteractionHash(me_i, me_j)
1001  
1002 <    if (FF_uses_LennardJones .and. SIM_uses_LennardJones) then
1003 <
945 <       if ( PropertyMap(me_i)%is_LennardJones .and. &
946 <            PropertyMap(me_j)%is_LennardJones ) then
947 <          call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
948 <       endif
949 <
1002 >    if ( iand(iHash, LJ_PAIR).ne.0 ) then
1003 >       call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
1004      endif
1005  
1006 <    if (FF_uses_Electrostatics .and. SIM_uses_Electrostatics) then
1006 >    if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1007 >       call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1008 >            pot, eFrame, f, t, do_pot)
1009  
1010 <       if (PropertyMap(me_i)%is_Electrostatic .and. &
955 <            PropertyMap(me_j)%is_Electrostatic) then
956 <          call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
957 <               pot, eFrame, f, t, do_pot, ebalance)
958 <       endif
1010 >       if (FF_uses_RF .and. SIM_uses_RF) then
1011  
1012 <       if (FF_uses_dipoles .and. SIM_uses_dipoles) then      
1013 <          if ( PropertyMap(me_i)%is_Dipole .and. &
1014 <               PropertyMap(me_j)%is_Dipole) then
963 <             if (FF_uses_RF .and. SIM_uses_RF) then
964 <                call accumulate_rf(i, j, r, eFrame, sw)
965 <                call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair)
966 <             endif
967 <          endif
1012 >          ! CHECK ME (RF needs to know about all electrostatic types)
1013 >          call accumulate_rf(i, j, r, eFrame, sw)
1014 >          call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair)
1015         endif
1016 +
1017      endif
1018  
1019 +    if ( iand(iHash, STICKY_PAIR).ne.0 ) then
1020 +       call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1021 +            pot, A, f, t, do_pot)
1022 +    endif
1023  
1024 <    if (FF_uses_Sticky .and. SIM_uses_sticky) then
1025 <
1026 <       if ( PropertyMap(me_i)%is_Sticky .and. PropertyMap(me_j)%is_Sticky) then
975 <          call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
976 <               pot, A, f, t, do_pot)
977 <       endif
978 <
1024 >    if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then
1025 >       call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1026 >            pot, A, f, t, do_pot)
1027      endif
1028  
1029 <    if (FF_uses_StickyPower .and. SIM_uses_stickypower) then
1030 <       if ( PropertyMap(me_i)%is_StickyPower .and. &
1031 <            PropertyMap(me_j)%is_StickyPower) then
984 <          call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
985 <               pot, A, f, t, do_pot, ebalance)
986 <       endif
1029 >    if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then
1030 >       call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1031 >            pot, A, f, t, do_pot)
1032      endif
1033      
1034 <    if (FF_uses_GayBerne .and. SIM_uses_GayBerne) then
1035 <
1036 <       if ( PropertyMap(me_i)%is_GayBerne .and. &
992 <            PropertyMap(me_j)%is_GayBerne) then
993 <          call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
994 <               pot, A, f, t, do_pot)
995 <       endif
996 <
1034 >    if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then
1035 > !      call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1036 > !           pot, A, f, t, do_pot)
1037      endif
1038  
1039 <    if (FF_uses_EAM .and. SIM_uses_EAM) then
1040 <
1041 <       if ( PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) then
1002 <          call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
1003 <               do_pot)
1004 <       endif
1005 <
1039 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1040 >       call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
1041 >            do_pot)
1042      endif
1043  
1044 <
1045 <    !    write(*,*) PropertyMap(me_i)%is_Shape,PropertyMap(me_j)%is_Shape
1046 <
1011 <    if (FF_uses_Shapes .and. SIM_uses_Shapes) then
1012 <       if ( PropertyMap(me_i)%is_Shape .and. &
1013 <            PropertyMap(me_j)%is_Shape ) then
1014 <          call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1015 <               pot, A, f, t, do_pot)
1016 <       endif
1017 <       if ( (PropertyMap(me_i)%is_Shape .and. &
1018 <            PropertyMap(me_j)%is_LennardJones) .or. &
1019 <            (PropertyMap(me_i)%is_LennardJones .and. &
1020 <            PropertyMap(me_j)%is_Shape) ) then
1021 <          call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1022 <               pot, A, f, t, do_pot)
1023 <       endif
1044 >    if ( iand(iHash, SHAPE_PAIR).ne.0 ) then      
1045 >       call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1046 >            pot, A, f, t, do_pot)
1047      endif
1048  
1049 +    if ( iand(iHash, SHAPE_LJ).ne.0 ) then      
1050 +       call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1051 +            pot, A, f, t, do_pot)
1052 +    endif
1053 +    
1054    end subroutine do_pair
1055  
1056    subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, &
# Line 1040 | Line 1068 | contains
1068      real ( kind = dp )                :: r, rc
1069      real ( kind = dp ), intent(inout) :: d(3), dc(3)
1070  
1071 <    logical :: is_EAM_i, is_EAM_j
1071 >    integer :: me_i, me_j, iHash
1072  
1045    integer :: me_i, me_j
1046
1047
1048    r = sqrt(rijsq)
1049    if (SIM_uses_molecular_cutoffs) then
1050       rc = sqrt(rcijsq)
1051    else
1052       rc = r
1053    endif
1054
1055
1073   #ifdef IS_MPI  
1074      me_i = atid_row(i)
1075      me_j = atid_col(j)  
# Line 1061 | Line 1078 | contains
1078      me_j = atid(j)  
1079   #endif
1080  
1081 <    if (FF_uses_EAM .and. SIM_uses_EAM) then
1081 >    iHash = InteractionHash(me_i, me_j)
1082  
1083 <       if (PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) &
1083 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1084              call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1068
1085      endif
1086 <
1086 >    
1087    end subroutine do_prepair
1088  
1089  
# Line 1261 | Line 1277 | contains
1277  
1278    function FF_UsesDirectionalAtoms() result(doesit)
1279      logical :: doesit
1280 <    doesit = FF_uses_DirectionalAtoms .or. FF_uses_Dipoles .or. &
1265 <         FF_uses_Quadrupoles .or. FF_uses_Sticky .or. &
1266 <         FF_uses_StickyPower .or. FF_uses_GayBerne .or. FF_uses_Shapes
1280 >    doesit = FF_uses_DirectionalAtoms
1281    end function FF_UsesDirectionalAtoms
1282  
1283    function FF_RequiresPrepairCalc() result(doesit)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines