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 2275 by gezelter, Fri Aug 26 16:36:16 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.31 2005-08-26 16:36:16 gezelter Exp $, $Date: 2005-08-26 16:36:16 $, $Name: not supported by cvs2svn $, $Revision: 1.31 $
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 >    real(kind=dp) :: myRcut
156  
157 <    status = 0
157 >    status = 0  
158  
159 +    if (.not. associated(atypes)) then
160 +       call handleError("atype", "atypes was not present before call of createInteractionHash!")
161 +       status = -1
162 +       return
163 +    endif
164 +    
165      nAtypes = getSize(atypes)
166 <
166 >    
167      if (nAtypes == 0) then
168         status = -1
169         return
170      end if
171  
172 <    if (.not. allocated(PropertyMap)) then
173 <       allocate(PropertyMap(nAtypes))
172 >    if (.not. allocated(InteractionHash)) then
173 >       allocate(InteractionHash(nAtypes,nAtypes))
174      endif
175  
176 +    if (.not. allocated(atypeMaxCutoff)) then
177 +       allocate(atypeMaxCutoff(nAtypes))
178 +    endif
179 +        
180      do i = 1, nAtypes
181 <       call getElementProperty(atypes, i, "is_Directional", thisProperty)
182 <       PropertyMap(i)%is_Directional = thisProperty
181 >       call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
182 >       call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
183 >       call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
184 >       call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
185 >       call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
186 >       call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
187 >       call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
188  
189 <       call getElementProperty(atypes, i, "is_LennardJones", thisProperty)
186 <       PropertyMap(i)%is_LennardJones = thisProperty
189 >       do j = i, nAtypes
190  
191 <       call getElementProperty(atypes, i, "is_Electrostatic", thisProperty)
192 <       PropertyMap(i)%is_Electrostatic = thisProperty
191 >          iHash = 0
192 >          myRcut = 0.0_dp
193  
194 <       call getElementProperty(atypes, i, "is_Charge", thisProperty)
195 <       PropertyMap(i)%is_Charge = thisProperty
194 >          call getElementProperty(atypes, j, "is_LennardJones", j_is_LJ)
195 >          call getElementProperty(atypes, j, "is_Electrostatic", j_is_Elect)
196 >          call getElementProperty(atypes, j, "is_Sticky", j_is_Sticky)
197 >          call getElementProperty(atypes, j, "is_StickyPower", j_is_StickyP)
198 >          call getElementProperty(atypes, j, "is_GayBerne", j_is_GB)
199 >          call getElementProperty(atypes, j, "is_EAM", j_is_EAM)
200 >          call getElementProperty(atypes, j, "is_Shape", j_is_Shape)
201  
202 <       call getElementProperty(atypes, i, "is_Dipole", thisProperty)
203 <       PropertyMap(i)%is_Dipole = thisProperty
204 <
205 <       call getElementProperty(atypes, i, "is_Quadrupole", thisProperty)
206 <       PropertyMap(i)%is_Quadrupole = thisProperty
202 >          if (i_is_LJ .and. j_is_LJ) then
203 >             iHash = ior(iHash, LJ_PAIR)            
204 >          endif
205 >          
206 >          if (i_is_Elect .and. j_is_Elect) then
207 >             iHash = ior(iHash, ELECTROSTATIC_PAIR)
208 >          endif
209 >          
210 >          if (i_is_Sticky .and. j_is_Sticky) then
211 >             iHash = ior(iHash, STICKY_PAIR)
212 >          endif
213  
214 <       call getElementProperty(atypes, i, "is_Sticky", thisProperty)
215 <       PropertyMap(i)%is_Sticky = thisProperty
216 <      
203 <       call getElementProperty(atypes, i, "is_StickyPower", thisProperty)
204 <       PropertyMap(i)%is_StickyPower = thisProperty
214 >          if (i_is_StickyP .and. j_is_StickyP) then
215 >             iHash = ior(iHash, STICKYPOWER_PAIR)
216 >          endif
217  
218 <       call getElementProperty(atypes, i, "is_GayBerne", thisProperty)
219 <       PropertyMap(i)%is_GayBerne = thisProperty
218 >          if (i_is_EAM .and. j_is_EAM) then
219 >             iHash = ior(iHash, EAM_PAIR)
220 >          endif
221  
222 <       call getElementProperty(atypes, i, "is_EAM", thisProperty)
223 <       PropertyMap(i)%is_EAM = thisProperty
222 >          if (i_is_GB .and. j_is_GB) iHash = ior(iHash, GAYBERNE_PAIR)
223 >          if (i_is_GB .and. j_is_LJ) iHash = ior(iHash, GAYBERNE_LJ)
224 >          if (i_is_LJ .and. j_is_GB) iHash = ior(iHash, GAYBERNE_LJ)
225  
226 <       call getElementProperty(atypes, i, "is_Shape", thisProperty)
227 <       PropertyMap(i)%is_Shape = thisProperty
226 >          if (i_is_Shape .and. j_is_Shape) iHash = ior(iHash, SHAPE_PAIR)
227 >          if (i_is_Shape .and. j_is_LJ) iHash = ior(iHash, SHAPE_LJ)
228 >          if (i_is_LJ .and. j_is_Shape) iHash = ior(iHash, SHAPE_LJ)
229  
230 <       call getElementProperty(atypes, i, "is_FLARB", thisProperty)
231 <       PropertyMap(i)%is_FLARB = thisProperty
230 >
231 >          InteractionHash(i,j) = iHash
232 >          InteractionHash(j,i) = iHash
233 >
234 >       end do
235 >
236      end do
237  
238 <    havePropertyMap = .true.
238 >    haveInteractionHash = .true.
239 >  end subroutine createInteractionHash
240  
241 <  end subroutine createPropertyMap
241 >  subroutine createGtypeCutoffMap(stat)
242  
243 +    integer, intent(out), optional :: stat
244 +    logical :: i_is_LJ
245 +    logical :: i_is_Elect
246 +    logical :: i_is_Sticky
247 +    logical :: i_is_StickyP
248 +    logical :: i_is_GB
249 +    logical :: i_is_EAM
250 +    logical :: i_is_Shape
251 +
252 +    integer :: myStatus, nAtypes,  i, j, istart, iend, jstart, jend
253 +    integer :: n_in_i
254 +    real(kind=dp):: thisSigma, bigSigma, thisRcut
255 +    real(kind=dp) :: biggestAtypeCutoff
256 +
257 +    stat = 0
258 +    if (.not. haveInteractionHash) then
259 +       call createInteractionHash(myStatus)      
260 +       if (myStatus .ne. 0) then
261 +          write(default_error, *) 'createInteractionHash failed in doForces!'
262 +          stat = -1
263 +          return
264 +       endif
265 +    endif
266 +
267 +    nAtypes = getSize(atypes)
268 +    
269 +    do i = 1, nAtypes
270 +       if (SimHasAtype(i)) then          
271 +          call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
272 +          call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
273 +          call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
274 +          call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
275 +          call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
276 +          call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
277 +          call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
278 +          
279 +          if (i_is_LJ) then
280 +             thisRcut = getSigma(i) * 2.5_dp
281 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
282 +          endif
283 +          if (i_is_Elect) then
284 +             thisRcut = defaultRcut
285 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
286 +          endif
287 +          if (i_is_Sticky) then
288 +             thisRcut = getStickyCut(i)
289 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
290 +          endif
291 +          if (i_is_StickyP) then
292 +             thisRcut = getStickyPowerCut(i)
293 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
294 +          endif
295 +          if (i_is_GB) then
296 +             thisRcut = getGayBerneCut(i)
297 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
298 +          endif
299 +          if (i_is_EAM) then
300 +             thisRcut = getEAMCut(i)
301 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
302 +          endif
303 +          if (i_is_Shape) then
304 +             thisRcut = getShapeCut(i)
305 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
306 +          endif
307 +          
308 +          if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
309 +             biggestAtypeCutoff = atypeMaxCutoff(i)
310 +          endif
311 +       endif
312 +    enddo
313 +
314 +    istart = 1
315 + #ifdef IS_MPI
316 +    iend = nGroupsInRow
317 + #else
318 +    iend = nGroups
319 + #endif
320 +    outer: do i = istart, iend
321 +      
322 +       n_in_i = groupStartRow(i+1) - groupStartRow(i)
323 +      
324 + #ifdef IS_MPI
325 +       jstart = 1
326 +       jend = nGroupsInCol
327 + #else
328 +       jstart = i+1
329 +       jend = nGroups
330 + #endif
331 +      
332 +      
333 +      
334 +      
335 +      
336 +      
337 +    enddo outer        
338 +    
339 +     haveGtypeCutoffMap = .true.
340 +   end subroutine createGtypeCutoffMap
341 +
342 +   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
343 +     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
344 +     integer, intent(in) :: cutPolicy
345 +
346 +     defaultRcut = defRcut
347 +     defaultRsw = defRsw
348 +     defaultRlist = defRlist
349 +     cutoffPolicy = cutPolicy
350 +   end subroutine setDefaultCutoffs
351 +
352 +   subroutine setCutoffPolicy(cutPolicy)
353 +
354 +     integer, intent(in) :: cutPolicy
355 +     cutoffPolicy = cutPolicy
356 +     call createGtypeCutoffMap()
357 +
358 +   end subroutine setCutoffPolicy
359 +    
360 +    
361    subroutine setSimVariables()
362      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()
363      SIM_uses_EAM = SimUsesEAM()
233    SIM_uses_Shapes = SimUsesShapes()
234    SIM_uses_FLARB = SimUsesFLARB()
364      SIM_uses_RF = SimUsesRF()
365      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
366      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
# Line 249 | Line 378 | contains
378  
379      error = 0
380  
381 <    if (.not. havePropertyMap) then
381 >    if (.not. haveInteractionHash) then      
382 >       myStatus = 0      
383 >       call createInteractionHash(myStatus)      
384 >       if (myStatus .ne. 0) then
385 >          write(default_error, *) 'createInteractionHash failed in doForces!'
386 >          error = -1
387 >          return
388 >       endif
389 >    endif
390  
391 <       myStatus = 0
392 <
393 <       call createPropertyMap(myStatus)
257 <
391 >    if (.not. haveGtypeCutoffMap) then        
392 >       myStatus = 0      
393 >       call createGtypeCutoffMap(myStatus)      
394         if (myStatus .ne. 0) then
395 <          write(default_error, *) 'createPropertyMap failed in doForces!'
395 >          write(default_error, *) 'createGtypeCutoffMap failed in doForces!'
396            error = -1
397            return
398         endif
# Line 317 | Line 453 | contains
453      !! interactions are used by the force field.    
454  
455      FF_uses_DirectionalAtoms = .false.
320    FF_uses_LennardJones = .false.
321    FF_uses_Electrostatics = .false.
322    FF_uses_Charges = .false.    
456      FF_uses_Dipoles = .false.
324    FF_uses_Sticky = .false.
325    FF_uses_StickyPower = .false.
457      FF_uses_GayBerne = .false.
458      FF_uses_EAM = .false.
328    FF_uses_Shapes = .false.
329    FF_uses_FLARB = .false.
459  
460      call getMatchingElementList(atypes, "is_Directional", .true., &
461           nMatches, MatchList)
462      if (nMatches .gt. 0) FF_uses_DirectionalAtoms = .true.
463  
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
464      call getMatchingElementList(atypes, "is_Dipole", .true., &
465           nMatches, MatchList)
466 <    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
466 >    if (nMatches .gt. 0) FF_uses_Dipoles = .true.
467      
468      call getMatchingElementList(atypes, "is_GayBerne", .true., &
469           nMatches, MatchList)
470 <    if (nMatches .gt. 0) then
385 <       FF_uses_GayBerne = .true.
386 <       FF_uses_DirectionalAtoms = .true.
387 <    endif
470 >    if (nMatches .gt. 0) FF_uses_GayBerne = .true.
471  
472      call getMatchingElementList(atypes, "is_EAM", .true., nMatches, MatchList)
473      if (nMatches .gt. 0) FF_uses_EAM = .true.
474  
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
475  
399    call getMatchingElementList(atypes, "is_FLARB", .true., &
400         nMatches, MatchList)
401    if (nMatches .gt. 0) FF_uses_FLARB = .true.
402
403    !! Assume sanity (for the sake of argument)
476      haveSaneForceField = .true.
477  
478      !! check to make sure the FF_uses_RF setting makes sense
479  
480 <    if (FF_uses_dipoles) then
480 >    if (FF_uses_Dipoles) then
481         if (FF_uses_RF) then
482            dielect = getDielect()
483            call initialize_rf(dielect)
# Line 419 | Line 491 | contains
491         endif
492      endif
493  
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
494      if (FF_uses_EAM) then
495         call init_EAM_FF(my_status)
496         if (my_status /= 0) then
# Line 448 | Line 510 | contains
510         endif
511      endif
512  
451    if (FF_uses_GayBerne .and. FF_uses_LennardJones) then
452    endif
453
513      if (.not. haveNeighborList) then
514         !! Create neighbor lists
515         call expandNeighborList(nLocal, my_status)
# Line 514 | Line 573 | contains
573      integer :: localError
574      integer :: propPack_i, propPack_j
575      integer :: loopStart, loopEnd, loop
576 <
576 >    integer :: iHash
577      real(kind=dp) :: listSkin = 1.0  
578  
579      !! initialize local variables  
# Line 633 | Line 692 | contains
692               endif
693  
694   #ifdef IS_MPI
695 +             me_j = atid_col(j)
696               call get_interatomic_vector(q_group_Row(:,i), &
697                    q_group_Col(:,j), d_grp, rgrpsq)
698   #else
699 +             me_j = atid(j)
700               call get_interatomic_vector(q_group(:,i), &
701                    q_group(:,j), d_grp, rgrpsq)
702   #endif
703  
704 <             if (rgrpsq < rlistsq) then
704 >             if (rgrpsq < InteractionHash(me_i,me_j)%rListsq) then
705                  if (update_nlist) then
706                     nlist = nlist + 1
707  
# Line 858 | Line 919 | contains
919   #else
920               me_i = atid(i)
921   #endif
922 <
923 <             if (PropertyMap(me_i)%is_Dipole) then
922 >             iHash = InteractionHash(me_i,me_j)
923 >            
924 >             if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
925  
926                  mu_i = getDipoleMoment(me_i)
927  
# Line 926 | Line 988 | contains
988      real ( kind = dp ) :: ebalance
989      integer :: me_i, me_j
990  
991 +    integer :: iHash
992 +
993      r = sqrt(rijsq)
994      vpair = 0.0d0
995      fpair(1:3) = 0.0d0
# Line 938 | Line 1002 | contains
1002      me_j = atid(j)
1003   #endif
1004  
1005 <    !    write(*,*) i, j, me_i, me_j
942 <
943 <    if (FF_uses_LennardJones .and. SIM_uses_LennardJones) then
1005 >    iHash = InteractionHash(me_i, me_j)
1006  
1007 <       if ( PropertyMap(me_i)%is_LennardJones .and. &
1008 <            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 <
1007 >    if ( iand(iHash, LJ_PAIR).ne.0 ) then
1008 >       call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
1009      endif
1010  
1011 <    if (FF_uses_Electrostatics .and. SIM_uses_Electrostatics) then
1011 >    if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1012 >       call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1013 >            pot, eFrame, f, t, do_pot)
1014  
1015 <       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
1015 >       if (FF_uses_RF .and. SIM_uses_RF) then
1016  
1017 <       if (FF_uses_dipoles .and. SIM_uses_dipoles) then      
1018 <          if ( PropertyMap(me_i)%is_Dipole .and. &
1019 <               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
1017 >          ! CHECK ME (RF needs to know about all electrostatic types)
1018 >          call accumulate_rf(i, j, r, eFrame, sw)
1019 >          call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair)
1020         endif
1021 +
1022      endif
1023  
1024 +    if ( iand(iHash, STICKY_PAIR).ne.0 ) then
1025 +       call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1026 +            pot, A, f, t, do_pot)
1027 +    endif
1028  
1029 <    if (FF_uses_Sticky .and. SIM_uses_sticky) then
1030 <
1031 <       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 <
1029 >    if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then
1030 >       call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1031 >            pot, A, f, t, do_pot)
1032      endif
1033  
1034 <    if (FF_uses_StickyPower .and. SIM_uses_stickypower) then
1035 <       if ( PropertyMap(me_i)%is_StickyPower .and. &
1036 <            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
1034 >    if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then
1035 >       call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1036 >            pot, A, f, t, do_pot)
1037      endif
1038      
1039 <    if (FF_uses_GayBerne .and. SIM_uses_GayBerne) then
1040 <
1041 <       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 <
1039 >    if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then
1040 > !      call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1041 > !           pot, A, f, t, do_pot)
1042      endif
1043  
1044 <    if (FF_uses_EAM .and. SIM_uses_EAM) then
1045 <
1046 <       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 <
1044 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1045 >       call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
1046 >            do_pot)
1047      endif
1048  
1049 <
1050 <    !    write(*,*) PropertyMap(me_i)%is_Shape,PropertyMap(me_j)%is_Shape
1051 <
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
1049 >    if ( iand(iHash, SHAPE_PAIR).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 +    if ( iand(iHash, SHAPE_LJ).ne.0 ) then      
1055 +       call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1056 +            pot, A, f, t, do_pot)
1057 +    endif
1058 +    
1059    end subroutine do_pair
1060  
1061    subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, &
# Line 1040 | Line 1073 | contains
1073      real ( kind = dp )                :: r, rc
1074      real ( kind = dp ), intent(inout) :: d(3), dc(3)
1075  
1076 <    logical :: is_EAM_i, is_EAM_j
1076 >    integer :: me_i, me_j, iHash
1077  
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
1078   #ifdef IS_MPI  
1079      me_i = atid_row(i)
1080      me_j = atid_col(j)  
# Line 1061 | Line 1083 | contains
1083      me_j = atid(j)  
1084   #endif
1085  
1086 <    if (FF_uses_EAM .and. SIM_uses_EAM) then
1086 >    iHash = InteractionHash(me_i, me_j)
1087  
1088 <       if (PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) &
1088 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1089              call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1068
1090      endif
1091 <
1091 >    
1092    end subroutine do_prepair
1093  
1094  
# Line 1261 | Line 1282 | contains
1282  
1283    function FF_UsesDirectionalAtoms() result(doesit)
1284      logical :: doesit
1285 <    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
1285 >    doesit = FF_uses_DirectionalAtoms
1286    end function FF_UsesDirectionalAtoms
1287  
1288    function FF_RequiresPrepairCalc() result(doesit)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines