45 |
|
|
46 |
|
!! @author Charles F. Vardeman II |
47 |
|
!! @author Matthew Meineke |
48 |
< |
!! @version $Id: doForces.F90,v 1.17 2005-05-17 22:35:01 chrisfen Exp $, $Date: 2005-05-17 22:35:01 $, $Name: not supported by cvs2svn $, $Revision: 1.17 $ |
48 |
> |
!! @version $Id: doForces.F90,v 1.47 2005-09-19 23:21:46 chrisfen Exp $, $Date: 2005-09-19 23:21:46 $, $Name: not supported by cvs2svn $, $Revision: 1.47 $ |
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/DarkSide/fInteractionMap.h" |
78 |
+ |
#include "UseTheForce/DarkSide/fElectrostaticSummationMethod.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 |
98 |
– |
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 |
112 |
– |
logical, save :: SIM_uses_RF |
98 |
|
logical, save :: SIM_requires_postpair_calc |
99 |
|
logical, save :: SIM_requires_prepair_calc |
100 |
|
logical, save :: SIM_uses_PBC |
116 |
– |
logical, save :: SIM_uses_molecular_cutoffs |
101 |
|
|
102 |
< |
real(kind=dp), save :: rlist, rlistsq |
102 |
> |
integer, save :: electrostaticSummationMethod |
103 |
|
|
104 |
|
public :: init_FF |
105 |
+ |
public :: setDefaultCutoffs |
106 |
|
public :: do_force_loop |
107 |
< |
public :: setRlistDF |
107 |
> |
public :: createInteractionHash |
108 |
> |
public :: createGtypeCutoffMap |
109 |
> |
public :: getStickyCut |
110 |
> |
public :: getStickyPowerCut |
111 |
> |
public :: getGayBerneCut |
112 |
> |
public :: getEAMCut |
113 |
> |
public :: getShapeCut |
114 |
|
|
115 |
|
#ifdef PROFILE |
116 |
|
public :: getforcetime |
118 |
|
real :: forceTimeInitial, forceTimeFinal |
119 |
|
integer :: nLoops |
120 |
|
#endif |
121 |
+ |
|
122 |
+ |
!! Variables for cutoff mapping and interaction mapping |
123 |
+ |
! Bit hash to determine pair-pair interactions. |
124 |
+ |
integer, dimension(:,:), allocatable :: InteractionHash |
125 |
+ |
real(kind=dp), dimension(:), allocatable :: atypeMaxCutoff |
126 |
+ |
real(kind=dp), dimension(:), allocatable :: groupMaxCutoff |
127 |
+ |
integer, dimension(:), allocatable :: groupToGtype |
128 |
+ |
real(kind=dp), dimension(:), allocatable :: gtypeMaxCutoff |
129 |
+ |
type ::gtypeCutoffs |
130 |
+ |
real(kind=dp) :: rcut |
131 |
+ |
real(kind=dp) :: rcutsq |
132 |
+ |
real(kind=dp) :: rlistsq |
133 |
+ |
end type gtypeCutoffs |
134 |
+ |
type(gtypeCutoffs), dimension(:,:), allocatable :: gtypeCutoffMap |
135 |
|
|
136 |
< |
type :: Properties |
137 |
< |
logical :: is_Directional = .false. |
138 |
< |
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 |
< |
|
136 |
> |
integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY |
137 |
> |
real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist |
138 |
> |
|
139 |
|
contains |
140 |
|
|
141 |
< |
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) |
141 |
> |
subroutine createInteractionHash(status) |
142 |
|
integer :: nAtypes |
143 |
< |
integer :: status |
143 |
> |
integer, intent(out) :: status |
144 |
|
integer :: i |
145 |
< |
logical :: thisProperty |
146 |
< |
real (kind=DP) :: thisDPproperty |
145 |
> |
integer :: j |
146 |
> |
integer :: iHash |
147 |
> |
!! Test Types |
148 |
> |
logical :: i_is_LJ |
149 |
> |
logical :: i_is_Elect |
150 |
> |
logical :: i_is_Sticky |
151 |
> |
logical :: i_is_StickyP |
152 |
> |
logical :: i_is_GB |
153 |
> |
logical :: i_is_EAM |
154 |
> |
logical :: i_is_Shape |
155 |
> |
logical :: j_is_LJ |
156 |
> |
logical :: j_is_Elect |
157 |
> |
logical :: j_is_Sticky |
158 |
> |
logical :: j_is_StickyP |
159 |
> |
logical :: j_is_GB |
160 |
> |
logical :: j_is_EAM |
161 |
> |
logical :: j_is_Shape |
162 |
> |
real(kind=dp) :: myRcut |
163 |
|
|
164 |
< |
status = 0 |
164 |
> |
status = 0 |
165 |
|
|
166 |
+ |
if (.not. associated(atypes)) then |
167 |
+ |
call handleError("atype", "atypes was not present before call of createInteractionHash!") |
168 |
+ |
status = -1 |
169 |
+ |
return |
170 |
+ |
endif |
171 |
+ |
|
172 |
|
nAtypes = getSize(atypes) |
173 |
< |
|
173 |
> |
|
174 |
|
if (nAtypes == 0) then |
175 |
|
status = -1 |
176 |
|
return |
177 |
|
end if |
178 |
|
|
179 |
< |
if (.not. allocated(PropertyMap)) then |
180 |
< |
allocate(PropertyMap(nAtypes)) |
179 |
> |
if (.not. allocated(InteractionHash)) then |
180 |
> |
allocate(InteractionHash(nAtypes,nAtypes)) |
181 |
|
endif |
182 |
|
|
183 |
+ |
if (.not. allocated(atypeMaxCutoff)) then |
184 |
+ |
allocate(atypeMaxCutoff(nAtypes)) |
185 |
+ |
endif |
186 |
+ |
|
187 |
|
do i = 1, nAtypes |
188 |
< |
call getElementProperty(atypes, i, "is_Directional", thisProperty) |
189 |
< |
PropertyMap(i)%is_Directional = thisProperty |
188 |
> |
call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ) |
189 |
> |
call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect) |
190 |
> |
call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky) |
191 |
> |
call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP) |
192 |
> |
call getElementProperty(atypes, i, "is_GayBerne", i_is_GB) |
193 |
> |
call getElementProperty(atypes, i, "is_EAM", i_is_EAM) |
194 |
> |
call getElementProperty(atypes, i, "is_Shape", i_is_Shape) |
195 |
|
|
196 |
< |
call getElementProperty(atypes, i, "is_LennardJones", thisProperty) |
186 |
< |
PropertyMap(i)%is_LennardJones = thisProperty |
196 |
> |
do j = i, nAtypes |
197 |
|
|
198 |
< |
call getElementProperty(atypes, i, "is_Electrostatic", thisProperty) |
199 |
< |
PropertyMap(i)%is_Electrostatic = thisProperty |
198 |
> |
iHash = 0 |
199 |
> |
myRcut = 0.0_dp |
200 |
|
|
201 |
< |
call getElementProperty(atypes, i, "is_Charge", thisProperty) |
202 |
< |
PropertyMap(i)%is_Charge = thisProperty |
201 |
> |
call getElementProperty(atypes, j, "is_LennardJones", j_is_LJ) |
202 |
> |
call getElementProperty(atypes, j, "is_Electrostatic", j_is_Elect) |
203 |
> |
call getElementProperty(atypes, j, "is_Sticky", j_is_Sticky) |
204 |
> |
call getElementProperty(atypes, j, "is_StickyPower", j_is_StickyP) |
205 |
> |
call getElementProperty(atypes, j, "is_GayBerne", j_is_GB) |
206 |
> |
call getElementProperty(atypes, j, "is_EAM", j_is_EAM) |
207 |
> |
call getElementProperty(atypes, j, "is_Shape", j_is_Shape) |
208 |
|
|
209 |
< |
call getElementProperty(atypes, i, "is_Dipole", thisProperty) |
210 |
< |
PropertyMap(i)%is_Dipole = thisProperty |
209 |
> |
if (i_is_LJ .and. j_is_LJ) then |
210 |
> |
iHash = ior(iHash, LJ_PAIR) |
211 |
> |
endif |
212 |
> |
|
213 |
> |
if (i_is_Elect .and. j_is_Elect) then |
214 |
> |
iHash = ior(iHash, ELECTROSTATIC_PAIR) |
215 |
> |
endif |
216 |
> |
|
217 |
> |
if (i_is_Sticky .and. j_is_Sticky) then |
218 |
> |
iHash = ior(iHash, STICKY_PAIR) |
219 |
> |
endif |
220 |
|
|
221 |
< |
call getElementProperty(atypes, i, "is_Quadrupole", thisProperty) |
222 |
< |
PropertyMap(i)%is_Quadrupole = thisProperty |
223 |
< |
|
200 |
< |
call getElementProperty(atypes, i, "is_Sticky", thisProperty) |
201 |
< |
PropertyMap(i)%is_Sticky = thisProperty |
202 |
< |
|
203 |
< |
call getElementProperty(atypes, i, "is_StickyPower", thisProperty) |
204 |
< |
PropertyMap(i)%is_StickyPower = thisProperty |
221 |
> |
if (i_is_StickyP .and. j_is_StickyP) then |
222 |
> |
iHash = ior(iHash, STICKYPOWER_PAIR) |
223 |
> |
endif |
224 |
|
|
225 |
< |
call getElementProperty(atypes, i, "is_GayBerne", thisProperty) |
226 |
< |
PropertyMap(i)%is_GayBerne = thisProperty |
225 |
> |
if (i_is_EAM .and. j_is_EAM) then |
226 |
> |
iHash = ior(iHash, EAM_PAIR) |
227 |
> |
endif |
228 |
|
|
229 |
< |
call getElementProperty(atypes, i, "is_EAM", thisProperty) |
230 |
< |
PropertyMap(i)%is_EAM = thisProperty |
229 |
> |
if (i_is_GB .and. j_is_GB) iHash = ior(iHash, GAYBERNE_PAIR) |
230 |
> |
if (i_is_GB .and. j_is_LJ) iHash = ior(iHash, GAYBERNE_LJ) |
231 |
> |
if (i_is_LJ .and. j_is_GB) iHash = ior(iHash, GAYBERNE_LJ) |
232 |
|
|
233 |
< |
call getElementProperty(atypes, i, "is_Shape", thisProperty) |
234 |
< |
PropertyMap(i)%is_Shape = thisProperty |
233 |
> |
if (i_is_Shape .and. j_is_Shape) iHash = ior(iHash, SHAPE_PAIR) |
234 |
> |
if (i_is_Shape .and. j_is_LJ) iHash = ior(iHash, SHAPE_LJ) |
235 |
> |
if (i_is_LJ .and. j_is_Shape) iHash = ior(iHash, SHAPE_LJ) |
236 |
|
|
237 |
< |
call getElementProperty(atypes, i, "is_FLARB", thisProperty) |
238 |
< |
PropertyMap(i)%is_FLARB = thisProperty |
237 |
> |
|
238 |
> |
InteractionHash(i,j) = iHash |
239 |
> |
InteractionHash(j,i) = iHash |
240 |
> |
|
241 |
> |
end do |
242 |
> |
|
243 |
|
end do |
244 |
|
|
245 |
< |
havePropertyMap = .true. |
245 |
> |
haveInteractionHash = .true. |
246 |
> |
end subroutine createInteractionHash |
247 |
|
|
248 |
< |
end subroutine createPropertyMap |
248 |
> |
subroutine createGtypeCutoffMap(stat) |
249 |
> |
|
250 |
> |
integer, intent(out), optional :: stat |
251 |
> |
logical :: i_is_LJ |
252 |
> |
logical :: i_is_Elect |
253 |
> |
logical :: i_is_Sticky |
254 |
> |
logical :: i_is_StickyP |
255 |
> |
logical :: i_is_GB |
256 |
> |
logical :: i_is_EAM |
257 |
> |
logical :: i_is_Shape |
258 |
> |
logical :: GtypeFound |
259 |
> |
|
260 |
> |
integer :: myStatus, nAtypes, i, j, istart, iend, jstart, jend |
261 |
> |
integer :: n_in_i, me_i, ia, g, atom1, nGroupTypes |
262 |
> |
integer :: nGroupsInRow |
263 |
> |
real(kind=dp):: thisSigma, bigSigma, thisRcut, tol, skin |
264 |
> |
real(kind=dp) :: biggestAtypeCutoff |
265 |
> |
|
266 |
> |
stat = 0 |
267 |
> |
if (.not. haveInteractionHash) then |
268 |
> |
call createInteractionHash(myStatus) |
269 |
> |
if (myStatus .ne. 0) then |
270 |
> |
write(default_error, *) 'createInteractionHash failed in doForces!' |
271 |
> |
stat = -1 |
272 |
> |
return |
273 |
> |
endif |
274 |
> |
endif |
275 |
> |
#ifdef IS_MPI |
276 |
> |
nGroupsInRow = getNgroupsInRow(plan_group_row) |
277 |
> |
#endif |
278 |
> |
nAtypes = getSize(atypes) |
279 |
> |
! Set all of the initial cutoffs to zero. |
280 |
> |
atypeMaxCutoff = 0.0_dp |
281 |
> |
do i = 1, nAtypes |
282 |
> |
if (SimHasAtype(i)) then |
283 |
> |
call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ) |
284 |
> |
call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect) |
285 |
> |
call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky) |
286 |
> |
call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP) |
287 |
> |
call getElementProperty(atypes, i, "is_GayBerne", i_is_GB) |
288 |
> |
call getElementProperty(atypes, i, "is_EAM", i_is_EAM) |
289 |
> |
call getElementProperty(atypes, i, "is_Shape", i_is_Shape) |
290 |
> |
|
291 |
> |
|
292 |
> |
if (i_is_LJ) then |
293 |
> |
thisRcut = getSigma(i) * 2.5_dp |
294 |
> |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
295 |
> |
endif |
296 |
> |
if (i_is_Elect) then |
297 |
> |
thisRcut = defaultRcut |
298 |
> |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
299 |
> |
endif |
300 |
> |
if (i_is_Sticky) then |
301 |
> |
thisRcut = getStickyCut(i) |
302 |
> |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
303 |
> |
endif |
304 |
> |
if (i_is_StickyP) then |
305 |
> |
thisRcut = getStickyPowerCut(i) |
306 |
> |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
307 |
> |
endif |
308 |
> |
if (i_is_GB) then |
309 |
> |
thisRcut = getGayBerneCut(i) |
310 |
> |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
311 |
> |
endif |
312 |
> |
if (i_is_EAM) then |
313 |
> |
thisRcut = getEAMCut(i) |
314 |
> |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
315 |
> |
endif |
316 |
> |
if (i_is_Shape) then |
317 |
> |
thisRcut = getShapeCut(i) |
318 |
> |
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
319 |
> |
endif |
320 |
> |
|
321 |
> |
if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then |
322 |
> |
biggestAtypeCutoff = atypeMaxCutoff(i) |
323 |
> |
endif |
324 |
> |
endif |
325 |
> |
enddo |
326 |
> |
|
327 |
> |
nGroupTypes = 0 |
328 |
> |
|
329 |
> |
istart = 1 |
330 |
> |
#ifdef IS_MPI |
331 |
> |
iend = nGroupsInRow |
332 |
> |
#else |
333 |
> |
iend = nGroups |
334 |
> |
#endif |
335 |
> |
|
336 |
> |
!! allocate the groupToGtype and gtypeMaxCutoff here. |
337 |
> |
if(.not.allocated(groupToGtype)) then |
338 |
> |
allocate(groupToGtype(iend)) |
339 |
> |
allocate(groupMaxCutoff(iend)) |
340 |
> |
allocate(gtypeMaxCutoff(iend)) |
341 |
> |
groupMaxCutoff = 0.0_dp |
342 |
> |
gtypeMaxCutoff = 0.0_dp |
343 |
> |
endif |
344 |
> |
!! first we do a single loop over the cutoff groups to find the |
345 |
> |
!! largest cutoff for any atypes present in this group. We also |
346 |
> |
!! create gtypes at this point. |
347 |
> |
|
348 |
> |
tol = 1.0d-6 |
349 |
> |
|
350 |
> |
do i = istart, iend |
351 |
> |
n_in_i = groupStartRow(i+1) - groupStartRow(i) |
352 |
> |
groupMaxCutoff(i) = 0.0_dp |
353 |
> |
do ia = groupStartRow(i), groupStartRow(i+1)-1 |
354 |
> |
atom1 = groupListRow(ia) |
355 |
> |
#ifdef IS_MPI |
356 |
> |
me_i = atid_row(atom1) |
357 |
> |
#else |
358 |
> |
me_i = atid(atom1) |
359 |
> |
#endif |
360 |
> |
if (atypeMaxCutoff(me_i).gt.groupMaxCutoff(i)) then |
361 |
> |
groupMaxCutoff(i)=atypeMaxCutoff(me_i) |
362 |
> |
endif |
363 |
> |
enddo |
364 |
> |
|
365 |
> |
if (nGroupTypes.eq.0) then |
366 |
> |
nGroupTypes = nGroupTypes + 1 |
367 |
> |
gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i) |
368 |
> |
groupToGtype(i) = nGroupTypes |
369 |
> |
else |
370 |
> |
GtypeFound = .false. |
371 |
> |
do g = 1, nGroupTypes |
372 |
> |
if ( abs(groupMaxCutoff(i) - gtypeMaxCutoff(g)).lt.tol) then |
373 |
> |
groupToGtype(i) = g |
374 |
> |
GtypeFound = .true. |
375 |
> |
endif |
376 |
> |
enddo |
377 |
> |
if (.not.GtypeFound) then |
378 |
> |
nGroupTypes = nGroupTypes + 1 |
379 |
> |
gtypeMaxCutoff(nGroupTypes) = groupMaxCutoff(i) |
380 |
> |
groupToGtype(i) = nGroupTypes |
381 |
> |
endif |
382 |
> |
endif |
383 |
> |
enddo |
384 |
> |
|
385 |
> |
!! allocate the gtypeCutoffMap here. |
386 |
> |
allocate(gtypeCutoffMap(nGroupTypes,nGroupTypes)) |
387 |
> |
!! then we do a double loop over all the group TYPES to find the cutoff |
388 |
> |
!! map between groups of two types |
389 |
> |
|
390 |
> |
do i = 1, nGroupTypes |
391 |
> |
do j = 1, nGroupTypes |
392 |
> |
|
393 |
> |
select case(cutoffPolicy) |
394 |
> |
case(TRADITIONAL_CUTOFF_POLICY) |
395 |
> |
thisRcut = maxval(gtypeMaxCutoff) |
396 |
> |
case(MIX_CUTOFF_POLICY) |
397 |
> |
thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j)) |
398 |
> |
case(MAX_CUTOFF_POLICY) |
399 |
> |
thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j)) |
400 |
> |
case default |
401 |
> |
call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy") |
402 |
> |
return |
403 |
> |
end select |
404 |
> |
gtypeCutoffMap(i,j)%rcut = thisRcut |
405 |
> |
gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut |
406 |
> |
skin = defaultRlist - defaultRcut |
407 |
> |
gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2 |
408 |
|
|
409 |
+ |
enddo |
410 |
+ |
enddo |
411 |
+ |
|
412 |
+ |
haveGtypeCutoffMap = .true. |
413 |
+ |
end subroutine createGtypeCutoffMap |
414 |
+ |
|
415 |
+ |
subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy) |
416 |
+ |
real(kind=dp),intent(in) :: defRcut, defRsw, defRlist |
417 |
+ |
integer, intent(in) :: cutPolicy |
418 |
+ |
|
419 |
+ |
defaultRcut = defRcut |
420 |
+ |
defaultRsw = defRsw |
421 |
+ |
defaultRlist = defRlist |
422 |
+ |
cutoffPolicy = cutPolicy |
423 |
+ |
end subroutine setDefaultCutoffs |
424 |
+ |
|
425 |
+ |
subroutine setCutoffPolicy(cutPolicy) |
426 |
+ |
|
427 |
+ |
integer, intent(in) :: cutPolicy |
428 |
+ |
cutoffPolicy = cutPolicy |
429 |
+ |
call createGtypeCutoffMap() |
430 |
+ |
end subroutine setCutoffPolicy |
431 |
+ |
|
432 |
+ |
|
433 |
|
subroutine setSimVariables() |
434 |
|
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() |
435 |
|
SIM_uses_EAM = SimUsesEAM() |
233 |
– |
SIM_uses_Shapes = SimUsesShapes() |
234 |
– |
SIM_uses_FLARB = SimUsesFLARB() |
235 |
– |
SIM_uses_RF = SimUsesRF() |
436 |
|
SIM_requires_postpair_calc = SimRequiresPostpairCalc() |
437 |
|
SIM_requires_prepair_calc = SimRequiresPrepairCalc() |
438 |
|
SIM_uses_PBC = SimUsesPBC() |
449 |
|
|
450 |
|
error = 0 |
451 |
|
|
452 |
< |
if (.not. havePropertyMap) then |
452 |
> |
if (.not. haveInteractionHash) then |
453 |
> |
myStatus = 0 |
454 |
> |
call createInteractionHash(myStatus) |
455 |
> |
if (myStatus .ne. 0) then |
456 |
> |
write(default_error, *) 'createInteractionHash failed in doForces!' |
457 |
> |
error = -1 |
458 |
> |
return |
459 |
> |
endif |
460 |
> |
endif |
461 |
|
|
462 |
< |
myStatus = 0 |
463 |
< |
|
464 |
< |
call createPropertyMap(myStatus) |
257 |
< |
|
462 |
> |
if (.not. haveGtypeCutoffMap) then |
463 |
> |
myStatus = 0 |
464 |
> |
call createGtypeCutoffMap(myStatus) |
465 |
|
if (myStatus .ne. 0) then |
466 |
< |
write(default_error, *) 'createPropertyMap failed in doForces!' |
466 |
> |
write(default_error, *) 'createGtypeCutoffMap failed in doForces!' |
467 |
|
error = -1 |
468 |
|
return |
469 |
|
endif |
473 |
|
call setSimVariables() |
474 |
|
endif |
475 |
|
|
476 |
< |
if (.not. haveRlist) then |
477 |
< |
write(default_error, *) 'rList has not been set in doForces!' |
478 |
< |
error = -1 |
479 |
< |
return |
480 |
< |
endif |
476 |
> |
! if (.not. haveRlist) then |
477 |
> |
! write(default_error, *) 'rList has not been set in doForces!' |
478 |
> |
! error = -1 |
479 |
> |
! return |
480 |
> |
! endif |
481 |
|
|
482 |
|
if (.not. haveNeighborList) then |
483 |
|
write(default_error, *) 'neighbor list has not been initialized in doForces!' |
502 |
|
end subroutine doReadyCheck |
503 |
|
|
504 |
|
|
505 |
< |
subroutine init_FF(use_RF_c, thisStat) |
505 |
> |
subroutine init_FF(thisESM, thisStat) |
506 |
|
|
507 |
< |
logical, intent(in) :: use_RF_c |
301 |
< |
|
507 |
> |
integer, intent(in) :: thisESM |
508 |
|
integer, intent(out) :: thisStat |
509 |
|
integer :: my_status, nMatches |
510 |
|
integer, pointer :: MatchList(:) => null() |
513 |
|
!! assume things are copacetic, unless they aren't |
514 |
|
thisStat = 0 |
515 |
|
|
516 |
< |
!! Fortran's version of a cast: |
311 |
< |
FF_uses_RF = use_RF_c |
516 |
> |
electrostaticSummationMethod = thisESM |
517 |
|
|
518 |
|
!! init_FF is called *after* all of the atom types have been |
519 |
|
!! defined in atype_module using the new_atype subroutine. |
522 |
|
!! interactions are used by the force field. |
523 |
|
|
524 |
|
FF_uses_DirectionalAtoms = .false. |
320 |
– |
FF_uses_LennardJones = .false. |
321 |
– |
FF_uses_Electrostatics = .false. |
322 |
– |
FF_uses_Charges = .false. |
525 |
|
FF_uses_Dipoles = .false. |
324 |
– |
FF_uses_Sticky = .false. |
325 |
– |
FF_uses_StickyPower = .false. |
526 |
|
FF_uses_GayBerne = .false. |
527 |
|
FF_uses_EAM = .false. |
328 |
– |
FF_uses_Shapes = .false. |
329 |
– |
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 |
|
|
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 |
– |
|
533 |
|
call getMatchingElementList(atypes, "is_Dipole", .true., & |
534 |
|
nMatches, MatchList) |
535 |
< |
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 |
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 |
385 |
< |
FF_uses_GayBerne = .true. |
386 |
< |
FF_uses_DirectionalAtoms = .true. |
387 |
< |
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 |
|
|
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 |
544 |
|
|
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) |
545 |
|
haveSaneForceField = .true. |
546 |
|
|
547 |
< |
!! check to make sure the FF_uses_RF setting makes sense |
547 |
> |
!! check to make sure the reaction field setting makes sense |
548 |
|
|
549 |
< |
if (FF_uses_dipoles) then |
550 |
< |
if (FF_uses_RF) then |
549 |
> |
if (FF_uses_Dipoles) then |
550 |
> |
if (electrostaticSummationMethod == REACTION_FIELD) then |
551 |
|
dielect = getDielect() |
552 |
|
call initialize_rf(dielect) |
553 |
|
endif |
554 |
|
else |
555 |
< |
if (FF_uses_RF) then |
555 |
> |
if (electrostaticSummationMethod == REACTION_FIELD) then |
556 |
|
write(default_error,*) 'Using Reaction Field with no dipoles? Huh?' |
557 |
|
thisStat = -1 |
558 |
|
haveSaneForceField = .false. |
559 |
|
return |
560 |
|
endif |
561 |
|
endif |
421 |
– |
|
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 |
562 |
|
|
563 |
|
if (FF_uses_EAM) then |
564 |
|
call init_EAM_FF(my_status) |
579 |
|
endif |
580 |
|
endif |
581 |
|
|
451 |
– |
if (FF_uses_GayBerne .and. FF_uses_LennardJones) then |
452 |
– |
endif |
453 |
– |
|
582 |
|
if (.not. haveNeighborList) then |
583 |
|
!! Create neighbor lists |
584 |
|
call expandNeighborList(nLocal, my_status) |
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 |
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 |
|
|
970 |
|
|
971 |
|
if (FF_RequiresPostpairCalc() .and. SIM_requires_postpair_calc) then |
972 |
|
|
973 |
< |
if (FF_uses_RF .and. SIM_uses_RF) then |
973 |
> |
if (electrostaticSummationMethod == REACTION_FIELD) then |
974 |
|
|
975 |
|
#ifdef IS_MPI |
976 |
|
call scatter(rf_Row,rf,plan_atom_row_3d) |
988 |
|
#else |
989 |
|
me_i = atid(i) |
990 |
|
#endif |
991 |
+ |
iHash = InteractionHash(me_i,me_j) |
992 |
+ |
|
993 |
+ |
if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then |
994 |
|
|
862 |
– |
if (PropertyMap(me_i)%is_Dipole) then |
863 |
– |
|
995 |
|
mu_i = getDipoleMoment(me_i) |
996 |
|
|
997 |
|
!! The reaction field needs to include a self contribution |
1056 |
|
real ( kind = dp ), intent(inout) :: d(3) |
1057 |
|
integer :: me_i, me_j |
1058 |
|
|
1059 |
+ |
integer :: iHash |
1060 |
+ |
|
1061 |
|
r = sqrt(rijsq) |
1062 |
|
vpair = 0.0d0 |
1063 |
|
fpair(1:3) = 0.0d0 |
1070 |
|
me_j = atid(j) |
1071 |
|
#endif |
1072 |
|
|
1073 |
< |
! write(*,*) i, j, me_i, me_j |
1073 |
> |
iHash = InteractionHash(me_i, me_j) |
1074 |
|
|
1075 |
< |
if (FF_uses_LennardJones .and. SIM_uses_LennardJones) then |
1076 |
< |
|
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 |
< |
|
1075 |
> |
if ( iand(iHash, LJ_PAIR).ne.0 ) then |
1076 |
> |
call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot) |
1077 |
|
endif |
1078 |
|
|
1079 |
< |
if (FF_uses_Electrostatics .and. SIM_uses_Electrostatics) then |
1079 |
> |
if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then |
1080 |
> |
call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1081 |
> |
pot, eFrame, f, t, do_pot) |
1082 |
|
|
1083 |
< |
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 |
1083 |
> |
if (electrostaticSummationMethod == REACTION_FIELD) then |
1084 |
|
|
1085 |
< |
if (FF_uses_dipoles .and. SIM_uses_dipoles) then |
1086 |
< |
if ( PropertyMap(me_i)%is_Dipole .and. & |
1087 |
< |
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 |
1085 |
> |
! CHECK ME (RF needs to know about all electrostatic types) |
1086 |
> |
call accumulate_rf(i, j, r, eFrame, sw) |
1087 |
> |
call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair) |
1088 |
|
endif |
1089 |
+ |
|
1090 |
|
endif |
1091 |
|
|
1092 |
+ |
if ( iand(iHash, STICKY_PAIR).ne.0 ) then |
1093 |
+ |
call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1094 |
+ |
pot, A, f, t, do_pot) |
1095 |
+ |
endif |
1096 |
|
|
1097 |
< |
if (FF_uses_Sticky .and. SIM_uses_sticky) then |
1098 |
< |
|
1099 |
< |
if ( PropertyMap(me_i)%is_Sticky .and. PropertyMap(me_j)%is_Sticky) then |
974 |
< |
call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
975 |
< |
pot, A, f, t, do_pot) |
976 |
< |
endif |
977 |
< |
|
1097 |
> |
if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then |
1098 |
> |
call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1099 |
> |
pot, A, f, t, do_pot) |
1100 |
|
endif |
1101 |
|
|
1102 |
< |
if (FF_uses_StickyPower .and. SIM_uses_stickypower) then |
1103 |
< |
if ( PropertyMap(me_i)%is_StickyPower .and. & |
1104 |
< |
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 |
1102 |
> |
if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then |
1103 |
> |
call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1104 |
> |
pot, A, f, t, do_pot) |
1105 |
|
endif |
1106 |
|
|
1107 |
< |
if (FF_uses_GayBerne .and. SIM_uses_GayBerne) then |
1108 |
< |
|
1109 |
< |
if ( PropertyMap(me_i)%is_GayBerne .and. & |
991 |
< |
PropertyMap(me_j)%is_GayBerne) then |
992 |
< |
call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
993 |
< |
pot, A, f, t, do_pot) |
994 |
< |
endif |
995 |
< |
|
1107 |
> |
if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then |
1108 |
> |
! call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1109 |
> |
! pot, A, f, t, do_pot) |
1110 |
|
endif |
1111 |
|
|
1112 |
< |
if (FF_uses_EAM .and. SIM_uses_EAM) then |
1113 |
< |
|
1114 |
< |
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 |
< |
|
1112 |
> |
if ( iand(iHash, EAM_PAIR).ne.0 ) then |
1113 |
> |
call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, & |
1114 |
> |
do_pot) |
1115 |
|
endif |
1116 |
|
|
1117 |
< |
|
1118 |
< |
! write(*,*) PropertyMap(me_i)%is_Shape,PropertyMap(me_j)%is_Shape |
1119 |
< |
|
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 |
1117 |
> |
if ( iand(iHash, SHAPE_PAIR).ne.0 ) then |
1118 |
> |
call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1119 |
> |
pot, A, f, t, do_pot) |
1120 |
|
endif |
1121 |
|
|
1122 |
+ |
if ( iand(iHash, SHAPE_LJ).ne.0 ) then |
1123 |
+ |
call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1124 |
+ |
pot, A, f, t, do_pot) |
1125 |
+ |
endif |
1126 |
+ |
|
1127 |
|
end subroutine do_pair |
1128 |
|
|
1129 |
|
subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, & |
1141 |
|
real ( kind = dp ) :: r, rc |
1142 |
|
real ( kind = dp ), intent(inout) :: d(3), dc(3) |
1143 |
|
|
1144 |
< |
logical :: is_EAM_i, is_EAM_j |
1144 |
> |
integer :: me_i, me_j, iHash |
1145 |
|
|
1044 |
– |
integer :: me_i, me_j |
1045 |
– |
|
1046 |
– |
|
1146 |
|
r = sqrt(rijsq) |
1048 |
– |
if (SIM_uses_molecular_cutoffs) then |
1049 |
– |
rc = sqrt(rcijsq) |
1050 |
– |
else |
1051 |
– |
rc = r |
1052 |
– |
endif |
1147 |
|
|
1054 |
– |
|
1148 |
|
#ifdef IS_MPI |
1149 |
|
me_i = atid_row(i) |
1150 |
|
me_j = atid_col(j) |
1153 |
|
me_j = atid(j) |
1154 |
|
#endif |
1155 |
|
|
1156 |
< |
if (FF_uses_EAM .and. SIM_uses_EAM) then |
1156 |
> |
iHash = InteractionHash(me_i, me_j) |
1157 |
|
|
1158 |
< |
if (PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) & |
1158 |
> |
if ( iand(iHash, EAM_PAIR).ne.0 ) then |
1159 |
|
call calc_EAM_prepair_rho(i, j, d, r, rijsq ) |
1067 |
– |
|
1160 |
|
endif |
1161 |
< |
|
1161 |
> |
|
1162 |
|
end subroutine do_prepair |
1163 |
|
|
1164 |
|
|
1352 |
|
|
1353 |
|
function FF_UsesDirectionalAtoms() result(doesit) |
1354 |
|
logical :: doesit |
1355 |
< |
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 |
1355 |
> |
doesit = FF_uses_DirectionalAtoms |
1356 |
|
end function FF_UsesDirectionalAtoms |
1357 |
|
|
1358 |
|
function FF_RequiresPrepairCalc() result(doesit) |
1362 |
|
|
1363 |
|
function FF_RequiresPostpairCalc() result(doesit) |
1364 |
|
logical :: doesit |
1365 |
< |
doesit = FF_uses_RF |
1365 |
> |
if (electrostaticSummationMethod == REACTION_FIELD) doesit = .true. |
1366 |
|
end function FF_RequiresPostpairCalc |
1367 |
|
|
1368 |
|
#ifdef PROFILE |