45 |
|
|
46 |
|
!! @author Charles F. Vardeman II |
47 |
|
!! @author Matthew Meineke |
48 |
< |
!! @version $Id: doForces.F90,v 1.15 2005-05-05 14:47:35 chrisfen Exp $, $Date: 2005-05-05 14:47:35 $, $Name: not supported by cvs2svn $, $Revision: 1.15 $ |
48 |
> |
!! @version $Id: doForces.F90,v 1.43 2005-09-15 02:48:43 chuckv Exp $, $Date: 2005-09-15 02:48:43 $, $Name: not supported by cvs2svn $, $Revision: 1.43 $ |
49 |
|
|
50 |
|
|
51 |
|
module doForces |
58 |
|
use lj |
59 |
|
use sticky |
60 |
|
use electrostatic_module |
61 |
< |
use reaction_field |
61 |
> |
use reaction_field_module |
62 |
|
use gb_pair |
63 |
|
use shapes |
64 |
|
use vector_class |
73 |
|
|
74 |
|
#define __FORTRAN90 |
75 |
|
#include "UseTheForce/fSwitchingFunction.h" |
76 |
+ |
#include "UseTheForce/fCutoffPolicy.h" |
77 |
+ |
#include "UseTheForce/fCoulombicCorrection.h" |
78 |
+ |
#include "UseTheForce/DarkSide/fInteractionMap.h" |
79 |
|
|
80 |
+ |
|
81 |
|
INTEGER, PARAMETER:: PREPAIR_LOOP = 1 |
82 |
|
INTEGER, PARAMETER:: PAIR_LOOP = 2 |
83 |
|
|
80 |
– |
logical, save :: haveRlist = .false. |
84 |
|
logical, save :: haveNeighborList = .false. |
85 |
|
logical, save :: haveSIMvariables = .false. |
83 |
– |
logical, save :: havePropertyMap = .false. |
86 |
|
logical, save :: haveSaneForceField = .false. |
87 |
+ |
logical, save :: haveInteractionHash = .false. |
88 |
+ |
logical, save :: haveGtypeCutoffMap = .false. |
89 |
+ |
logical, save :: haveRlist = .false. |
90 |
|
|
91 |
|
logical, save :: FF_uses_DirectionalAtoms |
87 |
– |
logical, save :: FF_uses_LennardJones |
88 |
– |
logical, save :: FF_uses_Electrostatics |
89 |
– |
logical, save :: FF_uses_Charges |
92 |
|
logical, save :: FF_uses_Dipoles |
91 |
– |
logical, save :: FF_uses_Quadrupoles |
92 |
– |
logical, save :: FF_uses_Sticky |
93 |
– |
logical, save :: FF_uses_StickyPower |
93 |
|
logical, save :: FF_uses_GayBerne |
94 |
|
logical, save :: FF_uses_EAM |
96 |
– |
logical, save :: FF_uses_Shapes |
97 |
– |
logical, save :: FF_uses_FLARB |
95 |
|
logical, save :: FF_uses_RF |
96 |
|
|
97 |
|
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 |
98 |
|
logical, save :: SIM_uses_EAM |
110 |
– |
logical, save :: SIM_uses_Shapes |
111 |
– |
logical, save :: SIM_uses_FLARB |
99 |
|
logical, save :: SIM_uses_RF |
100 |
|
logical, save :: SIM_requires_postpair_calc |
101 |
|
logical, save :: SIM_requires_prepair_calc |
102 |
|
logical, save :: SIM_uses_PBC |
116 |
– |
logical, save :: SIM_uses_molecular_cutoffs |
103 |
|
|
104 |
< |
real(kind=dp), save :: rlist, rlistsq |
104 |
> |
integer, save :: corrMethod |
105 |
|
|
106 |
|
public :: init_FF |
107 |
+ |
public :: setDefaultCutoffs |
108 |
|
public :: do_force_loop |
109 |
< |
public :: setRlistDF |
109 |
> |
public :: createInteractionHash |
110 |
> |
public :: createGtypeCutoffMap |
111 |
> |
public :: getStickyCut |
112 |
> |
public :: getStickyPowerCut |
113 |
> |
public :: getGayBerneCut |
114 |
> |
public :: getEAMCut |
115 |
> |
public :: getShapeCut |
116 |
|
|
117 |
|
#ifdef PROFILE |
118 |
|
public :: getforcetime |
120 |
|
real :: forceTimeInitial, forceTimeFinal |
121 |
|
integer :: nLoops |
122 |
|
#endif |
123 |
+ |
|
124 |
+ |
!! Variables for cutoff mapping and interaction mapping |
125 |
+ |
! Bit hash to determine pair-pair interactions. |
126 |
+ |
integer, dimension(:,:), allocatable :: InteractionHash |
127 |
+ |
real(kind=dp), dimension(:), allocatable :: atypeMaxCutoff |
128 |
+ |
real(kind=dp), dimension(:), allocatable :: groupMaxCutoff |
129 |
+ |
integer, dimension(:), allocatable :: groupToGtype |
130 |
+ |
real(kind=dp), dimension(:), allocatable :: gtypeMaxCutoff |
131 |
+ |
type ::gtypeCutoffs |
132 |
+ |
real(kind=dp) :: rcut |
133 |
+ |
real(kind=dp) :: rcutsq |
134 |
+ |
real(kind=dp) :: rlistsq |
135 |
+ |
end type gtypeCutoffs |
136 |
+ |
type(gtypeCutoffs), dimension(:,:), allocatable :: gtypeCutoffMap |
137 |
|
|
138 |
< |
type :: Properties |
139 |
< |
logical :: is_Directional = .false. |
140 |
< |
logical :: is_LennardJones = .false. |
141 |
< |
logical :: is_Electrostatic = .false. |
142 |
< |
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 |
< |
|
138 |
> |
integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY |
139 |
> |
integer, save :: coulombicCorrection = NONE |
140 |
> |
real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist |
141 |
> |
real(kind=dp),save :: rcuti |
142 |
> |
|
143 |
|
contains |
144 |
|
|
145 |
< |
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) |
145 |
> |
subroutine createInteractionHash(status) |
146 |
|
integer :: nAtypes |
147 |
< |
integer :: status |
147 |
> |
integer, intent(out) :: status |
148 |
|
integer :: i |
149 |
< |
logical :: thisProperty |
150 |
< |
real (kind=DP) :: thisDPproperty |
149 |
> |
integer :: j |
150 |
> |
integer :: iHash |
151 |
> |
!! Test Types |
152 |
> |
logical :: i_is_LJ |
153 |
> |
logical :: i_is_Elect |
154 |
> |
logical :: i_is_Sticky |
155 |
> |
logical :: i_is_StickyP |
156 |
> |
logical :: i_is_GB |
157 |
> |
logical :: i_is_EAM |
158 |
> |
logical :: i_is_Shape |
159 |
> |
logical :: j_is_LJ |
160 |
> |
logical :: j_is_Elect |
161 |
> |
logical :: j_is_Sticky |
162 |
> |
logical :: j_is_StickyP |
163 |
> |
logical :: j_is_GB |
164 |
> |
logical :: j_is_EAM |
165 |
> |
logical :: j_is_Shape |
166 |
> |
real(kind=dp) :: myRcut |
167 |
|
|
168 |
< |
status = 0 |
168 |
> |
status = 0 |
169 |
|
|
170 |
+ |
if (.not. associated(atypes)) then |
171 |
+ |
call handleError("atype", "atypes was not present before call of createInteractionHash!") |
172 |
+ |
status = -1 |
173 |
+ |
return |
174 |
+ |
endif |
175 |
+ |
|
176 |
|
nAtypes = getSize(atypes) |
177 |
< |
|
177 |
> |
|
178 |
|
if (nAtypes == 0) then |
179 |
|
status = -1 |
180 |
|
return |
181 |
|
end if |
182 |
|
|
183 |
< |
if (.not. allocated(PropertyMap)) then |
184 |
< |
allocate(PropertyMap(nAtypes)) |
183 |
> |
if (.not. allocated(InteractionHash)) then |
184 |
> |
allocate(InteractionHash(nAtypes,nAtypes)) |
185 |
|
endif |
186 |
|
|
187 |
+ |
if (.not. allocated(atypeMaxCutoff)) then |
188 |
+ |
allocate(atypeMaxCutoff(nAtypes)) |
189 |
+ |
endif |
190 |
+ |
|
191 |
|
do i = 1, nAtypes |
192 |
< |
call getElementProperty(atypes, i, "is_Directional", thisProperty) |
193 |
< |
PropertyMap(i)%is_Directional = thisProperty |
192 |
> |
call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ) |
193 |
> |
call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect) |
194 |
> |
call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky) |
195 |
> |
call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP) |
196 |
> |
call getElementProperty(atypes, i, "is_GayBerne", i_is_GB) |
197 |
> |
call getElementProperty(atypes, i, "is_EAM", i_is_EAM) |
198 |
> |
call getElementProperty(atypes, i, "is_Shape", i_is_Shape) |
199 |
|
|
200 |
< |
call getElementProperty(atypes, i, "is_LennardJones", thisProperty) |
186 |
< |
PropertyMap(i)%is_LennardJones = thisProperty |
200 |
> |
do j = i, nAtypes |
201 |
|
|
202 |
< |
call getElementProperty(atypes, i, "is_Electrostatic", thisProperty) |
203 |
< |
PropertyMap(i)%is_Electrostatic = thisProperty |
202 |
> |
iHash = 0 |
203 |
> |
myRcut = 0.0_dp |
204 |
|
|
205 |
< |
call getElementProperty(atypes, i, "is_Charge", thisProperty) |
206 |
< |
PropertyMap(i)%is_Charge = thisProperty |
205 |
> |
call getElementProperty(atypes, j, "is_LennardJones", j_is_LJ) |
206 |
> |
call getElementProperty(atypes, j, "is_Electrostatic", j_is_Elect) |
207 |
> |
call getElementProperty(atypes, j, "is_Sticky", j_is_Sticky) |
208 |
> |
call getElementProperty(atypes, j, "is_StickyPower", j_is_StickyP) |
209 |
> |
call getElementProperty(atypes, j, "is_GayBerne", j_is_GB) |
210 |
> |
call getElementProperty(atypes, j, "is_EAM", j_is_EAM) |
211 |
> |
call getElementProperty(atypes, j, "is_Shape", j_is_Shape) |
212 |
|
|
213 |
< |
call getElementProperty(atypes, i, "is_Dipole", thisProperty) |
214 |
< |
PropertyMap(i)%is_Dipole = thisProperty |
213 |
> |
if (i_is_LJ .and. j_is_LJ) then |
214 |
> |
iHash = ior(iHash, LJ_PAIR) |
215 |
> |
endif |
216 |
> |
|
217 |
> |
if (i_is_Elect .and. j_is_Elect) then |
218 |
> |
iHash = ior(iHash, ELECTROSTATIC_PAIR) |
219 |
> |
endif |
220 |
> |
|
221 |
> |
if (i_is_Sticky .and. j_is_Sticky) then |
222 |
> |
iHash = ior(iHash, STICKY_PAIR) |
223 |
> |
endif |
224 |
|
|
225 |
< |
call getElementProperty(atypes, i, "is_Quadrupole", thisProperty) |
226 |
< |
PropertyMap(i)%is_Quadrupole = thisProperty |
225 |
> |
if (i_is_StickyP .and. j_is_StickyP) then |
226 |
> |
iHash = ior(iHash, STICKYPOWER_PAIR) |
227 |
> |
endif |
228 |
|
|
229 |
< |
call getElementProperty(atypes, i, "is_Sticky", thisProperty) |
230 |
< |
PropertyMap(i)%is_Sticky = thisProperty |
231 |
< |
|
203 |
< |
call getElementProperty(atypes, i, "is_StickyPower", thisProperty) |
204 |
< |
PropertyMap(i)%is_StickyPower = thisProperty |
229 |
> |
if (i_is_EAM .and. j_is_EAM) then |
230 |
> |
iHash = ior(iHash, EAM_PAIR) |
231 |
> |
endif |
232 |
|
|
233 |
< |
call getElementProperty(atypes, i, "is_GayBerne", thisProperty) |
234 |
< |
PropertyMap(i)%is_GayBerne = thisProperty |
233 |
> |
if (i_is_GB .and. j_is_GB) iHash = ior(iHash, GAYBERNE_PAIR) |
234 |
> |
if (i_is_GB .and. j_is_LJ) iHash = ior(iHash, GAYBERNE_LJ) |
235 |
> |
if (i_is_LJ .and. j_is_GB) iHash = ior(iHash, GAYBERNE_LJ) |
236 |
|
|
237 |
< |
call getElementProperty(atypes, i, "is_EAM", thisProperty) |
238 |
< |
PropertyMap(i)%is_EAM = thisProperty |
237 |
> |
if (i_is_Shape .and. j_is_Shape) iHash = ior(iHash, SHAPE_PAIR) |
238 |
> |
if (i_is_Shape .and. j_is_LJ) iHash = ior(iHash, SHAPE_LJ) |
239 |
> |
if (i_is_LJ .and. j_is_Shape) iHash = ior(iHash, SHAPE_LJ) |
240 |
|
|
212 |
– |
call getElementProperty(atypes, i, "is_Shape", thisProperty) |
213 |
– |
PropertyMap(i)%is_Shape = thisProperty |
241 |
|
|
242 |
< |
call getElementProperty(atypes, i, "is_FLARB", thisProperty) |
243 |
< |
PropertyMap(i)%is_FLARB = thisProperty |
242 |
> |
InteractionHash(i,j) = iHash |
243 |
> |
InteractionHash(j,i) = iHash |
244 |
> |
|
245 |
> |
end do |
246 |
> |
|
247 |
|
end do |
248 |
|
|
249 |
< |
havePropertyMap = .true. |
249 |
> |
haveInteractionHash = .true. |
250 |
> |
end subroutine createInteractionHash |
251 |
|
|
252 |
< |
end subroutine createPropertyMap |
252 |
> |
subroutine createGtypeCutoffMap(stat) |
253 |
|
|
254 |
+ |
integer, intent(out), optional :: stat |
255 |
+ |
logical :: i_is_LJ |
256 |
+ |
logical :: i_is_Elect |
257 |
+ |
logical :: i_is_Sticky |
258 |
+ |
logical :: i_is_StickyP |
259 |
+ |
logical :: i_is_GB |
260 |
+ |
logical :: i_is_EAM |
261 |
+ |
logical :: i_is_Shape |
262 |
+ |
logical :: GtypeFound |
263 |
+ |
|
264 |
+ |
integer :: myStatus, nAtypes, i, j, istart, iend, jstart, jend |
265 |
+ |
integer :: n_in_i, me_i, ia, g, atom1, nGroupTypes |
266 |
+ |
integer :: nGroupsInRow |
267 |
+ |
real(kind=dp):: thisSigma, bigSigma, thisRcut, tol, skin |
268 |
+ |
real(kind=dp) :: biggestAtypeCutoff |
269 |
+ |
|
270 |
+ |
stat = 0 |
271 |
+ |
if (.not. haveInteractionHash) then |
272 |
+ |
call createInteractionHash(myStatus) |
273 |
+ |
if (myStatus .ne. 0) then |
274 |
+ |
write(default_error, *) 'createInteractionHash failed in doForces!' |
275 |
+ |
stat = -1 |
276 |
+ |
return |
277 |
+ |
endif |
278 |
+ |
endif |
279 |
+ |
#ifdef IS_MPI |
280 |
+ |
nGroupsInRow = getNgroupsInRow(plan_group_row) |
281 |
+ |
#endif |
282 |
+ |
nAtypes = getSize(atypes) |
283 |
+ |
! Set all of the initial cutoffs to zero. |
284 |
+ |
atypeMaxCutoff = 0.0_dp |
285 |
+ |
do i = 1, nAtypes |
286 |
+ |
if (SimHasAtype(i)) then |
287 |
+ |
call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ) |
288 |
+ |
call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect) |
289 |
+ |
call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky) |
290 |
+ |
call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP) |
291 |
+ |
call getElementProperty(atypes, i, "is_GayBerne", i_is_GB) |
292 |
+ |
call getElementProperty(atypes, i, "is_EAM", i_is_EAM) |
293 |
+ |
call getElementProperty(atypes, i, "is_Shape", i_is_Shape) |
294 |
+ |
|
295 |
+ |
|
296 |
+ |
if (i_is_LJ) then |
297 |
+ |
thisRcut = getSigma(i) * 2.5_dp |
298 |
+ |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
299 |
+ |
endif |
300 |
+ |
if (i_is_Elect) then |
301 |
+ |
thisRcut = defaultRcut |
302 |
+ |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
303 |
+ |
endif |
304 |
+ |
if (i_is_Sticky) then |
305 |
+ |
thisRcut = getStickyCut(i) |
306 |
+ |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
307 |
+ |
endif |
308 |
+ |
if (i_is_StickyP) then |
309 |
+ |
thisRcut = getStickyPowerCut(i) |
310 |
+ |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
311 |
+ |
endif |
312 |
+ |
if (i_is_GB) then |
313 |
+ |
thisRcut = getGayBerneCut(i) |
314 |
+ |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
315 |
+ |
endif |
316 |
+ |
if (i_is_EAM) then |
317 |
+ |
thisRcut = getEAMCut(i) |
318 |
+ |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
319 |
+ |
endif |
320 |
+ |
if (i_is_Shape) then |
321 |
+ |
thisRcut = getShapeCut(i) |
322 |
+ |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
323 |
+ |
endif |
324 |
+ |
|
325 |
+ |
if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then |
326 |
+ |
biggestAtypeCutoff = atypeMaxCutoff(i) |
327 |
+ |
endif |
328 |
+ |
endif |
329 |
+ |
enddo |
330 |
+ |
|
331 |
+ |
nGroupTypes = 0 |
332 |
+ |
|
333 |
+ |
istart = 1 |
334 |
+ |
#ifdef IS_MPI |
335 |
+ |
iend = nGroupsInRow |
336 |
+ |
#else |
337 |
+ |
iend = nGroups |
338 |
+ |
#endif |
339 |
+ |
|
340 |
+ |
!! allocate the groupToGtype and gtypeMaxCutoff here. |
341 |
+ |
if(.not.allocated(groupToGtype)) then |
342 |
+ |
allocate(groupToGtype(iend)) |
343 |
+ |
allocate(groupMaxCutoff(iend)) |
344 |
+ |
allocate(gtypeMaxCutoff(iend)) |
345 |
+ |
groupMaxCutoff = 0.0_dp |
346 |
+ |
gtypeMaxCutoff = 0.0_dp |
347 |
+ |
endif |
348 |
+ |
!! first we do a single loop over the cutoff groups to find the |
349 |
+ |
!! largest cutoff for any atypes present in this group. We also |
350 |
+ |
!! create gtypes at this point. |
351 |
+ |
|
352 |
+ |
tol = 1.0d-6 |
353 |
+ |
|
354 |
+ |
do i = istart, iend |
355 |
+ |
n_in_i = groupStartRow(i+1) - groupStartRow(i) |
356 |
+ |
groupMaxCutoff(i) = 0.0_dp |
357 |
+ |
do ia = groupStartRow(i), groupStartRow(i+1)-1 |
358 |
+ |
atom1 = groupListRow(ia) |
359 |
+ |
#ifdef IS_MPI |
360 |
+ |
me_i = atid_row(atom1) |
361 |
+ |
#else |
362 |
+ |
me_i = atid(atom1) |
363 |
+ |
#endif |
364 |
+ |
if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then |
365 |
+ |
groupMaxCutoff(i)=atypeMaxCutoff(me_i) |
366 |
+ |
endif |
367 |
+ |
enddo |
368 |
+ |
|
369 |
+ |
if (nGroupTypes.eq.0) then |
370 |
+ |
nGroupTypes = nGroupTypes + 1 |
371 |
+ |
gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i) |
372 |
+ |
groupToGtype(i) = nGroupTypes |
373 |
+ |
else |
374 |
+ |
GtypeFound = .false. |
375 |
+ |
do g = 1, nGroupTypes |
376 |
+ |
if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).lt.tol) then |
377 |
+ |
groupToGtype(i) = g |
378 |
+ |
GtypeFound = .true. |
379 |
+ |
endif |
380 |
+ |
enddo |
381 |
+ |
if (.not.GtypeFound) then |
382 |
+ |
nGroupTypes = nGroupTypes + 1 |
383 |
+ |
gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i) |
384 |
+ |
groupToGtype(i) = nGroupTypes |
385 |
+ |
endif |
386 |
+ |
endif |
387 |
+ |
enddo |
388 |
+ |
|
389 |
+ |
!! allocate the gtypeCutoffMap here. |
390 |
+ |
allocate(gtypeCutoffMap(nGroupTypes,nGroupTypes)) |
391 |
+ |
!! then we do a double loop over all the group TYPES to find the cutoff |
392 |
+ |
!! map between groups of two types |
393 |
+ |
|
394 |
+ |
do i = 1, nGroupTypes |
395 |
+ |
do j = 1, nGroupTypes |
396 |
+ |
|
397 |
+ |
select case(cutoffPolicy) |
398 |
+ |
case(TRADITIONAL_CUTOFF_POLICY) |
399 |
+ |
thisRcut = maxval(gtypeMaxCutoff) |
400 |
+ |
case(MIX_CUTOFF_POLICY) |
401 |
+ |
thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j)) |
402 |
+ |
case(MAX_CUTOFF_POLICY) |
403 |
+ |
thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j)) |
404 |
+ |
case default |
405 |
+ |
call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy") |
406 |
+ |
return |
407 |
+ |
end select |
408 |
+ |
gtypeCutoffMap(i,j)%rcut = thisRcut |
409 |
+ |
gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut |
410 |
+ |
skin = defaultRlist - defaultRcut |
411 |
+ |
gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2 |
412 |
+ |
|
413 |
+ |
enddo |
414 |
+ |
enddo |
415 |
+ |
|
416 |
+ |
haveGtypeCutoffMap = .true. |
417 |
+ |
end subroutine createGtypeCutoffMap |
418 |
+ |
|
419 |
+ |
subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy) |
420 |
+ |
real(kind=dp),intent(in) :: defRcut, defRsw, defRlist |
421 |
+ |
integer, intent(in) :: cutPolicy |
422 |
+ |
|
423 |
+ |
defaultRcut = defRcut |
424 |
+ |
defaultRsw = defRsw |
425 |
+ |
defaultRlist = defRlist |
426 |
+ |
cutoffPolicy = cutPolicy |
427 |
+ |
rcuti = 1.0_dp / defaultRcut |
428 |
+ |
end subroutine setDefaultCutoffs |
429 |
+ |
|
430 |
+ |
subroutine setCutoffPolicy(cutPolicy) |
431 |
+ |
|
432 |
+ |
integer, intent(in) :: cutPolicy |
433 |
+ |
cutoffPolicy = cutPolicy |
434 |
+ |
call createGtypeCutoffMap() |
435 |
+ |
end subroutine setCutoffPolicy |
436 |
+ |
|
437 |
+ |
|
438 |
|
subroutine setSimVariables() |
439 |
|
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() |
440 |
|
SIM_uses_EAM = SimUsesEAM() |
233 |
– |
SIM_uses_Shapes = SimUsesShapes() |
234 |
– |
SIM_uses_FLARB = SimUsesFLARB() |
235 |
– |
SIM_uses_RF = SimUsesRF() |
441 |
|
SIM_requires_postpair_calc = SimRequiresPostpairCalc() |
442 |
|
SIM_requires_prepair_calc = SimRequiresPrepairCalc() |
443 |
|
SIM_uses_PBC = SimUsesPBC() |
444 |
+ |
SIM_uses_RF = SimUsesRF() |
445 |
|
|
446 |
|
haveSIMvariables = .true. |
447 |
|
|
455 |
|
|
456 |
|
error = 0 |
457 |
|
|
458 |
< |
if (.not. havePropertyMap) then |
458 |
> |
if (.not. haveInteractionHash) then |
459 |
> |
myStatus = 0 |
460 |
> |
call createInteractionHash(myStatus) |
461 |
> |
if (myStatus .ne. 0) then |
462 |
> |
write(default_error, *) 'createInteractionHash failed in doForces!' |
463 |
> |
error = -1 |
464 |
> |
return |
465 |
> |
endif |
466 |
> |
endif |
467 |
|
|
468 |
< |
myStatus = 0 |
469 |
< |
|
470 |
< |
call createPropertyMap(myStatus) |
257 |
< |
|
468 |
> |
if (.not. haveGtypeCutoffMap) then |
469 |
> |
myStatus = 0 |
470 |
> |
call createGtypeCutoffMap(myStatus) |
471 |
|
if (myStatus .ne. 0) then |
472 |
< |
write(default_error, *) 'createPropertyMap failed in doForces!' |
472 |
> |
write(default_error, *) 'createGtypeCutoffMap failed in doForces!' |
473 |
|
error = -1 |
474 |
|
return |
475 |
|
endif |
479 |
|
call setSimVariables() |
480 |
|
endif |
481 |
|
|
482 |
< |
if (.not. haveRlist) then |
483 |
< |
write(default_error, *) 'rList has not been set in doForces!' |
484 |
< |
error = -1 |
485 |
< |
return |
486 |
< |
endif |
482 |
> |
! if (.not. haveRlist) then |
483 |
> |
! write(default_error, *) 'rList has not been set in doForces!' |
484 |
> |
! error = -1 |
485 |
> |
! return |
486 |
> |
! endif |
487 |
|
|
488 |
|
if (.not. haveNeighborList) then |
489 |
|
write(default_error, *) 'neighbor list has not been initialized in doForces!' |
508 |
|
end subroutine doReadyCheck |
509 |
|
|
510 |
|
|
511 |
< |
subroutine init_FF(use_RF_c, thisStat) |
511 |
> |
subroutine init_FF(use_RF, correctionMethod, dampingAlpha, thisStat) |
512 |
|
|
513 |
< |
logical, intent(in) :: use_RF_c |
514 |
< |
|
513 |
> |
logical, intent(in) :: use_RF |
514 |
> |
integer, intent(in) :: correctionMethod |
515 |
> |
real(kind=dp), intent(in) :: dampingAlpha |
516 |
|
integer, intent(out) :: thisStat |
517 |
|
integer :: my_status, nMatches |
518 |
|
integer, pointer :: MatchList(:) => null() |
522 |
|
thisStat = 0 |
523 |
|
|
524 |
|
!! Fortran's version of a cast: |
525 |
< |
FF_uses_RF = use_RF_c |
525 |
> |
FF_uses_RF = use_RF |
526 |
|
|
527 |
+ |
!! set the electrostatic correction method |
528 |
+ |
select case(coulombicCorrection) |
529 |
+ |
case(NONE) |
530 |
+ |
corrMethod = 0 |
531 |
+ |
case(UNDAMPED_WOLF) |
532 |
+ |
corrMethod = 1 |
533 |
+ |
case(WOLF) |
534 |
+ |
corrMethod = 2 |
535 |
+ |
case (REACTION_FIELD) |
536 |
+ |
corrMethod = 3 |
537 |
+ |
case default |
538 |
+ |
call handleError("init_FF", "Unknown Coulombic Correction Method") |
539 |
+ |
return |
540 |
+ |
end select |
541 |
+ |
|
542 |
|
!! init_FF is called *after* all of the atom types have been |
543 |
|
!! defined in atype_module using the new_atype subroutine. |
544 |
|
!! |
546 |
|
!! interactions are used by the force field. |
547 |
|
|
548 |
|
FF_uses_DirectionalAtoms = .false. |
320 |
– |
FF_uses_LennardJones = .false. |
321 |
– |
FF_uses_Electrostatics = .false. |
322 |
– |
FF_uses_Charges = .false. |
549 |
|
FF_uses_Dipoles = .false. |
324 |
– |
FF_uses_Sticky = .false. |
325 |
– |
FF_uses_StickyPower = .false. |
550 |
|
FF_uses_GayBerne = .false. |
551 |
|
FF_uses_EAM = .false. |
328 |
– |
FF_uses_Shapes = .false. |
329 |
– |
FF_uses_FLARB = .false. |
552 |
|
|
553 |
|
call getMatchingElementList(atypes, "is_Directional", .true., & |
554 |
|
nMatches, MatchList) |
555 |
|
if (nMatches .gt. 0) FF_uses_DirectionalAtoms = .true. |
556 |
|
|
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 |
– |
|
557 |
|
call getMatchingElementList(atypes, "is_Dipole", .true., & |
558 |
|
nMatches, MatchList) |
559 |
< |
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 |
559 |
> |
if (nMatches .gt. 0) FF_uses_Dipoles = .true. |
560 |
|
|
561 |
|
call getMatchingElementList(atypes, "is_GayBerne", .true., & |
562 |
|
nMatches, MatchList) |
563 |
< |
if (nMatches .gt. 0) then |
385 |
< |
FF_uses_GayBerne = .true. |
386 |
< |
FF_uses_DirectionalAtoms = .true. |
387 |
< |
endif |
563 |
> |
if (nMatches .gt. 0) FF_uses_GayBerne = .true. |
564 |
|
|
565 |
|
call getMatchingElementList(atypes, "is_EAM", .true., nMatches, MatchList) |
566 |
|
if (nMatches .gt. 0) FF_uses_EAM = .true. |
567 |
|
|
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 |
568 |
|
|
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) |
569 |
|
haveSaneForceField = .true. |
570 |
|
|
571 |
|
!! check to make sure the FF_uses_RF setting makes sense |
572 |
|
|
573 |
< |
if (FF_uses_dipoles) then |
573 |
> |
if (FF_uses_Dipoles) then |
574 |
|
if (FF_uses_RF) then |
575 |
|
dielect = getDielect() |
576 |
|
call initialize_rf(dielect) |
577 |
|
endif |
578 |
|
else |
579 |
< |
if (FF_uses_RF) then |
579 |
> |
if ((corrMethod == 3) .or. FF_uses_RF) then |
580 |
|
write(default_error,*) 'Using Reaction Field with no dipoles? Huh?' |
581 |
|
thisStat = -1 |
582 |
|
haveSaneForceField = .false. |
584 |
|
endif |
585 |
|
endif |
586 |
|
|
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 |
– |
|
587 |
|
if (FF_uses_EAM) then |
588 |
|
call init_EAM_FF(my_status) |
589 |
|
if (my_status /= 0) then |
603 |
|
endif |
604 |
|
endif |
605 |
|
|
451 |
– |
if (FF_uses_GayBerne .and. FF_uses_LennardJones) then |
452 |
– |
endif |
453 |
– |
|
606 |
|
if (.not. haveNeighborList) then |
607 |
|
!! Create neighbor lists |
608 |
|
call expandNeighborList(nLocal, my_status) |
666 |
|
integer :: localError |
667 |
|
integer :: propPack_i, propPack_j |
668 |
|
integer :: loopStart, loopEnd, loop |
669 |
< |
|
669 |
> |
integer :: iHash |
670 |
|
real(kind=dp) :: listSkin = 1.0 |
671 |
|
|
672 |
|
!! initialize local variables |
785 |
|
endif |
786 |
|
|
787 |
|
#ifdef IS_MPI |
788 |
+ |
me_j = atid_col(j) |
789 |
|
call get_interatomic_vector(q_group_Row(:,i), & |
790 |
|
q_group_Col(:,j), d_grp, rgrpsq) |
791 |
|
#else |
792 |
+ |
me_j = atid(j) |
793 |
|
call get_interatomic_vector(q_group(:,i), & |
794 |
|
q_group(:,j), d_grp, rgrpsq) |
795 |
|
#endif |
796 |
|
|
797 |
< |
if (rgrpsq < rlistsq) then |
797 |
> |
if (rgrpsq < gtypeCutoffMap(groupToGtype(i),groupToGtype(j))%rListsq) then |
798 |
|
if (update_nlist) then |
799 |
|
nlist = nlist + 1 |
800 |
|
|
994 |
|
|
995 |
|
if (FF_RequiresPostpairCalc() .and. SIM_requires_postpair_calc) then |
996 |
|
|
997 |
< |
if (FF_uses_RF .and. SIM_uses_RF) then |
997 |
> |
if ((FF_uses_RF .and. SIM_uses_RF) .or. (corrMethod == 3)) then |
998 |
|
|
999 |
|
#ifdef IS_MPI |
1000 |
|
call scatter(rf_Row,rf,plan_atom_row_3d) |
1012 |
|
#else |
1013 |
|
me_i = atid(i) |
1014 |
|
#endif |
1015 |
< |
|
1016 |
< |
if (PropertyMap(me_i)%is_Dipole) then |
1015 |
> |
iHash = InteractionHash(me_i,me_j) |
1016 |
> |
|
1017 |
> |
if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then |
1018 |
|
|
1019 |
|
mu_i = getDipoleMoment(me_i) |
1020 |
|
|
1080 |
|
real ( kind = dp ), intent(inout) :: d(3) |
1081 |
|
integer :: me_i, me_j |
1082 |
|
|
1083 |
+ |
integer :: iHash |
1084 |
+ |
|
1085 |
|
r = sqrt(rijsq) |
1086 |
|
vpair = 0.0d0 |
1087 |
|
fpair(1:3) = 0.0d0 |
1094 |
|
me_j = atid(j) |
1095 |
|
#endif |
1096 |
|
|
1097 |
< |
! write(*,*) i, j, me_i, me_j |
941 |
< |
|
942 |
< |
if (FF_uses_LennardJones .and. SIM_uses_LennardJones) then |
943 |
< |
|
944 |
< |
if ( PropertyMap(me_i)%is_LennardJones .and. & |
945 |
< |
PropertyMap(me_j)%is_LennardJones ) then |
946 |
< |
call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot) |
947 |
< |
endif |
948 |
< |
|
949 |
< |
endif |
950 |
< |
|
951 |
< |
if (FF_uses_Electrostatics .and. SIM_uses_Electrostatics) then |
952 |
< |
|
953 |
< |
if (PropertyMap(me_i)%is_Electrostatic .and. & |
954 |
< |
PropertyMap(me_j)%is_Electrostatic) then |
955 |
< |
call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, & |
956 |
< |
pot, eFrame, f, t, do_pot) |
957 |
< |
endif |
1097 |
> |
iHash = InteractionHash(me_i, me_j) |
1098 |
|
|
1099 |
< |
if (FF_uses_dipoles .and. SIM_uses_dipoles) then |
1100 |
< |
if ( PropertyMap(me_i)%is_Dipole .and. & |
961 |
< |
PropertyMap(me_j)%is_Dipole) then |
962 |
< |
if (FF_uses_RF .and. SIM_uses_RF) then |
963 |
< |
call accumulate_rf(i, j, r, eFrame, sw) |
964 |
< |
call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair) |
965 |
< |
endif |
966 |
< |
endif |
967 |
< |
endif |
1099 |
> |
if ( iand(iHash, LJ_PAIR).ne.0 ) then |
1100 |
> |
call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot) |
1101 |
|
endif |
1102 |
|
|
1103 |
+ |
if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then |
1104 |
+ |
call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1105 |
+ |
pot, eFrame, f, t, do_pot, corrMethod, rcuti) |
1106 |
|
|
1107 |
< |
if (FF_uses_Sticky .and. SIM_uses_sticky) then |
1107 |
> |
if ((FF_uses_RF .and. SIM_uses_RF) .or. (corrMethod == 3)) then |
1108 |
|
|
1109 |
< |
if ( PropertyMap(me_i)%is_Sticky .and. PropertyMap(me_j)%is_Sticky) then |
1110 |
< |
call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1111 |
< |
pot, A, f, t, do_pot) |
1109 |
> |
! CHECK ME (RF needs to know about all electrostatic types) |
1110 |
> |
call accumulate_rf(i, j, r, eFrame, sw) |
1111 |
> |
call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair) |
1112 |
|
endif |
1113 |
|
|
1114 |
|
endif |
1115 |
|
|
1116 |
< |
if (FF_uses_StickyPower .and. SIM_uses_stickypower) then |
1117 |
< |
if ( PropertyMap(me_i)%is_StickyPower .and. & |
1118 |
< |
PropertyMap(me_j)%is_StickyPower) then |
983 |
< |
call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
984 |
< |
pot, A, f, t, do_pot) |
985 |
< |
endif |
1116 |
> |
if ( iand(iHash, STICKY_PAIR).ne.0 ) then |
1117 |
> |
call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1118 |
> |
pot, A, f, t, do_pot) |
1119 |
|
endif |
987 |
– |
|
988 |
– |
if (FF_uses_GayBerne .and. SIM_uses_GayBerne) then |
1120 |
|
|
1121 |
< |
if ( PropertyMap(me_i)%is_GayBerne .and. & |
1122 |
< |
PropertyMap(me_j)%is_GayBerne) then |
1123 |
< |
call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1124 |
< |
pot, A, f, t, do_pot) |
994 |
< |
endif |
1121 |
> |
if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then |
1122 |
> |
call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1123 |
> |
pot, A, f, t, do_pot) |
1124 |
> |
endif |
1125 |
|
|
1126 |
+ |
if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then |
1127 |
+ |
call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1128 |
+ |
pot, A, f, t, do_pot) |
1129 |
|
endif |
1130 |
+ |
|
1131 |
+ |
if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then |
1132 |
+ |
! call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1133 |
+ |
! pot, A, f, t, do_pot) |
1134 |
+ |
endif |
1135 |
|
|
1136 |
< |
if (FF_uses_EAM .and. SIM_uses_EAM) then |
1137 |
< |
|
1138 |
< |
if ( PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) then |
1001 |
< |
call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, & |
1002 |
< |
do_pot) |
1003 |
< |
endif |
1004 |
< |
|
1136 |
> |
if ( iand(iHash, EAM_PAIR).ne.0 ) then |
1137 |
> |
call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, & |
1138 |
> |
do_pot) |
1139 |
|
endif |
1140 |
|
|
1141 |
< |
|
1142 |
< |
! write(*,*) PropertyMap(me_i)%is_Shape,PropertyMap(me_j)%is_Shape |
1143 |
< |
|
1010 |
< |
if (FF_uses_Shapes .and. SIM_uses_Shapes) then |
1011 |
< |
if ( PropertyMap(me_i)%is_Shape .and. & |
1012 |
< |
PropertyMap(me_j)%is_Shape ) then |
1013 |
< |
call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1014 |
< |
pot, A, f, t, do_pot) |
1015 |
< |
endif |
1016 |
< |
if ( (PropertyMap(me_i)%is_Shape .and. & |
1017 |
< |
PropertyMap(me_j)%is_LennardJones) .or. & |
1018 |
< |
(PropertyMap(me_i)%is_LennardJones .and. & |
1019 |
< |
PropertyMap(me_j)%is_Shape) ) then |
1020 |
< |
call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1021 |
< |
pot, A, f, t, do_pot) |
1022 |
< |
endif |
1141 |
> |
if ( iand(iHash, SHAPE_PAIR).ne.0 ) then |
1142 |
> |
call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1143 |
> |
pot, A, f, t, do_pot) |
1144 |
|
endif |
1145 |
|
|
1146 |
+ |
if ( iand(iHash, SHAPE_LJ).ne.0 ) then |
1147 |
+ |
call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1148 |
+ |
pot, A, f, t, do_pot) |
1149 |
+ |
endif |
1150 |
+ |
|
1151 |
|
end subroutine do_pair |
1152 |
|
|
1153 |
|
subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, & |
1165 |
|
real ( kind = dp ) :: r, rc |
1166 |
|
real ( kind = dp ), intent(inout) :: d(3), dc(3) |
1167 |
|
|
1168 |
< |
logical :: is_EAM_i, is_EAM_j |
1168 |
> |
integer :: me_i, me_j, iHash |
1169 |
|
|
1044 |
– |
integer :: me_i, me_j |
1045 |
– |
|
1046 |
– |
|
1170 |
|
r = sqrt(rijsq) |
1048 |
– |
if (SIM_uses_molecular_cutoffs) then |
1049 |
– |
rc = sqrt(rcijsq) |
1050 |
– |
else |
1051 |
– |
rc = r |
1052 |
– |
endif |
1171 |
|
|
1054 |
– |
|
1172 |
|
#ifdef IS_MPI |
1173 |
|
me_i = atid_row(i) |
1174 |
|
me_j = atid_col(j) |
1177 |
|
me_j = atid(j) |
1178 |
|
#endif |
1179 |
|
|
1180 |
< |
if (FF_uses_EAM .and. SIM_uses_EAM) then |
1180 |
> |
iHash = InteractionHash(me_i, me_j) |
1181 |
|
|
1182 |
< |
if (PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) & |
1182 |
> |
if ( iand(iHash, EAM_PAIR).ne.0 ) then |
1183 |
|
call calc_EAM_prepair_rho(i, j, d, r, rijsq ) |
1067 |
– |
|
1184 |
|
endif |
1185 |
< |
|
1185 |
> |
|
1186 |
|
end subroutine do_prepair |
1187 |
|
|
1188 |
|
|
1376 |
|
|
1377 |
|
function FF_UsesDirectionalAtoms() result(doesit) |
1378 |
|
logical :: doesit |
1379 |
< |
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 |
1379 |
> |
doesit = FF_uses_DirectionalAtoms |
1380 |
|
end function FF_UsesDirectionalAtoms |
1381 |
|
|
1382 |
|
function FF_RequiresPrepairCalc() result(doesit) |
1387 |
|
function FF_RequiresPostpairCalc() result(doesit) |
1388 |
|
logical :: doesit |
1389 |
|
doesit = FF_uses_RF |
1390 |
+ |
if (corrMethod == 3) doesit = .true. |
1391 |
|
end function FF_RequiresPostpairCalc |
1392 |
|
|
1393 |
|
#ifdef PROFILE |