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 2280 by gezelter, Thu Sep 1 20:17:55 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.34 2005-09-01 20:17:55 gezelter Exp $, $Date: 2005-09-01 20:17:55 $, $Name: not supported by cvs2svn $, $Revision: 1.34 $
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 +  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
93  logical, save :: FF_uses_StickyPower
92    logical, save :: FF_uses_GayBerne
93    logical, save :: FF_uses_EAM
96  logical, save :: FF_uses_Shapes
97  logical, save :: FF_uses_FLARB
94    logical, save :: FF_uses_RF
95  
96    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
97    logical, save :: SIM_uses_EAM
110  logical, save :: SIM_uses_Shapes
111  logical, save :: SIM_uses_FLARB
98    logical, save :: SIM_uses_RF
99    logical, save :: SIM_requires_postpair_calc
100    logical, save :: SIM_requires_prepair_calc
101    logical, save :: SIM_uses_PBC
116  logical, save :: SIM_uses_molecular_cutoffs
102  
103 <  real(kind=dp), save :: rlist, rlistsq
103 >  integer, save :: corrMethod
104  
105    public :: init_FF
106 +  public :: setDefaultCutoffs
107    public :: do_force_loop
108 <  public :: setRlistDF
108 >  public :: createInteractionHash
109 >  public :: createGtypeCutoffMap
110 >  public :: getStickyCut
111 >  public :: getStickyPowerCut
112 >  public :: getGayBerneCut
113 >  public :: getEAMCut
114 >  public :: getShapeCut
115  
116   #ifdef PROFILE
117    public :: getforcetime
# Line 127 | Line 119 | module doForces
119    real :: forceTimeInitial, forceTimeFinal
120    integer :: nLoops
121   #endif
122 +  
123 +  !! Variables for cutoff mapping and interaction mapping
124 +  ! Bit hash to determine pair-pair interactions.
125 +  integer, dimension(:,:), allocatable :: InteractionHash
126 +  real(kind=dp), dimension(:), allocatable :: atypeMaxCutoff
127 +  real(kind=dp), dimension(:), allocatable :: groupMaxCutoff
128 +  integer, dimension(:), allocatable :: groupToGtype
129 +  real(kind=dp), dimension(:), allocatable :: gtypeMaxCutoff
130 +  type ::gtypeCutoffs
131 +     real(kind=dp) :: rcut
132 +     real(kind=dp) :: rcutsq
133 +     real(kind=dp) :: rlistsq
134 +  end type gtypeCutoffs
135 +  type(gtypeCutoffs), dimension(:,:), allocatable :: gtypeCutoffMap
136  
137 <  type :: Properties
138 <     logical :: is_Directional   = .false.
139 <     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 <
137 >  integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY
138 >  real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist
139 >  
140   contains
141  
142 <  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)
142 >  subroutine createInteractionHash(status)
143      integer :: nAtypes
144 <    integer :: status
144 >    integer, intent(out) :: status
145      integer :: i
146 <    logical :: thisProperty
147 <    real (kind=DP) :: thisDPproperty
146 >    integer :: j
147 >    integer :: iHash
148 >    !! Test Types
149 >    logical :: i_is_LJ
150 >    logical :: i_is_Elect
151 >    logical :: i_is_Sticky
152 >    logical :: i_is_StickyP
153 >    logical :: i_is_GB
154 >    logical :: i_is_EAM
155 >    logical :: i_is_Shape
156 >    logical :: j_is_LJ
157 >    logical :: j_is_Elect
158 >    logical :: j_is_Sticky
159 >    logical :: j_is_StickyP
160 >    logical :: j_is_GB
161 >    logical :: j_is_EAM
162 >    logical :: j_is_Shape
163 >    real(kind=dp) :: myRcut
164  
165 <    status = 0
165 >    status = 0  
166  
167 +    if (.not. associated(atypes)) then
168 +       call handleError("atype", "atypes was not present before call of createInteractionHash!")
169 +       status = -1
170 +       return
171 +    endif
172 +    
173      nAtypes = getSize(atypes)
174 <
174 >    
175      if (nAtypes == 0) then
176         status = -1
177         return
178      end if
179  
180 <    if (.not. allocated(PropertyMap)) then
181 <       allocate(PropertyMap(nAtypes))
180 >    if (.not. allocated(InteractionHash)) then
181 >       allocate(InteractionHash(nAtypes,nAtypes))
182      endif
183  
184 +    if (.not. allocated(atypeMaxCutoff)) then
185 +       allocate(atypeMaxCutoff(nAtypes))
186 +    endif
187 +        
188      do i = 1, nAtypes
189 <       call getElementProperty(atypes, i, "is_Directional", thisProperty)
190 <       PropertyMap(i)%is_Directional = thisProperty
189 >       call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
190 >       call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
191 >       call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
192 >       call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
193 >       call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
194 >       call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
195 >       call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
196  
197 <       call getElementProperty(atypes, i, "is_LennardJones", thisProperty)
186 <       PropertyMap(i)%is_LennardJones = thisProperty
197 >       do j = i, nAtypes
198  
199 <       call getElementProperty(atypes, i, "is_Electrostatic", thisProperty)
200 <       PropertyMap(i)%is_Electrostatic = thisProperty
199 >          iHash = 0
200 >          myRcut = 0.0_dp
201  
202 <       call getElementProperty(atypes, i, "is_Charge", thisProperty)
203 <       PropertyMap(i)%is_Charge = thisProperty
202 >          call getElementProperty(atypes, j, "is_LennardJones", j_is_LJ)
203 >          call getElementProperty(atypes, j, "is_Electrostatic", j_is_Elect)
204 >          call getElementProperty(atypes, j, "is_Sticky", j_is_Sticky)
205 >          call getElementProperty(atypes, j, "is_StickyPower", j_is_StickyP)
206 >          call getElementProperty(atypes, j, "is_GayBerne", j_is_GB)
207 >          call getElementProperty(atypes, j, "is_EAM", j_is_EAM)
208 >          call getElementProperty(atypes, j, "is_Shape", j_is_Shape)
209  
210 <       call getElementProperty(atypes, i, "is_Dipole", thisProperty)
211 <       PropertyMap(i)%is_Dipole = thisProperty
210 >          if (i_is_LJ .and. j_is_LJ) then
211 >             iHash = ior(iHash, LJ_PAIR)            
212 >          endif
213 >          
214 >          if (i_is_Elect .and. j_is_Elect) then
215 >             iHash = ior(iHash, ELECTROSTATIC_PAIR)
216 >          endif
217 >          
218 >          if (i_is_Sticky .and. j_is_Sticky) then
219 >             iHash = ior(iHash, STICKY_PAIR)
220 >          endif
221  
222 <       call getElementProperty(atypes, i, "is_Quadrupole", thisProperty)
223 <       PropertyMap(i)%is_Quadrupole = thisProperty
222 >          if (i_is_StickyP .and. j_is_StickyP) then
223 >             iHash = ior(iHash, STICKYPOWER_PAIR)
224 >          endif
225  
226 <       call getElementProperty(atypes, i, "is_Sticky", thisProperty)
227 <       PropertyMap(i)%is_Sticky = thisProperty
228 <      
203 <       call getElementProperty(atypes, i, "is_StickyPower", thisProperty)
204 <       PropertyMap(i)%is_StickyPower = thisProperty
226 >          if (i_is_EAM .and. j_is_EAM) then
227 >             iHash = ior(iHash, EAM_PAIR)
228 >          endif
229  
230 <       call getElementProperty(atypes, i, "is_GayBerne", thisProperty)
231 <       PropertyMap(i)%is_GayBerne = thisProperty
230 >          if (i_is_GB .and. j_is_GB) iHash = ior(iHash, GAYBERNE_PAIR)
231 >          if (i_is_GB .and. j_is_LJ) iHash = ior(iHash, GAYBERNE_LJ)
232 >          if (i_is_LJ .and. j_is_GB) iHash = ior(iHash, GAYBERNE_LJ)
233  
234 <       call getElementProperty(atypes, i, "is_EAM", thisProperty)
235 <       PropertyMap(i)%is_EAM = thisProperty
234 >          if (i_is_Shape .and. j_is_Shape) iHash = ior(iHash, SHAPE_PAIR)
235 >          if (i_is_Shape .and. j_is_LJ) iHash = ior(iHash, SHAPE_LJ)
236 >          if (i_is_LJ .and. j_is_Shape) iHash = ior(iHash, SHAPE_LJ)
237  
212       call getElementProperty(atypes, i, "is_Shape", thisProperty)
213       PropertyMap(i)%is_Shape = thisProperty
238  
239 <       call getElementProperty(atypes, i, "is_FLARB", thisProperty)
240 <       PropertyMap(i)%is_FLARB = thisProperty
239 >          InteractionHash(i,j) = iHash
240 >          InteractionHash(j,i) = iHash
241 >
242 >       end do
243 >
244      end do
245  
246 <    havePropertyMap = .true.
246 >    haveInteractionHash = .true.
247 >  end subroutine createInteractionHash
248  
249 <  end subroutine createPropertyMap
249 >  subroutine createGtypeCutoffMap(stat)
250  
251 +    integer, intent(out), optional :: stat
252 +    logical :: i_is_LJ
253 +    logical :: i_is_Elect
254 +    logical :: i_is_Sticky
255 +    logical :: i_is_StickyP
256 +    logical :: i_is_GB
257 +    logical :: i_is_EAM
258 +    logical :: i_is_Shape
259 +
260 +    integer :: myStatus, nAtypes,  i, j, istart, iend, jstart, jend
261 +    integer :: n_in_i, me_i, ia, g, atom1, nGroupTypes
262 +    real(kind=dp):: thisSigma, bigSigma, thisRcut, tol, skin
263 +    real(kind=dp) :: biggestAtypeCutoff
264 +
265 +    stat = 0
266 +    if (.not. haveInteractionHash) then
267 +       call createInteractionHash(myStatus)      
268 +       if (myStatus .ne. 0) then
269 +          write(default_error, *) 'createInteractionHash failed in doForces!'
270 +          stat = -1
271 +          return
272 +       endif
273 +    endif
274 +
275 +    nAtypes = getSize(atypes)
276 +    
277 +    do i = 1, nAtypes
278 +       if (SimHasAtype(i)) then          
279 +          call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
280 +          call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
281 +          call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
282 +          call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
283 +          call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
284 +          call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
285 +          call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
286 +          
287 +          if (i_is_LJ) then
288 +             thisRcut = getSigma(i) * 2.5_dp
289 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
290 +          endif
291 +          if (i_is_Elect) then
292 +             thisRcut = defaultRcut
293 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
294 +          endif
295 +          if (i_is_Sticky) then
296 +             thisRcut = getStickyCut(i)
297 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
298 +          endif
299 +          if (i_is_StickyP) then
300 +             thisRcut = getStickyPowerCut(i)
301 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
302 +          endif
303 +          if (i_is_GB) then
304 +             thisRcut = getGayBerneCut(i)
305 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
306 +          endif
307 +          if (i_is_EAM) then
308 +             thisRcut = getEAMCut(i)
309 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
310 +          endif
311 +          if (i_is_Shape) then
312 +             thisRcut = getShapeCut(i)
313 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
314 +          endif
315 +          
316 +          if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
317 +             biggestAtypeCutoff = atypeMaxCutoff(i)
318 +          endif
319 +       endif
320 +    enddo
321 +  
322 +    nGroupTypes = 0
323 +    
324 +    istart = 1
325 + #ifdef IS_MPI
326 +    iend = nGroupsInRow
327 + #else
328 +    iend = nGroups
329 + #endif
330 +
331 +    !! allocate the groupToGtype and gtypeMaxCutoff here.
332 +    
333 +    !! first we do a single loop over the cutoff groups to find the largest cutoff for any atypes
334 +    !! present in this group.   We also create gtypes at this point.
335 +    tol = 1.0d-6
336 +    
337 +    do i = istart, iend      
338 +       n_in_i = groupStartRow(i+1) - groupStartRow(i)
339 +       groupMaxCutoff(i) = 0.0_dp
340 +       do ia = groupStartRow(i), groupStartRow(i+1)-1
341 +          atom1 = groupListRow(ia)
342 + #ifdef IS_MPI
343 +          me_i = atid_row(atom1)
344 + #else
345 +          me_i = atid(atom1)
346 + #endif          
347 +          if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
348 +             groupMaxCutoff(i)=atypeMaxCutoff(me_i)
349 +          endif
350 +       enddo
351 +       if (nGroupTypes.eq.0) then
352 +          nGroupTypes = nGroupTypes + 1
353 +          gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
354 +          groupToGtype(i) = nGroupTypes
355 +       else
356 +          do g = 1, nGroupTypes
357 +             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).gt.tol) then
358 +                nGroupTypes = nGroupTypes + 1
359 +                gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
360 +                groupToGtype(i) = nGroupTypes
361 +             else
362 +                groupToGtype(i) = g
363 +             endif
364 +          enddo
365 +       endif
366 +    enddo
367 +    
368 +    !! allocate the gtypeCutoffMap here.
369 +
370 +    !! then we do a double loop over all the group TYPES to find the cutoff
371 +    !! map between groups of two types
372 +    
373 +    do i = 1, nGroupTypes
374 +       do j = 1, nGroupTypes
375 +      
376 +          select case(cutoffPolicy)
377 +             case(TRADITIONAL_CUTOFF_POLICY)
378 +                thisRcut = maxval(gtypeMaxCutoff)
379 +             case(MIX_CUTOFF_POLICY)
380 +                thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
381 +             case(MAX_CUTOFF_POLICY)
382 +                thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
383 +             case default
384 +                call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
385 +                return
386 +          end select      
387 +         gtypeCutoffMap(i,j)%rcut = thisRcut
388 +         gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
389 +         skin = defaultRlist - defaultRcut
390 +         gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
391 +       enddo
392 +    enddo
393 +    
394 +    haveGtypeCutoffMap = .true.
395 +   end subroutine createGtypeCutoffMap
396 +
397 +   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
398 +     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
399 +     integer, intent(in) :: cutPolicy
400 +
401 +     defaultRcut = defRcut
402 +     defaultRsw = defRsw
403 +     defaultRlist = defRlist
404 +     cutoffPolicy = cutPolicy
405 +   end subroutine setDefaultCutoffs
406 +
407 +   subroutine setCutoffPolicy(cutPolicy)
408 +
409 +     integer, intent(in) :: cutPolicy
410 +     cutoffPolicy = cutPolicy
411 +     call createGtypeCutoffMap()
412 +
413 +   end subroutine setCutoffPolicy
414 +    
415 +    
416    subroutine setSimVariables()
417      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()
418      SIM_uses_EAM = SimUsesEAM()
233    SIM_uses_Shapes = SimUsesShapes()
234    SIM_uses_FLARB = SimUsesFLARB()
419      SIM_uses_RF = SimUsesRF()
420      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
421      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
# Line 249 | Line 433 | contains
433  
434      error = 0
435  
436 <    if (.not. havePropertyMap) then
436 >    if (.not. haveInteractionHash) then      
437 >       myStatus = 0      
438 >       call createInteractionHash(myStatus)      
439 >       if (myStatus .ne. 0) then
440 >          write(default_error, *) 'createInteractionHash failed in doForces!'
441 >          error = -1
442 >          return
443 >       endif
444 >    endif
445  
446 <       myStatus = 0
447 <
448 <       call createPropertyMap(myStatus)
257 <
446 >    if (.not. haveGtypeCutoffMap) then        
447 >       myStatus = 0      
448 >       call createGtypeCutoffMap(myStatus)      
449         if (myStatus .ne. 0) then
450 <          write(default_error, *) 'createPropertyMap failed in doForces!'
450 >          write(default_error, *) 'createGtypeCutoffMap failed in doForces!'
451            error = -1
452            return
453         endif
# Line 295 | Line 486 | contains
486    end subroutine doReadyCheck
487  
488  
489 <  subroutine init_FF(use_RF_c, thisStat)
489 >  subroutine init_FF(use_RF, use_UW, use_DW, thisStat)
490  
491 <    logical, intent(in) :: use_RF_c
492 <
491 >    logical, intent(in) :: use_RF
492 >    logical, intent(in) :: use_UW
493 >    logical, intent(in) :: use_DW
494      integer, intent(out) :: thisStat  
495      integer :: my_status, nMatches
496 +    integer :: corrMethod
497      integer, pointer :: MatchList(:) => null()
498      real(kind=dp) :: rcut, rrf, rt, dielect
499  
# Line 308 | Line 501 | contains
501      thisStat = 0
502  
503      !! Fortran's version of a cast:
504 <    FF_uses_RF = use_RF_c
504 >    FF_uses_RF = use_RF
505  
506 +    !! set the electrostatic correction method
507 +    if (use_UW) then
508 +       corrMethod = 1
509 +    elseif (use_DW) then
510 +       corrMethod = 2
511 +    else
512 +       corrMethod = 0
513 +    endif
514 +    
515      !! init_FF is called *after* all of the atom types have been
516      !! defined in atype_module using the new_atype subroutine.
517      !!
# Line 317 | Line 519 | contains
519      !! interactions are used by the force field.    
520  
521      FF_uses_DirectionalAtoms = .false.
320    FF_uses_LennardJones = .false.
321    FF_uses_Electrostatics = .false.
322    FF_uses_Charges = .false.    
522      FF_uses_Dipoles = .false.
324    FF_uses_Sticky = .false.
325    FF_uses_StickyPower = .false.
523      FF_uses_GayBerne = .false.
524      FF_uses_EAM = .false.
328    FF_uses_Shapes = .false.
329    FF_uses_FLARB = .false.
525  
526      call getMatchingElementList(atypes, "is_Directional", .true., &
527           nMatches, MatchList)
528      if (nMatches .gt. 0) FF_uses_DirectionalAtoms = .true.
529  
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
530      call getMatchingElementList(atypes, "is_Dipole", .true., &
531           nMatches, MatchList)
532 <    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
532 >    if (nMatches .gt. 0) FF_uses_Dipoles = .true.
533      
534      call getMatchingElementList(atypes, "is_GayBerne", .true., &
535           nMatches, MatchList)
536 <    if (nMatches .gt. 0) then
385 <       FF_uses_GayBerne = .true.
386 <       FF_uses_DirectionalAtoms = .true.
387 <    endif
536 >    if (nMatches .gt. 0) FF_uses_GayBerne = .true.
537  
538      call getMatchingElementList(atypes, "is_EAM", .true., nMatches, MatchList)
539      if (nMatches .gt. 0) FF_uses_EAM = .true.
540  
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
541  
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)
542      haveSaneForceField = .true.
543  
544      !! check to make sure the FF_uses_RF setting makes sense
545  
546 <    if (FF_uses_dipoles) then
546 >    if (FF_uses_Dipoles) then
547         if (FF_uses_RF) then
548            dielect = getDielect()
549            call initialize_rf(dielect)
# Line 419 | Line 557 | contains
557         endif
558      endif
559  
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
560      if (FF_uses_EAM) then
561         call init_EAM_FF(my_status)
562         if (my_status /= 0) then
# Line 448 | Line 576 | contains
576         endif
577      endif
578  
451    if (FF_uses_GayBerne .and. FF_uses_LennardJones) then
452    endif
453
579      if (.not. haveNeighborList) then
580         !! Create neighbor lists
581         call expandNeighborList(nLocal, my_status)
# Line 514 | Line 639 | contains
639      integer :: localError
640      integer :: propPack_i, propPack_j
641      integer :: loopStart, loopEnd, loop
642 <
642 >    integer :: iHash
643      real(kind=dp) :: listSkin = 1.0  
644  
645      !! initialize local variables  
# Line 633 | Line 758 | contains
758               endif
759  
760   #ifdef IS_MPI
761 +             me_j = atid_col(j)
762               call get_interatomic_vector(q_group_Row(:,i), &
763                    q_group_Col(:,j), d_grp, rgrpsq)
764   #else
765 +             me_j = atid(j)
766               call get_interatomic_vector(q_group(:,i), &
767                    q_group(:,j), d_grp, rgrpsq)
768   #endif
769  
770 <             if (rgrpsq < rlistsq) then
770 >             if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
771                  if (update_nlist) then
772                     nlist = nlist + 1
773  
# Line 858 | Line 985 | contains
985   #else
986               me_i = atid(i)
987   #endif
988 <
989 <             if (PropertyMap(me_i)%is_Dipole) then
988 >             iHash = InteractionHash(me_i,me_j)
989 >            
990 >             if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
991  
992                  mu_i = getDipoleMoment(me_i)
993  
# Line 926 | Line 1054 | contains
1054      real ( kind = dp ) :: ebalance
1055      integer :: me_i, me_j
1056  
1057 +    integer :: iHash
1058 +
1059      r = sqrt(rijsq)
1060      vpair = 0.0d0
1061      fpair(1:3) = 0.0d0
# Line 938 | Line 1068 | contains
1068      me_j = atid(j)
1069   #endif
1070  
1071 <    !    write(*,*) i, j, me_i, me_j
1071 >    iHash = InteractionHash(me_i, me_j)
1072  
1073 <    if (FF_uses_LennardJones .and. SIM_uses_LennardJones) then
1074 <
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 <
1073 >    if ( iand(iHash, LJ_PAIR).ne.0 ) then
1074 >       call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
1075      endif
1076  
1077 <    if (FF_uses_Electrostatics .and. SIM_uses_Electrostatics) then
1077 >    if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1078 >       call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1079 >            pot, eFrame, f, t, do_pot, corrMethod)
1080  
1081 <       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
1081 >       if (FF_uses_RF .and. SIM_uses_RF) then
1082  
1083 <       if (FF_uses_dipoles .and. SIM_uses_dipoles) then      
1084 <          if ( PropertyMap(me_i)%is_Dipole .and. &
1085 <               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
1083 >          ! CHECK ME (RF needs to know about all electrostatic types)
1084 >          call accumulate_rf(i, j, r, eFrame, sw)
1085 >          call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair)
1086         endif
1087 +
1088      endif
1089  
1090 <
1091 <    if (FF_uses_Sticky .and. SIM_uses_sticky) then
1092 <
974 <       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 <
1090 >    if ( iand(iHash, STICKY_PAIR).ne.0 ) then
1091 >       call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1092 >            pot, A, f, t, do_pot)
1093      endif
1094  
1095 <    if (FF_uses_StickyPower .and. SIM_uses_stickypower) then
1096 <       if ( PropertyMap(me_i)%is_StickyPower .and. &
1097 <            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
1095 >    if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then
1096 >       call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1097 >            pot, A, f, t, do_pot)
1098      endif
988    
989    if (FF_uses_GayBerne .and. SIM_uses_GayBerne) then
1099  
1100 <       if ( PropertyMap(me_i)%is_GayBerne .and. &
1101 <            PropertyMap(me_j)%is_GayBerne) then
1102 <          call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
994 <               pot, A, f, t, do_pot)
995 <       endif
996 <
1100 >    if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then
1101 >       call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1102 >            pot, A, f, t, do_pot)
1103      endif
1104 +    
1105 +    if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then
1106 + !      call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1107 + !           pot, A, f, t, do_pot)
1108 +    endif
1109  
1110 <    if (FF_uses_EAM .and. SIM_uses_EAM) then
1111 <
1112 <       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 <
1110 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1111 >       call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
1112 >            do_pot)
1113      endif
1114  
1115 <
1116 <    !    write(*,*) PropertyMap(me_i)%is_Shape,PropertyMap(me_j)%is_Shape
1117 <
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
1115 >    if ( iand(iHash, SHAPE_PAIR).ne.0 ) then      
1116 >       call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1117 >            pot, A, f, t, do_pot)
1118      endif
1119  
1120 +    if ( iand(iHash, SHAPE_LJ).ne.0 ) then      
1121 +       call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1122 +            pot, A, f, t, do_pot)
1123 +    endif
1124 +    
1125    end subroutine do_pair
1126  
1127    subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, &
# Line 1040 | Line 1139 | contains
1139      real ( kind = dp )                :: r, rc
1140      real ( kind = dp ), intent(inout) :: d(3), dc(3)
1141  
1142 <    logical :: is_EAM_i, is_EAM_j
1142 >    integer :: me_i, me_j, iHash
1143  
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
1144   #ifdef IS_MPI  
1145      me_i = atid_row(i)
1146      me_j = atid_col(j)  
# Line 1061 | Line 1149 | contains
1149      me_j = atid(j)  
1150   #endif
1151  
1152 <    if (FF_uses_EAM .and. SIM_uses_EAM) then
1152 >    iHash = InteractionHash(me_i, me_j)
1153  
1154 <       if (PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) &
1154 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1155              call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1068
1156      endif
1157 <
1157 >    
1158    end subroutine do_prepair
1159  
1160  
# Line 1261 | Line 1348 | contains
1348  
1349    function FF_UsesDirectionalAtoms() result(doesit)
1350      logical :: doesit
1351 <    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
1351 >    doesit = FF_uses_DirectionalAtoms
1352    end function FF_UsesDirectionalAtoms
1353  
1354    function FF_RequiresPrepairCalc() result(doesit)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines