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 2261 by gezelter, Tue Jun 28 13:58:45 2005 UTC vs.
Revision 2281 by gezelter, Thu Sep 1 22:56:20 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.22 2005-06-28 13:58:45 gezelter Exp $, $Date: 2005-06-28 13:58:45 $, $Name: not supported by cvs2svn $, $Revision: 1.22 $
48 > !! @version $Id: doForces.F90,v 1.35 2005-09-01 22:56:20 gezelter Exp $, $Date: 2005-09-01 22:56:20 $, $Name: not supported by cvs2svn $, $Revision: 1.35 $
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  
81  logical, save :: haveRlist = .false.
83    logical, save :: haveNeighborList = .false.
84    logical, save :: haveSIMvariables = .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 <  !!!GO AWAY---------
119 <  !!!!!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 128 | Line 119 | module doForces
119    real :: forceTimeInitial, forceTimeFinal
120    integer :: nLoops
121   #endif
131
132  type, public :: Interaction
133     integer :: InteractionHash
134     real(kind=dp) :: rCut
135  end type Interaction
122    
123 <  type(Interaction), dimension(:,:),allocatable :: InteractionMap
124 <  
125 <  !public :: addInteraction
126 <  !public :: setInteractionHash
127 <  !public :: getInteractionHash
128 <  public :: createInteractionMap
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 >  integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY
138 >  real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist
139    
140   contains
141  
142 <
147 <  subroutine createInteractionMap(status)
142 >  subroutine createInteractionHash(status)
143      integer :: nAtypes
144 <    integer :: status
144 >    integer, intent(out) :: status
145      integer :: i
146      integer :: j
147 <    integer :: ihash
148 <    real(kind=dp) :: myRcut
154 < ! Test Types
147 >    integer :: iHash
148 >    !! Test Types
149      logical :: i_is_LJ
150      logical :: i_is_Elect
151      logical :: i_is_Sticky
# Line 166 | Line 160 | contains
160      logical :: j_is_GB
161      logical :: j_is_EAM
162      logical :: j_is_Shape
163 <    
164 <    
163 >    real(kind=dp) :: myRcut
164 >
165 >    status = 0  
166 >
167      if (.not. associated(atypes)) then
168 <       call handleError("atype", "atypes was not present before call of createDefaultInteractionMap!")
168 >       call handleError("atype", "atypes was not present before call of createInteractionHash!")
169         status = -1
170         return
171      endif
# Line 181 | Line 177 | contains
177         return
178      end if
179  
180 <    if (.not. allocated(InteractionMap)) then
181 <       allocate(InteractionMap(nAtypes,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_LennardJones", i_is_LJ)
# Line 236 | Line 236 | contains
236            if (i_is_LJ .and. j_is_Shape) iHash = ior(iHash, SHAPE_LJ)
237  
238  
239 <          InteractionMap(i,j)%InteractionHash = iHash
240 <          InteractionMap(j,i)%InteractionHash = iHash
239 >          InteractionHash(i,j) = iHash
240 >          InteractionHash(j,i) = iHash
241  
242         end do
243  
244      end do
245  end subroutine createInteractionMap
245  
246 +    haveInteractionHash = .true.
247 +  end subroutine createInteractionHash
248  
249 +  subroutine createGtypeCutoffMap(stat)
250  
251 < !!! THIS GOES AWAY FOR SIZE DEPENDENT CUTOFF
252 < !!$  subroutine setRlistDF( this_rlist )
253 < !!$
254 < !!$   real(kind=dp) :: this_rlist
255 < !!$
256 < !!$    rlist = this_rlist
257 < !!$    rlistsq = rlist * rlist
258 < !!$
257 < !!$    haveRlist = .true.
258 < !!$
259 < !!$  end subroutine setRlistDF
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 +          atypeMaxCutoff(i) = 0.0_dp
288 +          if (i_is_LJ) then
289 +             thisRcut = getSigma(i) * 2.5_dp
290 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
291 +          endif
292 +          if (i_is_Elect) then
293 +             thisRcut = defaultRcut
294 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
295 +          endif
296 +          if (i_is_Sticky) then
297 +             thisRcut = getStickyCut(i)
298 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
299 +          endif
300 +          if (i_is_StickyP) then
301 +             thisRcut = getStickyPowerCut(i)
302 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
303 +          endif
304 +          if (i_is_GB) then
305 +             thisRcut = getGayBerneCut(i)
306 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
307 +          endif
308 +          if (i_is_EAM) then
309 +             thisRcut = getEAMCut(i)
310 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
311 +          endif
312 +          if (i_is_Shape) then
313 +             thisRcut = getShapeCut(i)
314 +             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
315 +          endif
316 +          
317 +          if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
318 +             biggestAtypeCutoff = atypeMaxCutoff(i)
319 +          endif
320 +       endif
321 +    enddo
322 +  
323 +    nGroupTypes = 0
324 +    
325 +    istart = 1
326 + #ifdef IS_MPI
327 +    iend = nGroupsInRow
328 + #else
329 +    iend = nGroups
330 + #endif
331 +    
332 +    !! allocate the groupToGtype and gtypeMaxCutoff here.
333 +    
334 +    !! first we do a single loop over the cutoff groups to find the
335 +    !! largest cutoff for any atypes present in this group.  We also
336 +    !! create gtypes at this point.
337 +    
338 +    tol = 1.0d-6
339 +    
340 +    do i = istart, iend      
341 +       n_in_i = groupStartRow(i+1) - groupStartRow(i)
342 +       groupMaxCutoff(i) = 0.0_dp
343 +       do ia = groupStartRow(i), groupStartRow(i+1)-1
344 +          atom1 = groupListRow(ia)
345 + #ifdef IS_MPI
346 +          me_i = atid_row(atom1)
347 + #else
348 +          me_i = atid(atom1)
349 + #endif          
350 +          if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then
351 +             groupMaxCutoff(i)=atypeMaxCutoff(me_i)
352 +          endif
353 +       enddo
354 +       if (nGroupTypes.eq.0) then
355 +          nGroupTypes = nGroupTypes + 1
356 +          gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
357 +          groupToGtype(i) = nGroupTypes
358 +       else
359 +          do g = 1, nGroupTypes
360 +             if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).gt.tol) then
361 +                nGroupTypes = nGroupTypes + 1
362 +                gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i)
363 +                groupToGtype(i) = nGroupTypes
364 +             else
365 +                groupToGtype(i) = g
366 +             endif
367 +          enddo
368 +       endif
369 +    enddo
370 +    
371 +    !! allocate the gtypeCutoffMap here.
372 +    
373 +    !! then we do a double loop over all the group TYPES to find the cutoff
374 +    !! map between groups of two types
375 +    
376 +    do i = 1, nGroupTypes
377 +       do j = 1, nGroupTypes
378 +      
379 +          select case(cutoffPolicy)
380 +          case(TRADITIONAL_CUTOFF_POLICY)
381 +             thisRcut = maxval(gtypeMaxCutoff)
382 +          case(MIX_CUTOFF_POLICY)
383 +             thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
384 +          case(MAX_CUTOFF_POLICY)
385 +             thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
386 +          case default
387 +             call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
388 +             return
389 +          end select
390 +          gtypeCutoffMap(i,j)%rcut = thisRcut
391 +          gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
392 +          skin = defaultRlist - defaultRcut
393 +          gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
394 +       enddo
395 +    enddo
396 +    
397 +    haveGtypeCutoffMap = .true.
398 +  end subroutine createGtypeCutoffMap
399 +  
400 +  subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
401 +    real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
402 +    integer, intent(in) :: cutPolicy
403 +    
404 +    defaultRcut = defRcut
405 +    defaultRsw = defRsw
406 +    defaultRlist = defRlist
407 +    cutoffPolicy = cutPolicy
408 +  end subroutine setDefaultCutoffs
409 +  
410 +  subroutine setCutoffPolicy(cutPolicy)
411 +
412 +     integer, intent(in) :: cutPolicy
413 +     cutoffPolicy = cutPolicy
414 +     call createGtypeCutoffMap()
415 +
416 +   end subroutine setCutoffPolicy
417 +    
418 +    
419    subroutine setSimVariables()
420      SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms()
264    SIM_uses_LennardJones = SimUsesLennardJones()
265    SIM_uses_Electrostatics = SimUsesElectrostatics()
266    SIM_uses_Charges = SimUsesCharges()
267    SIM_uses_Dipoles = SimUsesDipoles()
268    SIM_uses_Sticky = SimUsesSticky()
269    SIM_uses_StickyPower = SimUsesStickyPower()
270    SIM_uses_GayBerne = SimUsesGayBerne()
421      SIM_uses_EAM = SimUsesEAM()
272    SIM_uses_Shapes = SimUsesShapes()
273    SIM_uses_FLARB = SimUsesFLARB()
422      SIM_uses_RF = SimUsesRF()
423      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
424      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
# Line 288 | Line 436 | contains
436  
437      error = 0
438  
439 <    if (.not. haveInteractionMap) then
439 >    if (.not. haveInteractionHash) then      
440 >       myStatus = 0      
441 >       call createInteractionHash(myStatus)      
442 >       if (myStatus .ne. 0) then
443 >          write(default_error, *) 'createInteractionHash failed in doForces!'
444 >          error = -1
445 >          return
446 >       endif
447 >    endif
448  
449 <       myStatus = 0
450 <
451 <       call createInteractionMap(myStatus)
296 <
449 >    if (.not. haveGtypeCutoffMap) then        
450 >       myStatus = 0      
451 >       call createGtypeCutoffMap(myStatus)      
452         if (myStatus .ne. 0) then
453 <          write(default_error, *) 'createInteractionMap failed in doForces!'
453 >          write(default_error, *) 'createGtypeCutoffMap failed in doForces!'
454            error = -1
455            return
456         endif
# Line 334 | Line 489 | contains
489    end subroutine doReadyCheck
490  
491  
492 <  subroutine init_FF(use_RF_c, thisStat)
492 >  subroutine init_FF(use_RF, use_UW, use_DW, thisStat)
493  
494 <    logical, intent(in) :: use_RF_c
495 <
494 >    logical, intent(in) :: use_RF
495 >    logical, intent(in) :: use_UW
496 >    logical, intent(in) :: use_DW
497      integer, intent(out) :: thisStat  
498      integer :: my_status, nMatches
499 +    integer :: corrMethod
500      integer, pointer :: MatchList(:) => null()
501      real(kind=dp) :: rcut, rrf, rt, dielect
502  
# Line 347 | Line 504 | contains
504      thisStat = 0
505  
506      !! Fortran's version of a cast:
507 <    FF_uses_RF = use_RF_c
507 >    FF_uses_RF = use_RF
508  
509 +    !! set the electrostatic correction method
510 +    if (use_UW) then
511 +       corrMethod = 1
512 +    elseif (use_DW) then
513 +       corrMethod = 2
514 +    else
515 +       corrMethod = 0
516 +    endif
517 +    
518      !! init_FF is called *after* all of the atom types have been
519      !! defined in atype_module using the new_atype subroutine.
520      !!
# Line 356 | Line 522 | contains
522      !! interactions are used by the force field.    
523  
524      FF_uses_DirectionalAtoms = .false.
359    FF_uses_LennardJones = .false.
360    FF_uses_Electrostatics = .false.
361    FF_uses_Charges = .false.    
525      FF_uses_Dipoles = .false.
363    FF_uses_Sticky = .false.
364    FF_uses_StickyPower = .false.
526      FF_uses_GayBerne = .false.
527      FF_uses_EAM = .false.
367    FF_uses_Shapes = .false.
368    FF_uses_FLARB = .false.
528  
529      call getMatchingElementList(atypes, "is_Directional", .true., &
530           nMatches, MatchList)
531      if (nMatches .gt. 0) FF_uses_DirectionalAtoms = .true.
532  
374    call getMatchingElementList(atypes, "is_LennardJones", .true., &
375         nMatches, MatchList)
376    if (nMatches .gt. 0) FF_uses_LennardJones = .true.
377
378    call getMatchingElementList(atypes, "is_Electrostatic", .true., &
379         nMatches, MatchList)
380    if (nMatches .gt. 0) then
381       FF_uses_Electrostatics = .true.
382    endif
383
384    call getMatchingElementList(atypes, "is_Charge", .true., &
385         nMatches, MatchList)
386    if (nMatches .gt. 0) then
387       FF_uses_Charges = .true.  
388       FF_uses_Electrostatics = .true.
389    endif
390
533      call getMatchingElementList(atypes, "is_Dipole", .true., &
534           nMatches, MatchList)
535 <    if (nMatches .gt. 0) then
394 <       FF_uses_Dipoles = .true.
395 <       FF_uses_Electrostatics = .true.
396 <       FF_uses_DirectionalAtoms = .true.
397 <    endif
398 <
399 <    call getMatchingElementList(atypes, "is_Quadrupole", .true., &
400 <         nMatches, MatchList)
401 <    if (nMatches .gt. 0) then
402 <       FF_uses_Quadrupoles = .true.
403 <       FF_uses_Electrostatics = .true.
404 <       FF_uses_DirectionalAtoms = .true.
405 <    endif
406 <
407 <    call getMatchingElementList(atypes, "is_Sticky", .true., nMatches, &
408 <         MatchList)
409 <    if (nMatches .gt. 0) then
410 <       FF_uses_Sticky = .true.
411 <       FF_uses_DirectionalAtoms = .true.
412 <    endif
413 <
414 <    call getMatchingElementList(atypes, "is_StickyPower", .true., nMatches, &
415 <         MatchList)
416 <    if (nMatches .gt. 0) then
417 <       FF_uses_StickyPower = .true.
418 <       FF_uses_DirectionalAtoms = .true.
419 <    endif
535 >    if (nMatches .gt. 0) FF_uses_Dipoles = .true.
536      
537      call getMatchingElementList(atypes, "is_GayBerne", .true., &
538           nMatches, MatchList)
539 <    if (nMatches .gt. 0) then
424 <       FF_uses_GayBerne = .true.
425 <       FF_uses_DirectionalAtoms = .true.
426 <    endif
539 >    if (nMatches .gt. 0) FF_uses_GayBerne = .true.
540  
541      call getMatchingElementList(atypes, "is_EAM", .true., nMatches, MatchList)
542      if (nMatches .gt. 0) FF_uses_EAM = .true.
543  
431    call getMatchingElementList(atypes, "is_Shape", .true., &
432         nMatches, MatchList)
433    if (nMatches .gt. 0) then
434       FF_uses_Shapes = .true.
435       FF_uses_DirectionalAtoms = .true.
436    endif
544  
438    call getMatchingElementList(atypes, "is_FLARB", .true., &
439         nMatches, MatchList)
440    if (nMatches .gt. 0) FF_uses_FLARB = .true.
441
442    !! Assume sanity (for the sake of argument)
545      haveSaneForceField = .true.
546  
547      !! check to make sure the FF_uses_RF setting makes sense
548  
549 <    if (FF_uses_dipoles) then
549 >    if (FF_uses_Dipoles) then
550         if (FF_uses_RF) then
551            dielect = getDielect()
552            call initialize_rf(dielect)
# Line 458 | Line 560 | contains
560         endif
561      endif
562  
461    !sticky module does not contain check_sticky_FF anymore
462    !if (FF_uses_sticky) then
463    !   call check_sticky_FF(my_status)
464    !   if (my_status /= 0) then
465    !      thisStat = -1
466    !      haveSaneForceField = .false.
467    !      return
468    !   end if
469    !endif
470
563      if (FF_uses_EAM) then
564         call init_EAM_FF(my_status)
565         if (my_status /= 0) then
# Line 485 | Line 577 | contains
577            haveSaneForceField = .false.
578            return
579         endif
488    endif
489
490    if (FF_uses_GayBerne .and. FF_uses_LennardJones) then
580      endif
581  
582      if (.not. haveNeighborList) then
# Line 553 | Line 642 | contains
642      integer :: localError
643      integer :: propPack_i, propPack_j
644      integer :: loopStart, loopEnd, loop
645 <
645 >    integer :: iHash
646      real(kind=dp) :: listSkin = 1.0  
647  
648      !! initialize local variables  
# Line 672 | Line 761 | contains
761               endif
762  
763   #ifdef IS_MPI
764 +             me_j = atid_col(j)
765               call get_interatomic_vector(q_group_Row(:,i), &
766                    q_group_Col(:,j), d_grp, rgrpsq)
767   #else
768 +             me_j = atid(j)
769               call get_interatomic_vector(q_group(:,i), &
770                    q_group(:,j), d_grp, rgrpsq)
771   #endif
772  
773 <             if (rgrpsq < rlistsq) then
773 >             if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then
774                  if (update_nlist) then
775                     nlist = nlist + 1
776  
# Line 897 | Line 988 | contains
988   #else
989               me_i = atid(i)
990   #endif
991 <             iMap = InteractionMap(me_i, me_j)%InteractionHash
991 >             iHash = InteractionHash(me_i,me_j)
992              
993 <             if ( iand(iMap, ELECTROSTATIC_PAIR).ne.0 ) then
993 >             if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
994  
995                  mu_i = getDipoleMoment(me_i)
996  
# Line 966 | Line 1057 | contains
1057      real ( kind = dp ) :: ebalance
1058      integer :: me_i, me_j
1059  
1060 <    integer :: iMap
1060 >    integer :: iHash
1061  
1062      r = sqrt(rijsq)
1063      vpair = 0.0d0
# Line 980 | Line 1071 | contains
1071      me_j = atid(j)
1072   #endif
1073  
1074 <    iMap = InteractionMap(me_i, me_j)%InteractionHash
1074 >    iHash = InteractionHash(me_i, me_j)
1075  
1076 <    if ( iand(iMap, LJ_PAIR).ne.0 ) then
1076 >    if ( iand(iHash, LJ_PAIR).ne.0 ) then
1077         call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
1078      endif
1079  
1080 <    if ( iand(iMap, ELECTROSTATIC_PAIR).ne.0 ) then
1080 >    if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1081         call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1082 <            pot, eFrame, f, t, do_pot)
1082 >            pot, eFrame, f, t, do_pot, corrMethod)
1083  
1084         if (FF_uses_RF .and. SIM_uses_RF) then
1085  
# Line 999 | Line 1090 | contains
1090  
1091      endif
1092  
1093 <    if ( iand(iMap, STICKY_PAIR).ne.0 ) then
1093 >    if ( iand(iHash, STICKY_PAIR).ne.0 ) then
1094         call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1095              pot, A, f, t, do_pot)
1096      endif
1097  
1098 <    if ( iand(iMap, STICKYPOWER_PAIR).ne.0 ) then
1098 >    if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then
1099         call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1100              pot, A, f, t, do_pot)
1101      endif
1102  
1103 <    if ( iand(iMap, GAYBERNE_PAIR).ne.0 ) then
1103 >    if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then
1104         call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1105              pot, A, f, t, do_pot)
1106      endif
1107      
1108 <    if ( iand(iMap, GAYBERNE_LJ).ne.0 ) then
1109 <       call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1110 <            pot, A, f, t, do_pot)
1108 >    if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then
1109 > !      call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1110 > !           pot, A, f, t, do_pot)
1111      endif
1112  
1113 <    if ( iand(iMap, EAM_PAIR).ne.0 ) then      
1113 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1114         call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
1115              do_pot)
1116      endif
1117  
1118 <    if ( iand(iMap, SHAPE_PAIR).ne.0 ) then      
1118 >    if ( iand(iHash, SHAPE_PAIR).ne.0 ) then      
1119         call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1120              pot, A, f, t, do_pot)
1121      endif
1122  
1123 <    if ( iand(iMap, SHAPE_LJ).ne.0 ) then      
1123 >    if ( iand(iHash, SHAPE_LJ).ne.0 ) then      
1124         call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1125              pot, A, f, t, do_pot)
1126      endif
# Line 1051 | Line 1142 | contains
1142      real ( kind = dp )                :: r, rc
1143      real ( kind = dp ), intent(inout) :: d(3), dc(3)
1144  
1145 <    integer :: me_i, me_j, iMap
1145 >    integer :: me_i, me_j, iHash
1146  
1147   #ifdef IS_MPI  
1148      me_i = atid_row(i)
# Line 1061 | Line 1152 | contains
1152      me_j = atid(j)  
1153   #endif
1154  
1155 <    iMap = InteractionMap(me_i, me_j)%InteractionHash
1155 >    iHash = InteractionHash(me_i, me_j)
1156  
1157 <    if ( iand(iMap, EAM_PAIR).ne.0 ) then      
1157 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1158              call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1159      endif
1160      
# Line 1260 | Line 1351 | contains
1351  
1352    function FF_UsesDirectionalAtoms() result(doesit)
1353      logical :: doesit
1354 <    doesit = FF_uses_DirectionalAtoms .or. FF_uses_Dipoles .or. &
1264 <         FF_uses_Quadrupoles .or. FF_uses_Sticky .or. &
1265 <         FF_uses_StickyPower .or. FF_uses_GayBerne .or. FF_uses_Shapes
1354 >    doesit = FF_uses_DirectionalAtoms
1355    end function FF_UsesDirectionalAtoms
1356  
1357    function FF_RequiresPrepairCalc() result(doesit)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines