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 2269 by chuckv, Tue Aug 9 19:40:56 2005 UTC vs.
Revision 2270 by gezelter, Tue Aug 9 22:33:37 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.27 2005-08-09 19:40:56 chuckv Exp $, $Date: 2005-08-09 19:40:56 $, $Name: not supported by cvs2svn $, $Revision: 1.27 $
48 > !! @version $Id: doForces.F90,v 1.28 2005-08-09 22:33:37 gezelter Exp $, $Date: 2005-08-09 22:33:37 $, $Name: not supported by cvs2svn $, $Revision: 1.28 $
49  
50  
51   module doForces
# Line 78 | Line 78 | module doForces
78    INTEGER, PARAMETER:: PREPAIR_LOOP = 1
79    INTEGER, PARAMETER:: PAIR_LOOP    = 2
80  
81  logical, save :: haveRlist = .false.
81    logical, save :: haveNeighborList = .false.
82    logical, save :: haveSIMvariables = .false.
83    logical, save :: haveSaneForceField = .false.
84 <  logical, save :: haveInteractionMap = .false.
84 >  logical, save :: haveInteractionHash = .false.
85 >  logical, save :: haveGtypeCutoffMap = .false.
86  
87    logical, save :: FF_uses_DirectionalAtoms
88  logical, save :: FF_uses_LennardJones
89  logical, save :: FF_uses_Electrostatics
90  logical, save :: FF_uses_Charges
88    logical, save :: FF_uses_Dipoles
92  logical, save :: FF_uses_Quadrupoles
93  logical, save :: FF_uses_Sticky
94  logical, save :: FF_uses_StickyPower
89    logical, save :: FF_uses_GayBerne
90    logical, save :: FF_uses_EAM
97  logical, save :: FF_uses_Shapes
98  logical, save :: FF_uses_FLARB
91    logical, save :: FF_uses_RF
92  
93    logical, save :: SIM_uses_DirectionalAtoms
102  logical, save :: SIM_uses_LennardJones
103  logical, save :: SIM_uses_Electrostatics
104  logical, save :: SIM_uses_Charges
105  logical, save :: SIM_uses_Dipoles
106  logical, save :: SIM_uses_Quadrupoles
107  logical, save :: SIM_uses_Sticky
108  logical, save :: SIM_uses_StickyPower
109  logical, save :: SIM_uses_GayBerne
94    logical, save :: SIM_uses_EAM
111  logical, save :: SIM_uses_Shapes
112  logical, save :: SIM_uses_FLARB
95    logical, save :: SIM_uses_RF
96    logical, save :: SIM_requires_postpair_calc
97    logical, save :: SIM_requires_prepair_calc
98    logical, save :: SIM_uses_PBC
117  logical, save :: SIM_uses_molecular_cutoffs
99  
119
100    public :: init_FF
101    public :: do_force_loop
102 < !  public :: setRlistDF
103 <  !public :: addInteraction
124 <  !public :: setInteractionHash
125 <  !public :: getInteractionHash
126 <  public :: createInteractionMap
127 <  public :: createGroupCutoffs
102 >  public :: createInteractionHash
103 >  public :: createGtypeCutoffMap
104  
105   #ifdef PROFILE
106    public :: getforcetime
# Line 133 | Line 109 | module doForces
109    integer :: nLoops
110   #endif
111    
112 < !! Variables for cutoff mapping and interaction mapping
113 < ! Bit hash to determine pair-pair interactions.
114 <  integer, dimension(:,:),allocatable :: InteractionHash
115 < !! Cuttoffs in OOPSE are handled on a Group-Group pair basis.
140 < ! Largest cutoff for atypes for all potentials
141 <  real(kind=dp), dimension(:), allocatable :: atypeMaxCuttoff
142 < ! Largest cutoff for groups
112 >  !! Variables for cutoff mapping and interaction mapping
113 >  ! Bit hash to determine pair-pair interactions.
114 >  integer, dimension(:,:), allocatable :: InteractionHash
115 >  real(kind=dp), dimension(:), allocatable :: atypeMaxCutoff
116    real(kind=dp), dimension(:), allocatable :: groupMaxCutoff
117 < ! Group to Gtype transformation Map
145 <  integer,dimension(:), allocatable :: groupToGtype
146 < ! Group Type Max Cutoff
117 >  integer, dimension(:), allocatable :: groupToGtype
118    real(kind=dp), dimension(:), allocatable :: gtypeMaxCutoff
119 < ! GroupType definition
120 <  type ::gtype
121 <     real(kind=dp) :: rcut ! Group Cutoff
122 <     real(kind=dp) :: rcutsq ! Group Cutoff Squared
123 <     real(kind=dp) :: rlistsq ! List cutoff Squared    
124 <  end type gtype
154 <
155 <  type(gtype), dimension(:,:), allocatable :: gtypeCutoffMap
119 >  type ::gtypeCutoffs
120 >     real(kind=dp) :: rcut
121 >     real(kind=dp) :: rcutsq
122 >     real(kind=dp) :: rlistsq
123 >  end type gtypeCutoffs
124 >  type(gtypeCutoffs), dimension(:,:), allocatable :: gtypeCutoffMap
125    
126   contains
127  
128 <
160 <  subroutine createInteractionMap(status)
128 >  subroutine createInteractionHash(status)
129      integer :: nAtypes
130      integer, intent(out) :: status
131      integer :: i
132      integer :: j
133 <    integer :: ihash
166 <    real(kind=dp) :: myRcut
133 >    integer :: iHash
134      !! Test Types
135      logical :: i_is_LJ
136      logical :: i_is_Elect
# Line 183 | Line 150 | contains
150      status = 0  
151  
152      if (.not. associated(atypes)) then
153 <       call handleError("atype", "atypes was not present before call of createDefaultInteractionHash!")
153 >       call handleError("atype", "atypes was not present before call of createInteractionHash!")
154         status = -1
155         return
156      endif
# Line 198 | Line 165 | contains
165      if (.not. allocated(InteractionHash)) then
166         allocate(InteractionHash(nAtypes,nAtypes))
167      endif
168 +
169 +    if (.not. allocated(atypeMaxCutoff)) then
170 +       allocate(atypeMaxCutoff(nAtypes))
171 +    endif
172          
173      do i = 1, nAtypes
174         call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
# Line 208 | Line 179 | contains
179         call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
180         call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
181  
182 +       if (i_is_LJ) then
183 +          thisCut = getDefaultLJCutoff(i)
184 +          if (thisCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisCut
185 +       endif
186 +
187 +
188 +
189         do j = i, nAtypes
190  
191            iHash = 0
# Line 257 | Line 235 | contains
235  
236      end do
237  
238 <    haveInteractionMap = .true.
239 <  end subroutine createInteractionMap
238 >    haveInteractionHash = .true.
239 >  end subroutine createInteractionHash
240  
241 <  subroutine createGroupCutoffs(skinThickness,defaultrList,stat)
264 <    real(kind=dp), intent(in), optional :: defaultRList
265 <    real(kind-dp), intent(in), :: skinThickenss
266 <  ! Query each potential and return the cutoff for that potential. We
267 <  ! build the neighbor list based on the largest cutoff value for that
268 <  ! atype. Each potential can decide whether to calculate the force for
269 <  ! that atype based upon it's own cutoff.
270 <  
241 >  subroutine createGtypeCutoffMap(defaultRcut, defaultSkinThickness, stat)
242  
243      real(kind=dp), intent(in), optional :: defaultRCut, defaultSkinThickness
273
274    integer :: iMap
275    integer :: map_i,map_j
276    real(kind=dp) :: thisRCut = 0.0_dp
277    real(kind=dp) :: actualCutoff = 0.0_dp
244      integer, intent(out) :: stat
279    integer :: nAtypes
280    integer :: myStatus
245  
246 <    stat = 0
283 <    if (.not. haveInteractionMap) then
246 >    integer :: myStatus, nAtypes
247  
248 <       call createInteractionMap(myStatus)
249 <
248 >    stat = 0
249 >    if (.not. haveInteractionHash) then
250 >       call createInteractionHash(myStatus)      
251         if (myStatus .ne. 0) then
252 <          write(default_error, *) 'createInteractionMap failed in doForces!'
252 >          write(default_error, *) 'createInteractionHash failed in doForces!'
253            stat = -1
254            return
255         endif
256      endif
257  
258      nAtypes = getSize(atypes)
295    !! If we pass a default rcut, set all atypes to that cutoff distance
296    if(present(defaultRList)) then
297       InteractionMap(:,:)%rCut = defaultRCut
298       InteractionMap(:,:)%rCutSq = defaultRCut*defaultRCut
299       InteractionMap(:,:)%rListSq = (defaultRCut+defaultSkinThickness)**2
300       haveRlist = .true.
301       return
302    end if
259  
260 <    do map_i = 1,nAtypes
261 <       do map_j = map_i,nAtypes
262 <          iMap = InteractionMap(map_i, map_j)%InteractionHash
307 <          
308 <          if ( iand(iMap, LJ_PAIR).ne.0 ) then
309 <             ! thisRCut = getLJCutOff(map_i,map_j)
310 <             if (thisRcut > actualCutoff) actualCutoff = thisRcut
311 <          endif
312 <          
313 <          if ( iand(iMap, ELECTROSTATIC_PAIR).ne.0 ) then
314 <             ! thisRCut = getElectrostaticCutOff(map_i,map_j)
315 <             if (thisRcut > actualCutoff) actualCutoff = thisRcut
316 <          endif
317 <          
318 <          if ( iand(iMap, STICKY_PAIR).ne.0 ) then
319 <             ! thisRCut = getStickyCutOff(map_i,map_j)
320 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
321 <           endif
322 <          
323 <           if ( iand(iMap, STICKYPOWER_PAIR).ne.0 ) then
324 <              ! thisRCut = getStickyPowerCutOff(map_i,map_j)
325 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
326 <           endif
327 <          
328 <           if ( iand(iMap, GAYBERNE_PAIR).ne.0 ) then
329 <              ! thisRCut = getGayberneCutOff(map_i,map_j)
330 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
331 <           endif
332 <          
333 <           if ( iand(iMap, GAYBERNE_LJ).ne.0 ) then
334 < !              thisRCut = getGaybrneLJCutOff(map_i,map_j)
335 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
336 <           endif
337 <          
338 <           if ( iand(iMap, EAM_PAIR).ne.0 ) then      
339 < !              thisRCut = getEAMCutOff(map_i,map_j)
340 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
341 <           endif
342 <          
343 <           if ( iand(iMap, SHAPE_PAIR).ne.0 ) then      
344 < !              thisRCut = getShapeCutOff(map_i,map_j)
345 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
346 <           endif
347 <          
348 <           if ( iand(iMap, SHAPE_LJ).ne.0 ) then      
349 < !              thisRCut = getShapeLJCutOff(map_i,map_j)
350 <              if (thisRcut > actualCutoff) actualCutoff = thisRcut
351 <           endif
352 <           InteractionMap(map_i, map_j)%rCut = actualCutoff
353 <           InteractionMap(map_i, map_j)%rCutSq = actualCutoff * actualCutoff
354 <           InteractionMap(map_i, map_j)%rListSq = (actualCutoff + skinThickness)**2
260 >    do i = 1, nAtypes
261 >      
262 >       atypeMaxCutoff(i) =
263  
264 <           InteractionMap(map_j, map_i)%rCut = InteractionMap(map_i, map_j)%rCut
357 <           InteractionMap(map_j, map_i)%rCutSq = InteractionMap(map_i, map_j)%rCutSq
358 <           InteractionMap(map_j, map_i)%rListSq = InteractionMap(map_i, map_j)%rListSq
359 <        end do
360 <     end do
361 <     ! now the groups
264 >    
265  
266  
267  
268 <     haveRlist = .true.
269 <   end subroutine createGroupCutoffs
268 >     haveGtypeCutoffMap = .true.
269 >   end subroutine createGtypeCutoffMap
270  
271    subroutine setSimVariables()
272      SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms()
370    SIM_uses_LennardJones = SimUsesLennardJones()
371    SIM_uses_Electrostatics = SimUsesElectrostatics()
372    SIM_uses_Charges = SimUsesCharges()
373    SIM_uses_Dipoles = SimUsesDipoles()
374    SIM_uses_Sticky = SimUsesSticky()
375    SIM_uses_StickyPower = SimUsesStickyPower()
376    SIM_uses_GayBerne = SimUsesGayBerne()
273      SIM_uses_EAM = SimUsesEAM()
378    SIM_uses_Shapes = SimUsesShapes()
379    SIM_uses_FLARB = SimUsesFLARB()
274      SIM_uses_RF = SimUsesRF()
275      SIM_requires_postpair_calc = SimRequiresPostpairCalc()
276      SIM_requires_prepair_calc = SimRequiresPrepairCalc()
# Line 394 | Line 288 | contains
288  
289      error = 0
290  
291 <    if (.not. haveInteractionMap) then
398 <      
291 >    if (.not. haveInteractionHash) then      
292         myStatus = 0      
293 <       call createInteractionMap(myStatus)
401 <      
293 >       call createInteractionHash(myStatus)      
294         if (myStatus .ne. 0) then
295 <          write(default_error, *) 'createInteractionMap failed in doForces!'
295 >          write(default_error, *) 'createInteractionHash failed in doForces!'
296            error = -1
297            return
298         endif
299      endif
300  
301 +    if (.not. haveGtypeCutoffMap) then        
302 +       myStatus = 0      
303 +       call createGtypeCutoffMap(myStatus)      
304 +       if (myStatus .ne. 0) then
305 +          write(default_error, *) 'createGtypeCutoffMap failed in doForces!'
306 +          error = -1
307 +          return
308 +       endif
309 +    endif
310 +
311      if (.not. haveSIMvariables) then
312         call setSimVariables()
313      endif
# Line 461 | Line 363 | contains
363      !! interactions are used by the force field.    
364  
365      FF_uses_DirectionalAtoms = .false.
464    FF_uses_LennardJones = .false.
465    FF_uses_Electrostatics = .false.
466    FF_uses_Charges = .false.    
366      FF_uses_Dipoles = .false.
468    FF_uses_Sticky = .false.
469    FF_uses_StickyPower = .false.
367      FF_uses_GayBerne = .false.
368      FF_uses_EAM = .false.
472    FF_uses_Shapes = .false.
473    FF_uses_FLARB = .false.
369  
370      call getMatchingElementList(atypes, "is_Directional", .true., &
371           nMatches, MatchList)
372      if (nMatches .gt. 0) FF_uses_DirectionalAtoms = .true.
373  
479    call getMatchingElementList(atypes, "is_LennardJones", .true., &
480         nMatches, MatchList)
481    if (nMatches .gt. 0) FF_uses_LennardJones = .true.
482
483    call getMatchingElementList(atypes, "is_Electrostatic", .true., &
484         nMatches, MatchList)
485    if (nMatches .gt. 0) then
486       FF_uses_Electrostatics = .true.
487    endif
488
489    call getMatchingElementList(atypes, "is_Charge", .true., &
490         nMatches, MatchList)
491    if (nMatches .gt. 0) then
492       FF_uses_Charges = .true.  
493       FF_uses_Electrostatics = .true.
494    endif
495
374      call getMatchingElementList(atypes, "is_Dipole", .true., &
375           nMatches, MatchList)
376 <    if (nMatches .gt. 0) then
499 <       FF_uses_Dipoles = .true.
500 <       FF_uses_Electrostatics = .true.
501 <       FF_uses_DirectionalAtoms = .true.
502 <    endif
503 <
504 <    call getMatchingElementList(atypes, "is_Quadrupole", .true., &
505 <         nMatches, MatchList)
506 <    if (nMatches .gt. 0) then
507 <       FF_uses_Quadrupoles = .true.
508 <       FF_uses_Electrostatics = .true.
509 <       FF_uses_DirectionalAtoms = .true.
510 <    endif
511 <
512 <    call getMatchingElementList(atypes, "is_Sticky", .true., nMatches, &
513 <         MatchList)
514 <    if (nMatches .gt. 0) then
515 <       FF_uses_Sticky = .true.
516 <       FF_uses_DirectionalAtoms = .true.
517 <    endif
518 <
519 <    call getMatchingElementList(atypes, "is_StickyPower", .true., nMatches, &
520 <         MatchList)
521 <    if (nMatches .gt. 0) then
522 <       FF_uses_StickyPower = .true.
523 <       FF_uses_DirectionalAtoms = .true.
524 <    endif
376 >    if (nMatches .gt. 0) FF_uses_Dipoles = .true.
377      
378      call getMatchingElementList(atypes, "is_GayBerne", .true., &
379           nMatches, MatchList)
380 <    if (nMatches .gt. 0) then
529 <       FF_uses_GayBerne = .true.
530 <       FF_uses_DirectionalAtoms = .true.
531 <    endif
380 >    if (nMatches .gt. 0) FF_uses_GayBerne = .true.
381  
382      call getMatchingElementList(atypes, "is_EAM", .true., nMatches, MatchList)
383      if (nMatches .gt. 0) FF_uses_EAM = .true.
384  
536    call getMatchingElementList(atypes, "is_Shape", .true., &
537         nMatches, MatchList)
538    if (nMatches .gt. 0) then
539       FF_uses_Shapes = .true.
540       FF_uses_DirectionalAtoms = .true.
541    endif
385  
543    call getMatchingElementList(atypes, "is_FLARB", .true., &
544         nMatches, MatchList)
545    if (nMatches .gt. 0) FF_uses_FLARB = .true.
546
547    !! Assume sanity (for the sake of argument)
386      haveSaneForceField = .true.
387  
388      !! check to make sure the FF_uses_RF setting makes sense
389  
390 <    if (FF_uses_dipoles) then
390 >    if (FF_uses_Dipoles) then
391         if (FF_uses_RF) then
392            dielect = getDielect()
393            call initialize_rf(dielect)
# Line 562 | Line 400 | contains
400            return
401         endif
402      endif
565
566    !sticky module does not contain check_sticky_FF anymore
567    !if (FF_uses_sticky) then
568    !   call check_sticky_FF(my_status)
569    !   if (my_status /= 0) then
570    !      thisStat = -1
571    !      haveSaneForceField = .false.
572    !      return
573    !   end if
574    !endif
403  
404      if (FF_uses_EAM) then
405         call init_EAM_FF(my_status)
# Line 592 | Line 420 | contains
420         endif
421      endif
422  
595    if (FF_uses_GayBerne .and. FF_uses_LennardJones) then
596    endif
597
423      if (.not. haveNeighborList) then
424         !! Create neighbor lists
425         call expandNeighborList(nLocal, my_status)
# Line 658 | Line 483 | contains
483      integer :: localError
484      integer :: propPack_i, propPack_j
485      integer :: loopStart, loopEnd, loop
486 <    integer :: iMap
486 >    integer :: iHash
487      real(kind=dp) :: listSkin = 1.0  
488  
489      !! initialize local variables  
# Line 792 | Line 617 | contains
617                    q_group(:,j), d_grp, rgrpsq)
618   #endif
619  
620 <             if (rgrpsq < InteractionMap(me_i,me_j)%rListsq) then
620 >             if (rgrpsq < InteractionHash(me_i,me_j)%rListsq) then
621                  if (update_nlist) then
622                     nlist = nlist + 1
623  
# Line 1010 | Line 835 | contains
835   #else
836               me_i = atid(i)
837   #endif
838 <             iMap = InteractionHash(me_i,me_j)
838 >             iHash = InteractionHash(me_i,me_j)
839              
840 <             if ( iand(iMap, ELECTROSTATIC_PAIR).ne.0 ) then
840 >             if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
841  
842                  mu_i = getDipoleMoment(me_i)
843  
# Line 1079 | Line 904 | contains
904      real ( kind = dp ) :: ebalance
905      integer :: me_i, me_j
906  
907 <    integer :: iMap
907 >    integer :: iHash
908  
909      r = sqrt(rijsq)
910      vpair = 0.0d0
# Line 1093 | Line 918 | contains
918      me_j = atid(j)
919   #endif
920  
921 <    iMap = InteractionMap(me_i, me_j)%InteractionHash
921 >    iHash = InteractionHash(me_i, me_j)
922  
923 <    if ( iand(iMap, LJ_PAIR).ne.0 ) then
923 >    if ( iand(iHash, LJ_PAIR).ne.0 ) then
924         call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
925      endif
926  
927 <    if ( iand(iMap, ELECTROSTATIC_PAIR).ne.0 ) then
927 >    if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
928         call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
929              pot, eFrame, f, t, do_pot)
930  
# Line 1112 | Line 937 | contains
937  
938      endif
939  
940 <    if ( iand(iMap, STICKY_PAIR).ne.0 ) then
940 >    if ( iand(iHash, STICKY_PAIR).ne.0 ) then
941         call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
942              pot, A, f, t, do_pot)
943      endif
944  
945 <    if ( iand(iMap, STICKYPOWER_PAIR).ne.0 ) then
945 >    if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then
946         call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
947              pot, A, f, t, do_pot)
948      endif
949  
950 <    if ( iand(iMap, GAYBERNE_PAIR).ne.0 ) then
950 >    if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then
951         call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
952              pot, A, f, t, do_pot)
953      endif
954      
955 <    if ( iand(iMap, GAYBERNE_LJ).ne.0 ) then
955 >    if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then
956   !      call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
957   !           pot, A, f, t, do_pot)
958      endif
959  
960 <    if ( iand(iMap, EAM_PAIR).ne.0 ) then      
960 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
961         call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
962              do_pot)
963      endif
964  
965 <    if ( iand(iMap, SHAPE_PAIR).ne.0 ) then      
965 >    if ( iand(iHash, SHAPE_PAIR).ne.0 ) then      
966         call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
967              pot, A, f, t, do_pot)
968      endif
969  
970 <    if ( iand(iMap, SHAPE_LJ).ne.0 ) then      
970 >    if ( iand(iHash, SHAPE_LJ).ne.0 ) then      
971         call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
972              pot, A, f, t, do_pot)
973      endif
# Line 1164 | Line 989 | contains
989      real ( kind = dp )                :: r, rc
990      real ( kind = dp ), intent(inout) :: d(3), dc(3)
991  
992 <    integer :: me_i, me_j, iMap
992 >    integer :: me_i, me_j, iHash
993  
994   #ifdef IS_MPI  
995      me_i = atid_row(i)
# Line 1174 | Line 999 | contains
999      me_j = atid(j)  
1000   #endif
1001  
1002 <    iMap = InteractionMap(me_i, me_j)%InteractionHash
1002 >    iHash = InteractionHash(me_i, me_j)
1003  
1004 <    if ( iand(iMap, EAM_PAIR).ne.0 ) then      
1004 >    if ( iand(iHash, EAM_PAIR).ne.0 ) then      
1005              call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1006      endif
1007      
# Line 1373 | Line 1198 | contains
1198  
1199    function FF_UsesDirectionalAtoms() result(doesit)
1200      logical :: doesit
1201 <    doesit = FF_uses_DirectionalAtoms .or. FF_uses_Dipoles .or. &
1377 <         FF_uses_Quadrupoles .or. FF_uses_Sticky .or. &
1378 <         FF_uses_StickyPower .or. FF_uses_GayBerne .or. FF_uses_Shapes
1201 >    doesit = FF_uses_DirectionalAtoms
1202    end function FF_UsesDirectionalAtoms
1203  
1204    function FF_RequiresPrepairCalc() result(doesit)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines