ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/group/trunk/OOPSE-3.0/src/UseTheForce/doForces.F90

Comparing trunk/OOPSE-3.0/src/UseTheForce/doForces.F90 (file contents):
Revision 2085 by gezelter, Tue Mar 8 21:05:46 2005 UTC vs.
Revision 2356 by chuckv, Wed Oct 12 19:55:26 2005 UTC

#	Line 45 | Line 45
45
46		!! @author Charles F. Vardeman II
47		!! @author Matthew Meineke
48	<	!! @version $Id: doForces.F90,v 1.11 2005-03-08 21:05:46 gezelter Exp $, $Date: 2005-03-08 21:05:46 $, $Name: not supported by cvs2svn $, $Revision: 1.11 $
48	>	!! @version $Id: doForces.F90,v 1.55 2005-10-12 19:55:26 chuckv Exp $, $Date: 2005-10-12 19:55:26 $, $Name: not supported by cvs2svn $, $Revision: 1.55 $
49
50
51		module doForces
#	Line 58 | Line 58 | 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
#	Line 73 | Line 73 | module doForces
73
74		#define __FORTRAN90
75		#include "UseTheForce/fSwitchingFunction.h"
76	+	#include "UseTheForce/fCutoffPolicy.h"
77	+	#include "UseTheForce/DarkSide/fInteractionMap.h"
78	+	#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	<
87	>	logical, save :: haveInteractionHash = .false.
88	>	logical, save :: haveGtypeCutoffMap = .false.
89	>	logical, save :: haveDefaultCutoffs = .false.
90	>	logical, save :: haveRlist = .false.
91	>
92		logical, save :: FF_uses_DirectionalAtoms
87	–	logical, save :: FF_uses_LennardJones
88	–	logical, save :: FF_uses_Electrostatics
89	–	logical, save :: FF_uses_Charges
93		logical, save :: FF_uses_Dipoles
91	–	logical, save :: FF_uses_Quadrupoles
92	–	logical, save :: FF_uses_sticky
94		logical, save :: FF_uses_GayBerne
95		logical, save :: FF_uses_EAM
95	–	logical, save :: FF_uses_Shapes
96	–	logical, save :: FF_uses_FLARB
97	–	logical, save :: FF_uses_RF
96
97		logical, save :: SIM_uses_DirectionalAtoms
100	–	logical, save :: SIM_uses_LennardJones
101	–	logical, save :: SIM_uses_Electrostatics
102	–	logical, save :: SIM_uses_Charges
103	–	logical, save :: SIM_uses_Dipoles
104	–	logical, save :: SIM_uses_Quadrupoles
105	–	logical, save :: SIM_uses_Sticky
106	–	logical, save :: SIM_uses_GayBerne
98		logical, save :: SIM_uses_EAM
108	–	logical, save :: SIM_uses_Shapes
109	–	logical, save :: SIM_uses_FLARB
110	–	logical, save :: SIM_uses_RF
99		logical, save :: SIM_requires_postpair_calc
100		logical, save :: SIM_requires_prepair_calc
101		logical, save :: SIM_uses_PBC
114	–	logical, save :: SIM_uses_molecular_cutoffs
102
103	<	real(kind=dp), save :: rlist, rlistsq
103	>	integer, save :: electrostaticSummationMethod
104
105		public :: init_FF
106	+	public :: setDefaultCutoffs
107		public :: do_force_loop
108	<	public :: setRlistDF
108	>	public :: createInteractionHash
109	>	public :: createGtypeCutoffMap
110	>	public :: getStickyCut
111	>	public :: getStickyPowerCut
112	>	public :: getGayBerneCut
113	>	public :: getEAMCut
114	>	public :: getShapeCut
115
116		#ifdef PROFILE
117		public :: getforcetime
#	Line 125 | Line 119 | module doForces
119		real :: forceTimeInitial, forceTimeFinal
120		integer :: nLoops
121		#endif
122	+
123	+	!! Variables for cutoff mapping and interaction mapping
124	+	! Bit hash to determine pair-pair interactions.
125	+	integer, dimension(:,:), allocatable :: InteractionHash
126	+	real(kind=dp), dimension(:), allocatable :: atypeMaxCutoff
127	+	real(kind=dp), dimension(:), allocatable, target :: groupMaxCutoffRow
128	+	real(kind=dp), dimension(:), pointer :: groupMaxCutoffCol
129
130	<	type :: Properties
131	<	logical :: is_Directional   = .false.
131	<	logical :: is_LennardJones  = .false.
132	<	logical :: is_Electrostatic = .false.
133	<	logical :: is_Charge        = .false.
134	<	logical :: is_Dipole        = .false.
135	<	logical :: is_Quadrupole    = .false.
136	<	logical :: is_Sticky        = .false.
137	<	logical :: is_GayBerne      = .false.
138	<	logical :: is_EAM           = .false.
139	<	logical :: is_Shape         = .false.
140	<	logical :: is_FLARB         = .false.
141	<	end type Properties
130	>	integer, dimension(:), allocatable, target :: groupToGtypeRow
131	>	integer, dimension(:), pointer :: groupToGtypeCol => null()
132
133	<	type(Properties), dimension(:),allocatable :: PropertyMap
133	>	real(kind=dp), dimension(:), allocatable,target :: gtypeMaxCutoffRow
134	>	real(kind=dp), dimension(:), pointer :: gtypeMaxCutoffCol
135	>	type ::gtypeCutoffs
136	>	real(kind=dp) :: rcut
137	>	real(kind=dp) :: rcutsq
138	>	real(kind=dp) :: rlistsq
139	>	end type gtypeCutoffs
140	>	type(gtypeCutoffs), dimension(:,:), allocatable :: gtypeCutoffMap
141
142	+	integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY
143	+	real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist
144	+	real(kind=dp),save :: listSkin
145	+
146		contains
147
148	<	subroutine setRlistDF( this_rlist )
148	<
149	<	real(kind=dp) :: this_rlist
150	<
151	<	rlist = this_rlist
152	<	rlistsq = rlist * rlist
153	<
154	<	haveRlist = .true.
155	<
156	<	end subroutine setRlistDF
157	<
158	<	subroutine createPropertyMap(status)
148	>	subroutine createInteractionHash(status)
149		integer :: nAtypes
150	<	integer :: status
150	>	integer, intent(out) :: status
151		integer :: i
152	<	logical :: thisProperty
153	<	real (kind=DP) :: thisDPproperty
152	>	integer :: j
153	>	integer :: iHash
154	>	!! Test Types
155	>	logical :: i_is_LJ
156	>	logical :: i_is_Elect
157	>	logical :: i_is_Sticky
158	>	logical :: i_is_StickyP
159	>	logical :: i_is_GB
160	>	logical :: i_is_EAM
161	>	logical :: i_is_Shape
162	>	logical :: j_is_LJ
163	>	logical :: j_is_Elect
164	>	logical :: j_is_Sticky
165	>	logical :: j_is_StickyP
166	>	logical :: j_is_GB
167	>	logical :: j_is_EAM
168	>	logical :: j_is_Shape
169	>	real(kind=dp) :: myRcut
170
171	<	status = 0
171	>	status = 0
172
173	+	if (.not. associated(atypes)) then
174	+	call handleError("atype", "atypes was not present before call of createInteractionHash!")
175	+	status = -1
176	+	return
177	+	endif
178	+
179		nAtypes = getSize(atypes)
180	<
180	>
181		if (nAtypes == 0) then
182		status = -1
183		return
184		end if
185	<
186	<	if (.not. allocated(PropertyMap)) then
187	<	allocate(PropertyMap(nAtypes))
185	>
186	>	if (.not. allocated(InteractionHash)) then
187	>	allocate(InteractionHash(nAtypes,nAtypes))
188	>	else
189	>	deallocate(InteractionHash)
190	>	allocate(InteractionHash(nAtypes,nAtypes))
191		endif
192
193	+	if (.not. allocated(atypeMaxCutoff)) then
194	+	allocate(atypeMaxCutoff(nAtypes))
195	+	else
196	+	deallocate(atypeMaxCutoff)
197	+	allocate(atypeMaxCutoff(nAtypes))
198	+	endif
199	+
200		do i = 1, nAtypes
201	<	call getElementProperty(atypes, i, "is_Directional", thisProperty)
202	<	PropertyMap(i)%is_Directional = thisProperty
201	>	call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
202	>	call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
203	>	call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
204	>	call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
205	>	call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
206	>	call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
207	>	call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
208
209	<	call getElementProperty(atypes, i, "is_LennardJones", thisProperty)
183	<	PropertyMap(i)%is_LennardJones = thisProperty
184	<
185	<	call getElementProperty(atypes, i, "is_Electrostatic", thisProperty)
186	<	PropertyMap(i)%is_Electrostatic = thisProperty
209	>	do j = i, nAtypes
210
211	<	call getElementProperty(atypes, i, "is_Charge", thisProperty)
212	<	PropertyMap(i)%is_Charge = thisProperty
190	<
191	<	call getElementProperty(atypes, i, "is_Dipole", thisProperty)
192	<	PropertyMap(i)%is_Dipole = thisProperty
211	>	iHash = 0
212	>	myRcut = 0.0_dp
213
214	<	call getElementProperty(atypes, i, "is_Quadrupole", thisProperty)
215	<	PropertyMap(i)%is_Quadrupole = thisProperty
214	>	call getElementProperty(atypes, j, "is_LennardJones", j_is_LJ)
215	>	call getElementProperty(atypes, j, "is_Electrostatic", j_is_Elect)
216	>	call getElementProperty(atypes, j, "is_Sticky", j_is_Sticky)
217	>	call getElementProperty(atypes, j, "is_StickyPower", j_is_StickyP)
218	>	call getElementProperty(atypes, j, "is_GayBerne", j_is_GB)
219	>	call getElementProperty(atypes, j, "is_EAM", j_is_EAM)
220	>	call getElementProperty(atypes, j, "is_Shape", j_is_Shape)
221
222	<	call getElementProperty(atypes, i, "is_Sticky", thisProperty)
223	<	PropertyMap(i)%is_Sticky = thisProperty
222	>	if (i_is_LJ .and. j_is_LJ) then
223	>	iHash = ior(iHash, LJ_PAIR)
224	>	endif
225	>
226	>	if (i_is_Elect .and. j_is_Elect) then
227	>	iHash = ior(iHash, ELECTROSTATIC_PAIR)
228	>	endif
229	>
230	>	if (i_is_Sticky .and. j_is_Sticky) then
231	>	iHash = ior(iHash, STICKY_PAIR)
232	>	endif
233
234	<	call getElementProperty(atypes, i, "is_GayBerne", thisProperty)
235	<	PropertyMap(i)%is_GayBerne = thisProperty
234	>	if (i_is_StickyP .and. j_is_StickyP) then
235	>	iHash = ior(iHash, STICKYPOWER_PAIR)
236	>	endif
237
238	<	call getElementProperty(atypes, i, "is_EAM", thisProperty)
239	<	PropertyMap(i)%is_EAM = thisProperty
238	>	if (i_is_EAM .and. j_is_EAM) then
239	>	iHash = ior(iHash, EAM_PAIR)
240	>	endif
241
242	<	call getElementProperty(atypes, i, "is_Shape", thisProperty)
243	<	PropertyMap(i)%is_Shape = thisProperty
242	>	if (i_is_GB .and. j_is_GB) iHash = ior(iHash, GAYBERNE_PAIR)
243	>	if (i_is_GB .and. j_is_LJ) iHash = ior(iHash, GAYBERNE_LJ)
244	>	if (i_is_LJ .and. j_is_GB) iHash = ior(iHash, GAYBERNE_LJ)
245
246	<	call getElementProperty(atypes, i, "is_FLARB", thisProperty)
247	<	PropertyMap(i)%is_FLARB = thisProperty
246	>	if (i_is_Shape .and. j_is_Shape) iHash = ior(iHash, SHAPE_PAIR)
247	>	if (i_is_Shape .and. j_is_LJ) iHash = ior(iHash, SHAPE_LJ)
248	>	if (i_is_LJ .and. j_is_Shape) iHash = ior(iHash, SHAPE_LJ)
249	>
250	>
251	>	InteractionHash(i,j) = iHash
252	>	InteractionHash(j,i) = iHash
253	>
254	>	end do
255	>
256		end do
257
258	<	havePropertyMap = .true.
258	>	haveInteractionHash = .true.
259	>	end subroutine createInteractionHash
260
261	<	end subroutine createPropertyMap
261	>	subroutine createGtypeCutoffMap(stat)
262
263	+	integer, intent(out), optional :: stat
264	+	logical :: i_is_LJ
265	+	logical :: i_is_Elect
266	+	logical :: i_is_Sticky
267	+	logical :: i_is_StickyP
268	+	logical :: i_is_GB
269	+	logical :: i_is_EAM
270	+	logical :: i_is_Shape
271	+	logical :: GtypeFound
272	+
273	+	integer :: myStatus, nAtypes,  i, j, istart, iend, jstart, jend
274	+	integer :: n_in_i, me_i, ia, g, atom1, ja, n_in_j,me_j
275	+	integer :: nGroupsInRow
276	+	integer :: nGroupsInCol
277	+	integer :: nGroupTypesRow,nGroupTypesCol
278	+	real(kind=dp):: thisSigma, bigSigma, thisRcut, tradRcut, tol, skin
279	+	real(kind=dp) :: biggestAtypeCutoff
280	+
281	+	stat = 0
282	+	if (.not. haveInteractionHash) then
283	+	call createInteractionHash(myStatus)
284	+	if (myStatus .ne. 0) then
285	+	write(default_error, *) 'createInteractionHash failed in doForces!'
286	+	stat = -1
287	+	return
288	+	endif
289	+	endif
290	+	#ifdef IS_MPI
291	+	nGroupsInRow = getNgroupsInRow(plan_group_row)
292	+	nGroupsInCol = getNgroupsInCol(plan_group_col)
293	+	#endif
294	+	nAtypes = getSize(atypes)
295	+	! Set all of the initial cutoffs to zero.
296	+	atypeMaxCutoff = 0.0_dp
297	+	do i = 1, nAtypes
298	+	if (SimHasAtype(i)) then
299	+	call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
300	+	call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
301	+	call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
302	+	call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
303	+	call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
304	+	call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
305	+	call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
306	+
307	+
308	+	if (haveDefaultCutoffs) then
309	+	atypeMaxCutoff(i) = defaultRcut
310	+	else
311	+	if (i_is_LJ) then
312	+	thisRcut = getSigma(i) * 2.5_dp
313	+	if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
314	+	endif
315	+	if (i_is_Elect) then
316	+	thisRcut = defaultRcut
317	+	if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
318	+	endif
319	+	if (i_is_Sticky) then
320	+	thisRcut = getStickyCut(i)
321	+	if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
322	+	endif
323	+	if (i_is_StickyP) then
324	+	thisRcut = getStickyPowerCut(i)
325	+	if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
326	+	endif
327	+	if (i_is_GB) then
328	+	thisRcut = getGayBerneCut(i)
329	+	if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
330	+	endif
331	+	if (i_is_EAM) then
332	+	thisRcut = getEAMCut(i)
333	+	if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
334	+	endif
335	+	if (i_is_Shape) then
336	+	thisRcut = getShapeCut(i)
337	+	if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
338	+	endif
339	+	endif
340	+
341	+
342	+	if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
343	+	biggestAtypeCutoff = atypeMaxCutoff(i)
344	+	endif
345	+
346	+	endif
347	+	enddo
348	+
349	+
350	+
351	+	istart = 1
352	+	jstart = 1
353	+	#ifdef IS_MPI
354	+	iend = nGroupsInRow
355	+	jend = nGroupsInCol
356	+	#else
357	+	iend = nGroups
358	+	jend = nGroups
359	+	#endif
360	+
361	+	!! allocate the groupToGtype and gtypeMaxCutoff here.
362	+	if(.not.allocated(groupToGtypeRow)) then
363	+	!  allocate(groupToGtype(iend))
364	+	allocate(groupToGtypeRow(iend))
365	+	else
366	+	deallocate(groupToGtypeRow)
367	+	allocate(groupToGtypeRow(iend))
368	+	endif
369	+	if(.not.allocated(groupMaxCutoffRow)) then
370	+	allocate(groupMaxCutoffRow(iend))
371	+	else
372	+	deallocate(groupMaxCutoffRow)
373	+	allocate(groupMaxCutoffRow(iend))
374	+	end if
375	+
376	+	if(.not.allocated(gtypeMaxCutoffRow)) then
377	+	allocate(gtypeMaxCutoffRow(iend))
378	+	else
379	+	deallocate(gtypeMaxCutoffRow)
380	+	allocate(gtypeMaxCutoffRow(iend))
381	+	endif
382	+
383	+
384	+	#ifdef IS_MPI
385	+	! We only allocate new storage if we are in MPI because Ncol /= Nrow
386	+	if(.not.associated(groupToGtypeCol)) then
387	+	allocate(groupToGtypeCol(jend))
388	+	else
389	+	deallocate(groupToGtypeCol)
390	+	allocate(groupToGtypeCol(jend))
391	+	end if
392	+
393	+	if(.not.associated(groupToGtypeCol)) then
394	+	allocate(groupToGtypeCol(jend))
395	+	else
396	+	deallocate(groupToGtypeCol)
397	+	allocate(groupToGtypeCol(jend))
398	+	end if
399	+	if(.not.associated(gtypeMaxCutoffCol)) then
400	+	allocate(gtypeMaxCutoffCol(jend))
401	+	else
402	+	deallocate(gtypeMaxCutoffCol)
403	+	allocate(gtypeMaxCutoffCol(jend))
404	+	end if
405	+
406	+	groupMaxCutoffCol = 0.0_dp
407	+	gtypeMaxCutoffCol = 0.0_dp
408	+
409	+	#endif
410	+	groupMaxCutoffRow = 0.0_dp
411	+	gtypeMaxCutoffRow = 0.0_dp
412	+
413	+
414	+	!! first we do a single loop over the cutoff groups to find the
415	+	!! largest cutoff for any atypes present in this group.  We also
416	+	!! create gtypes at this point.
417	+
418	+	tol = 1.0d-6
419	+	nGroupTypesRow = 0
420	+
421	+	do i = istart, iend
422	+	n_in_i = groupStartRow(i+1) - groupStartRow(i)
423	+	groupMaxCutoffRow(i) = 0.0_dp
424	+	do ia = groupStartRow(i), groupStartRow(i+1)-1
425	+	atom1 = groupListRow(ia)
426	+	#ifdef IS_MPI
427	+	me_i = atid_row(atom1)
428	+	#else
429	+	me_i = atid(atom1)
430	+	#endif
431	+	if (atypeMaxCutoff(me_i).gt.groupMaxCutoffRow(i)) then
432	+	groupMaxCutoffRow(i)=atypeMaxCutoff(me_i)
433	+	endif
434	+	enddo
435	+
436	+	if (nGroupTypesRow.eq.0) then
437	+	nGroupTypesRow = nGroupTypesRow + 1
438	+	gtypeMaxCutoffRow(nGroupTypesRow) = groupMaxCutoffRow(i)
439	+	groupToGtypeRow(i) = nGroupTypesRow
440	+	else
441	+	GtypeFound = .false.
442	+	do g = 1, nGroupTypesRow
443	+	if ( abs(groupMaxCutoffRow(i) - gtypeMaxCutoffRow(g)).lt.tol) then
444	+	groupToGtypeRow(i) = g
445	+	GtypeFound = .true.
446	+	endif
447	+	enddo
448	+	if (.not.GtypeFound) then
449	+	nGroupTypesRow = nGroupTypesRow + 1
450	+	gtypeMaxCutoffRow(nGroupTypesRow) = groupMaxCutoffRow(i)
451	+	groupToGtypeRow(i) = nGroupTypesRow
452	+	endif
453	+	endif
454	+	enddo
455	+
456	+	#ifdef IS_MPI
457	+	do j = jstart, jend
458	+	n_in_j = groupStartCol(j+1) - groupStartCol(j)
459	+	groupMaxCutoffCol(j) = 0.0_dp
460	+	do ja = groupStartCol(j), groupStartCol(j+1)-1
461	+	atom1 = groupListCol(ja)
462	+
463	+	me_j = atid_col(atom1)
464	+
465	+	if (atypeMaxCutoff(me_j).gt.groupMaxCutoffCol(j)) then
466	+	groupMaxCutoffCol(j)=atypeMaxCutoff(me_j)
467	+	endif
468	+	enddo
469	+
470	+	if (nGroupTypesCol.eq.0) then
471	+	nGroupTypesCol = nGroupTypesCol + 1
472	+	gtypeMaxCutoffCol(nGroupTypesCol) = groupMaxCutoffCol(j)
473	+	groupToGtypeCol(j) = nGroupTypesCol
474	+	else
475	+	GtypeFound = .false.
476	+	do g = 1, nGroupTypesCol
477	+	if ( abs(groupMaxCutoffCol(j) - gtypeMaxCutoffCol(g)).lt.tol) then
478	+	groupToGtypeCol(j) = g
479	+	GtypeFound = .true.
480	+	endif
481	+	enddo
482	+	if (.not.GtypeFound) then
483	+	nGroupTypesCol = nGroupTypesCol + 1
484	+	gtypeMaxCutoffCol(nGroupTypesCol) = groupMaxCutoffCol(j)
485	+	groupToGtypeCol(j) = nGroupTypesCol
486	+	endif
487	+	endif
488	+	enddo
489	+
490	+	#else
491	+	! Set pointers to information we just found
492	+	nGroupTypesCol = nGroupTypesRow
493	+	groupToGtypeCol => groupToGtypeRow
494	+	gtypeMaxCutoffCol => gtypeMaxCutoffRow
495	+	groupMaxCutoffCol => groupMaxCutoffRow
496	+	#endif
497	+
498	+
499	+
500	+
501	+
502	+	!! allocate the gtypeCutoffMap here.
503	+	allocate(gtypeCutoffMap(nGroupTypesRow,nGroupTypesCol))
504	+	!! then we do a double loop over all the group TYPES to find the cutoff
505	+	!! map between groups of two types
506	+	tradRcut = max(maxval(gtypeMaxCutoffRow),maxval(gtypeMaxCutoffCol))
507	+
508	+	do i = 1, nGroupTypesRow
509	+	do j = 1, nGroupTypesCol
510	+
511	+	select case(cutoffPolicy)
512	+	case(TRADITIONAL_CUTOFF_POLICY)
513	+	thisRcut = tradRcut
514	+	case(MIX_CUTOFF_POLICY)
515	+	thisRcut = 0.5_dp * (gtypeMaxCutoffRow(i) + gtypeMaxCutoffCol(j))
516	+	case(MAX_CUTOFF_POLICY)
517	+	thisRcut = max(gtypeMaxCutoffRow(i), gtypeMaxCutoffCol(j))
518	+	case default
519	+	call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
520	+	return
521	+	end select
522	+	gtypeCutoffMap(i,j)%rcut = thisRcut
523	+	gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
524	+	skin = defaultRlist - defaultRcut
525	+	listSkin = skin ! set neighbor list skin thickness
526	+	gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
527	+
528	+	! sanity check
529	+
530	+	if (haveDefaultCutoffs) then
531	+	if (abs(gtypeCutoffMap(i,j)%rcut - defaultRcut).gt.0.0001) then
532	+	call handleError("createGtypeCutoffMap", "user-specified rCut does not match computed group Cutoff")
533	+	endif
534	+	endif
535	+	enddo
536	+	enddo
537	+	if(allocated(gtypeMaxCutoffRow)) deallocate(gtypeMaxCutoffRow)
538	+	if(allocated(groupMaxCutoffRow)) deallocate(groupMaxCutoffRow)
539	+	if(allocated(atypeMaxCutoff)) deallocate(atypeMaxCutoff)
540	+	#ifdef IS_MPI
541	+	if(associated(groupMaxCutoffCol)) deallocate(groupMaxCutoffCol)
542	+	if(associated(gtypeMaxCutoffCol)) deallocate(gtypeMaxCutoffCol)
543	+	#endif
544	+	groupMaxCutoffCol => null()
545	+	gtypeMaxCutoffCol => null()
546	+
547	+	haveGtypeCutoffMap = .true.
548	+	end subroutine createGtypeCutoffMap
549	+
550	+	subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
551	+	real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
552	+	integer, intent(in) :: cutPolicy
553	+
554	+	defaultRcut = defRcut
555	+	defaultRsw = defRsw
556	+	defaultRlist = defRlist
557	+	cutoffPolicy = cutPolicy
558	+
559	+	haveDefaultCutoffs = .true.
560	+	end subroutine setDefaultCutoffs
561	+
562	+	subroutine setCutoffPolicy(cutPolicy)
563	+
564	+	integer, intent(in) :: cutPolicy
565	+	cutoffPolicy = cutPolicy
566	+	call createGtypeCutoffMap()
567	+	end subroutine setCutoffPolicy
568	+
569	+
570		subroutine setSimVariables()
571		SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms()
219	–	SIM_uses_LennardJones = SimUsesLennardJones()
220	–	SIM_uses_Electrostatics = SimUsesElectrostatics()
221	–	SIM_uses_Charges = SimUsesCharges()
222	–	SIM_uses_Dipoles = SimUsesDipoles()
223	–	SIM_uses_Sticky = SimUsesSticky()
224	–	SIM_uses_GayBerne = SimUsesGayBerne()
572		SIM_uses_EAM = SimUsesEAM()
226	–	SIM_uses_Shapes = SimUsesShapes()
227	–	SIM_uses_FLARB = SimUsesFLARB()
228	–	SIM_uses_RF = SimUsesRF()
573		SIM_requires_postpair_calc = SimRequiresPostpairCalc()
574		SIM_requires_prepair_calc = SimRequiresPrepairCalc()
575		SIM_uses_PBC = SimUsesPBC()
#	Line 241 | Line 585 | contains
585		integer :: myStatus
586
587		error = 0
244	–
245	–	if (.not. havePropertyMap) then
588
589	<	myStatus = 0
589	>	if (.not. haveInteractionHash) then
590	>	myStatus = 0
591	>	call createInteractionHash(myStatus)
592	>	if (myStatus .ne. 0) then
593	>	write(default_error, *) 'createInteractionHash failed in doForces!'
594	>	error = -1
595	>	return
596	>	endif
597	>	endif
598
599	<	call createPropertyMap(myStatus)
600	<
599	>	if (.not. haveGtypeCutoffMap) then
600	>	myStatus = 0
601	>	call createGtypeCutoffMap(myStatus)
602		if (myStatus .ne. 0) then
603	<	write(default_error, *) 'createPropertyMap failed in doForces!'
603	>	write(default_error, *) 'createGtypeCutoffMap failed in doForces!'
604		error = -1
605		return
606		endif
#	Line 259 | Line 610 | contains
610		call setSimVariables()
611		endif
612
613	<	if (.not. haveRlist) then
614	<	write(default_error, *) 'rList has not been set in doForces!'
615	<	error = -1
616	<	return
617	<	endif
613	>	!  if (.not. haveRlist) then
614	>	!     write(default_error, *) 'rList has not been set in doForces!'
615	>	!     error = -1
616	>	!     return
617	>	!  endif
618
619		if (.not. haveNeighborList) then
620		write(default_error, *) 'neighbor list has not been initialized in doForces!'
#	Line 286 | Line 637 | contains
637		#endif
638		return
639		end subroutine doReadyCheck
289	–
640
291	–	subroutine init_FF(use_RF_c, thisStat)
641
642	<	logical, intent(in) :: use_RF_c
642	>	subroutine init_FF(thisESM, thisStat)
643
644	+	integer, intent(in) :: thisESM
645		integer, intent(out) :: thisStat
646		integer :: my_status, nMatches
647		integer, pointer :: MatchList(:) => null()
#	Line 300 | Line 650 | contains
650		!! assume things are copacetic, unless they aren't
651		thisStat = 0
652
653	<	!! Fortran's version of a cast:
654	<	FF_uses_RF = use_RF_c
305	<
653	>	electrostaticSummationMethod = thisESM
654	>
655		!! init_FF is called *after* all of the atom types have been
656		!! defined in atype_module using the new_atype subroutine.
657		!!
658		!! this will scan through the known atypes and figure out what
659		!! interactions are used by the force field.
660	<
660	>
661		FF_uses_DirectionalAtoms = .false.
313	–	FF_uses_LennardJones = .false.
314	–	FF_uses_Electrostatics = .false.
315	–	FF_uses_Charges = .false.
662		FF_uses_Dipoles = .false.
317	–	FF_uses_Sticky = .false.
663		FF_uses_GayBerne = .false.
664		FF_uses_EAM = .false.
665	<	FF_uses_Shapes = .false.
321	<	FF_uses_FLARB = .false.
322	<
665	>
666		call getMatchingElementList(atypes, "is_Directional", .true., &
667		nMatches, MatchList)
668		if (nMatches .gt. 0) FF_uses_DirectionalAtoms = .true.
669
327	–	call getMatchingElementList(atypes, "is_LennardJones", .true., &
328	–	nMatches, MatchList)
329	–	if (nMatches .gt. 0) FF_uses_LennardJones = .true.
330	–
331	–	call getMatchingElementList(atypes, "is_Electrostatic", .true., &
332	–	nMatches, MatchList)
333	–	if (nMatches .gt. 0) then
334	–	FF_uses_Electrostatics = .true.
335	–	endif
336	–
337	–	call getMatchingElementList(atypes, "is_Charge", .true., &
338	–	nMatches, MatchList)
339	–	if (nMatches .gt. 0) then
340	–	FF_uses_Charges = .true.
341	–	FF_uses_Electrostatics = .true.
342	–	endif
343	–
670		call getMatchingElementList(atypes, "is_Dipole", .true., &
671		nMatches, MatchList)
672	<	if (nMatches .gt. 0) then
347	<	FF_uses_Dipoles = .true.
348	<	FF_uses_Electrostatics = .true.
349	<	FF_uses_DirectionalAtoms = .true.
350	<	endif
351	<
352	<	call getMatchingElementList(atypes, "is_Quadrupole", .true., &
353	<	nMatches, MatchList)
354	<	if (nMatches .gt. 0) then
355	<	FF_uses_Quadrupoles = .true.
356	<	FF_uses_Electrostatics = .true.
357	<	FF_uses_DirectionalAtoms = .true.
358	<	endif
672	>	if (nMatches .gt. 0) FF_uses_Dipoles = .true.
673
360	–	call getMatchingElementList(atypes, "is_Sticky", .true., nMatches, &
361	–	MatchList)
362	–	if (nMatches .gt. 0) then
363	–	FF_uses_Sticky = .true.
364	–	FF_uses_DirectionalAtoms = .true.
365	–	endif
366	–
674		call getMatchingElementList(atypes, "is_GayBerne", .true., &
675		nMatches, MatchList)
676	<	if (nMatches .gt. 0) then
677	<	FF_uses_GayBerne = .true.
371	<	FF_uses_DirectionalAtoms = .true.
372	<	endif
373	<
676	>	if (nMatches .gt. 0) FF_uses_GayBerne = .true.
677	>
678		call getMatchingElementList(atypes, "is_EAM", .true., nMatches, MatchList)
679		if (nMatches .gt. 0) FF_uses_EAM = .true.
376	–
377	–	call getMatchingElementList(atypes, "is_Shape", .true., &
378	–	nMatches, MatchList)
379	–	if (nMatches .gt. 0) then
380	–	FF_uses_Shapes = .true.
381	–	FF_uses_DirectionalAtoms = .true.
382	–	endif
680
384	–	call getMatchingElementList(atypes, "is_FLARB", .true., &
385	–	nMatches, MatchList)
386	–	if (nMatches .gt. 0) FF_uses_FLARB = .true.
681
388	–	!! Assume sanity (for the sake of argument)
682		haveSaneForceField = .true.
683	<
684	<	!! check to make sure the FF_uses_RF setting makes sense
685	<
686	<	if (FF_uses_dipoles) then
687	<	if (FF_uses_RF) then
683	>
684	>	!! check to make sure the reaction field setting makes sense
685	>
686	>	if (FF_uses_Dipoles) then
687	>	if (electrostaticSummationMethod == REACTION_FIELD) then
688		dielect = getDielect()
689		call initialize_rf(dielect)
690		endif
691		else
692	<	if (FF_uses_RF) then
692	>	if (electrostaticSummationMethod == REACTION_FIELD) then
693		write(default_error,*) 'Using Reaction Field with no dipoles?  Huh?'
694		thisStat = -1
695		haveSaneForceField = .false.
696		return
697		endif
698	<	endif
698	>	endif
699
407	–	!sticky module does not contain check_sticky_FF anymore
408	–	!if (FF_uses_sticky) then
409	–	!   call check_sticky_FF(my_status)
410	–	!   if (my_status /= 0) then
411	–	!      thisStat = -1
412	–	!      haveSaneForceField = .false.
413	–	!      return
414	–	!   end if
415	–	!endif
416	–
700		if (FF_uses_EAM) then
701	<	call init_EAM_FF(my_status)
701	>	call init_EAM_FF(my_status)
702		if (my_status /= 0) then
703		write(default_error, *) "init_EAM_FF returned a bad status"
704		thisStat = -1
#	Line 433 | Line 716 | contains
716		endif
717		endif
718
436	–	if (FF_uses_GayBerne .and. FF_uses_LennardJones) then
437	–	endif
438	–
719		if (.not. haveNeighborList) then
720		!! Create neighbor lists
721		call expandNeighborList(nLocal, my_status)
#	Line 445 | Line 725 | contains
725		return
726		endif
727		haveNeighborList = .true.
728	<	endif
729	<
728	>	endif
729	>
730		end subroutine init_FF
451	–
731
732	+
733		!! Does force loop over i,j pairs. Calls do_pair to calculates forces.
734		!------------------------------------------------------------->
735		subroutine do_force_loop(q, q_group, A, eFrame, f, t, tau, pot, &
#	Line 469 | Line 749 | contains
749
750		!! Stress Tensor
751		real( kind = dp), dimension(9) :: tau
752	<	real ( kind = dp ) :: pot
752	>	real ( kind = dp ),dimension(POT_ARRAY_SIZE) :: pot
753		logical ( kind = 2) :: do_pot_c, do_stress_c
754		logical :: do_pot
755		logical :: do_stress
756		logical :: in_switching_region
757		#ifdef IS_MPI
758	<	real( kind = DP ) :: pot_local
758	>	real( kind = DP ), dimension(POT_ARRAY_SIZE) :: pot_local
759		integer :: nAtomsInRow
760		integer :: nAtomsInCol
761		integer :: nprocs
#	Line 499 | Line 779 | contains
779		integer :: localError
780		integer :: propPack_i, propPack_j
781		integer :: loopStart, loopEnd, loop
782	+	integer :: iHash
783	+
784
503	–	real(kind=dp) :: listSkin = 1.0
504	–
785		!! initialize local variables
786	<
786	>
787		#ifdef IS_MPI
788		pot_local = 0.0_dp
789		nAtomsInRow   = getNatomsInRow(plan_atom_row)
#	Line 513 | Line 793 | contains
793		#else
794		natoms = nlocal
795		#endif
796	<
796	>
797		call doReadyCheck(localError)
798		if ( localError .ne. 0 ) then
799		call handleError("do_force_loop", "Not Initialized")
#	Line 521 | Line 801 | contains
801		return
802		end if
803		call zero_work_arrays()
804	<
804	>
805		do_pot = do_pot_c
806		do_stress = do_stress_c
807	<
807	>
808		! Gather all information needed by all force loops:
809	<
809	>
810		#ifdef IS_MPI
811	<
811	>
812		call gather(q, q_Row, plan_atom_row_3d)
813		call gather(q, q_Col, plan_atom_col_3d)
814
815		call gather(q_group, q_group_Row, plan_group_row_3d)
816		call gather(q_group, q_group_Col, plan_group_col_3d)
817	<
817	>
818		if (FF_UsesDirectionalAtoms() .and. SIM_uses_DirectionalAtoms) then
819		call gather(eFrame, eFrame_Row, plan_atom_row_rotation)
820		call gather(eFrame, eFrame_Col, plan_atom_col_rotation)
821	<
821	>
822		call gather(A, A_Row, plan_atom_row_rotation)
823		call gather(A, A_Col, plan_atom_col_rotation)
824		endif
825	<
825	>
826		#endif
827	<
827	>
828		!! Begin force loop timing:
829		#ifdef PROFILE
830		call cpu_time(forceTimeInitial)
831		nloops = nloops + 1
832		#endif
833	<
833	>
834		loopEnd = PAIR_LOOP
835		if (FF_RequiresPrepairCalc() .and. SIM_requires_prepair_calc) then
836		loopStart = PREPAIR_LOOP
#	Line 565 | Line 845 | contains
845		if (loop .eq. loopStart) then
846		#ifdef IS_MPI
847		call checkNeighborList(nGroupsInRow, q_group_row, listSkin, &
848	<	update_nlist)
848	>	update_nlist)
849		#else
850		call checkNeighborList(nGroups, q_group, listSkin, &
851	<	update_nlist)
851	>	update_nlist)
852		#endif
853		endif
854	<
854	>
855		if (update_nlist) then
856		!! save current configuration and construct neighbor list
857		#ifdef IS_MPI
#	Line 582 | Line 862 | contains
862		neighborListSize = size(list)
863		nlist = 0
864		endif
865	<
865	>
866		istart = 1
867		#ifdef IS_MPI
868		iend = nGroupsInRow
#	Line 592 | Line 872 | contains
872		outer: do i = istart, iend
873
874		if (update_nlist) point(i) = nlist + 1
875	<
875	>
876		n_in_i = groupStartRow(i+1) - groupStartRow(i)
877	<
877	>
878		if (update_nlist) then
879		#ifdef IS_MPI
880		jstart = 1
#	Line 609 | Line 889 | contains
889		! make sure group i has neighbors
890		if (jstart .gt. jend) cycle outer
891		endif
892	<
892	>
893		do jnab = jstart, jend
894		if (update_nlist) then
895		j = jnab
#	Line 618 | Line 898 | contains
898		endif
899
900		#ifdef IS_MPI
901	+	me_j = atid_col(j)
902		call get_interatomic_vector(q_group_Row(:,i), &
903		q_group_Col(:,j), d_grp, rgrpsq)
904		#else
905	+	me_j = atid(j)
906		call get_interatomic_vector(q_group(:,i), &
907		q_group(:,j), d_grp, rgrpsq)
908	<	#endif
908	>	#endif
909
910	<	if (rgrpsq < rlistsq) then
910	>	if (rgrpsq < gtypeCutoffMap(groupToGtypeRow(i),groupToGtypeCol(j))%rListsq) then
911		if (update_nlist) then
912		nlist = nlist + 1
913	<
913	>
914		if (nlist > neighborListSize) then
915		#ifdef IS_MPI
916		call expandNeighborList(nGroupsInRow, listerror)
#	Line 642 | Line 924 | contains
924		end if
925		neighborListSize = size(list)
926		endif
927	<
927	>
928		list(nlist) = j
929		endif
930	<
930	>
931		if (loop .eq. PAIR_LOOP) then
932		vij = 0.0d0
933		fij(1:3) = 0.0d0
934		endif
935	<
935	>
936		call get_switch(rgrpsq, sw, dswdr, rgrp, group_switch, &
937		in_switching_region)
938	<
938	>
939		n_in_j = groupStartCol(j+1) - groupStartCol(j)
940	<
940	>
941		do ia = groupStartRow(i), groupStartRow(i+1)-1
942	<
942	>
943		atom1 = groupListRow(ia)
944	<
944	>
945		inner: do jb = groupStartCol(j), groupStartCol(j+1)-1
946	<
946	>
947		atom2 = groupListCol(jb)
948	<
948	>
949		if (skipThisPair(atom1, atom2)) cycle inner
950
951		if ((n_in_i .eq. 1).and.(n_in_j .eq. 1)) then
#	Line 705 | Line 987 | contains
987		endif
988		enddo inner
989		enddo
990	<
990	>
991		if (loop .eq. PAIR_LOOP) then
992		if (in_switching_region) then
993		swderiv = vij*dswdr/rgrp
994		fij(1) = fij(1) + swderiv*d_grp(1)
995		fij(2) = fij(2) + swderiv*d_grp(2)
996		fij(3) = fij(3) + swderiv*d_grp(3)
997	<
997	>
998		do ia=groupStartRow(i), groupStartRow(i+1)-1
999		atom1=groupListRow(ia)
1000		mf = mfactRow(atom1)
#	Line 726 | Line 1008 | contains
1008		f(3,atom1) = f(3,atom1) + swderiv*d_grp(3)*mf
1009		#endif
1010		enddo
1011	<
1011	>
1012		do jb=groupStartCol(j), groupStartCol(j+1)-1
1013		atom2=groupListCol(jb)
1014		mf = mfactCol(atom2)
#	Line 741 | Line 1023 | contains
1023		#endif
1024		enddo
1025		endif
1026	<
1026	>
1027		if (do_stress) call add_stress_tensor(d_grp, fij)
1028		endif
1029		end if
1030		enddo
1031	+
1032		enddo outer
1033	<
1033	>
1034		if (update_nlist) then
1035		#ifdef IS_MPI
1036		point(nGroupsInRow + 1) = nlist + 1
#	Line 761 | Line 1044 | contains
1044		update_nlist = .false.
1045		endif
1046		endif
1047	<
1047	>
1048		if (loop .eq. PREPAIR_LOOP) then
1049		call do_preforce(nlocal, pot)
1050		endif
1051	<
1051	>
1052		enddo
1053	<
1053	>
1054		!! Do timing
1055		#ifdef PROFILE
1056		call cpu_time(forceTimeFinal)
1057		forceTime = forceTime + forceTimeFinal - forceTimeInitial
1058		#endif
1059	<
1059	>
1060		#ifdef IS_MPI
1061		!!distribute forces
1062	<
1062	>
1063		f_temp = 0.0_dp
1064		call scatter(f_Row,f_temp,plan_atom_row_3d)
1065		do i = 1,nlocal
1066		f(1:3,i) = f(1:3,i) + f_temp(1:3,i)
1067		end do
1068	<
1068	>
1069		f_temp = 0.0_dp
1070		call scatter(f_Col,f_temp,plan_atom_col_3d)
1071		do i = 1,nlocal
1072		f(1:3,i) = f(1:3,i) + f_temp(1:3,i)
1073		end do
1074	<
1074	>
1075		if (FF_UsesDirectionalAtoms() .and. SIM_uses_DirectionalAtoms) then
1076		t_temp = 0.0_dp
1077		call scatter(t_Row,t_temp,plan_atom_row_3d)
#	Line 797 | Line 1080 | contains
1080		end do
1081		t_temp = 0.0_dp
1082		call scatter(t_Col,t_temp,plan_atom_col_3d)
1083	<
1083	>
1084		do i = 1,nlocal
1085		t(1:3,i) = t(1:3,i) + t_temp(1:3,i)
1086		end do
1087		endif
1088	<
1088	>
1089		if (do_pot) then
1090		! scatter/gather pot_row into the members of my column
1091	<	call scatter(pot_Row, pot_Temp, plan_atom_row)
1092	<
1091	>	do i = 1,POT_ARRAY_SIZE
1092	>	call scatter(pot_Row(i,:), pot_Temp(i,:), plan_atom_row)
1093	>	end do
1094		! scatter/gather pot_local into all other procs
1095		! add resultant to get total pot
1096		do i = 1, nlocal
1097	<	pot_local = pot_local + pot_Temp(i)
1097	>	pot_local(1:POT_ARRAY_SIZE) = pot_local(1:POT_ARRAY_SIZE &
1098	>	+ pot_Temp(1:POT_ARRAY_SIZE,i)
1099		enddo
1100	<
1100	>
1101		pot_Temp = 0.0_DP
1102	<
1103	<	call scatter(pot_Col, pot_Temp, plan_atom_col)
1102	>	do i = 1,POT_ARRAY_SIZE
1103	>	call scatter(pot_Col(i,:), pot_Temp(i,:), plan_atom_col)
1104	>	end do
1105		do i = 1, nlocal
1106	<	pot_local = pot_local + pot_Temp(i)
1106	>	pot_local(1:POT_ARRAY_SIZE) = pot_local(1:POT_ARRAY_SIZE)&
1107	>	+ pot_Temp(1:POT_ARRAY_SIZE,i)
1108		enddo
1109	<
1109	>
1110		endif
1111		#endif
1112	<
1112	>
1113		if (FF_RequiresPostpairCalc() .and. SIM_requires_postpair_calc) then
1114	<
1115	<	if (FF_uses_RF .and. SIM_uses_RF) then
1116	<
1114	>
1115	>	if (electrostaticSummationMethod == REACTION_FIELD) then
1116	>
1117		#ifdef IS_MPI
1118		call scatter(rf_Row,rf,plan_atom_row_3d)
1119		call scatter(rf_Col,rf_Temp,plan_atom_col_3d)
#	Line 834 | Line 1121 | contains
1121		rf(1:3,i) = rf(1:3,i) + rf_Temp(1:3,i)
1122		end do
1123		#endif
1124	<
1124	>
1125		do i = 1, nLocal
1126	<
1126	>
1127		rfpot = 0.0_DP
1128		#ifdef IS_MPI
1129		me_i = atid_row(i)
1130		#else
1131		me_i = atid(i)
1132		#endif
1133	+	iHash = InteractionHash(me_i,me_j)
1134
1135	<	if (PropertyMap(me_i)%is_Dipole) then
1136	<
1135	>	if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1136	>
1137		mu_i = getDipoleMoment(me_i)
1138	<
1138	>
1139		!! The reaction field needs to include a self contribution
1140		!! to the field:
1141		call accumulate_self_rf(i, mu_i, eFrame)
#	Line 855 | Line 1143 | contains
1143		!! potential and torques:
1144		call reaction_field_final(i, mu_i, eFrame, rfpot, t, do_pot)
1145		#ifdef IS_MPI
1146	<	pot_local = pot_local + rfpot
1146	>	pot_local(RF_POT) = pot_local(RF_POT) + rfpot
1147		#else
1148	<	pot = pot + rfpot
1149	<
1148	>	pot(RF_POT) = pot(RF_POT) + rfpot
1149	>
1150		#endif
1151	<	endif
1151	>	endif
1152		enddo
1153		endif
1154		endif
1155	<
1156	<
1155	>
1156	>
1157		#ifdef IS_MPI
1158	<
1158	>
1159		if (do_pot) then
1160	<	pot = pot + pot_local
1160	>	pot(1:SIZE_POT_ARRAY) = pot(1:SIZE_POT_ARRAY) &
1161	>	+ pot_local(1:SIZE_POT_ARRAY)
1162		!! we assume the c code will do the allreduce to get the total potential
1163		!! we could do it right here if we needed to...
1164		endif
1165	<
1165	>
1166		if (do_stress) then
1167		call mpi_allreduce(tau_Temp, tau, 9,mpi_double_precision,mpi_sum, &
1168		mpi_comm_world,mpi_err)
1169		call mpi_allreduce(virial_Temp, virial,1,mpi_double_precision,mpi_sum, &
1170		mpi_comm_world,mpi_err)
1171		endif
1172	<
1172	>
1173		#else
1174	<
1174	>
1175		if (do_stress) then
1176		tau = tau_Temp
1177		virial = virial_Temp
1178		endif
1179	<
1179	>
1180		#endif
1181	<
1181	>
1182		end subroutine do_force_loop
1183	<
1183	>
1184		subroutine do_pair(i, j, rijsq, d, sw, do_pot, &
1185		eFrame, A, f, t, pot, vpair, fpair)
1186
1187	<	real( kind = dp ) :: pot, vpair, sw
1187	>	real( kind = dp ) :: vpair, sw
1188	>	real( kind = dp ), dimension(POT_ARRAY_SIZE) :: pot
1189		real( kind = dp ), dimension(3) :: fpair
1190		real( kind = dp ), dimension(nLocal)   :: mfact
1191		real( kind = dp ), dimension(9,nLocal) :: eFrame
#	Line 910 | Line 1200 | contains
1200		real ( kind = dp ), intent(inout) :: d(3)
1201		integer :: me_i, me_j
1202
1203	+	integer :: iHash
1204	+
1205		r = sqrt(rijsq)
1206		vpair = 0.0d0
1207		fpair(1:3) = 0.0d0
#	Line 922 | Line 1214 | contains
1214		me_j = atid(j)
1215		#endif
1216
1217	<	!    write(*,*) i, j, me_i, me_j
1218	<
1219	<	if (FF_uses_LennardJones .and. SIM_uses_LennardJones) then
1220	<
929	<	if ( PropertyMap(me_i)%is_LennardJones .and. &
930	<	PropertyMap(me_j)%is_LennardJones ) then
931	<	call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
932	<	endif
933	<
1217	>	iHash = InteractionHash(me_i, me_j)
1218	>
1219	>	if ( iand(iHash, LJ_PAIR).ne.0 ) then
1220	>	call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot(LJ_POT), f, do_pot)
1221		endif
935	–
936	–	if (FF_uses_Electrostatics .and. SIM_uses_Electrostatics) then
937	–
938	–	if (PropertyMap(me_i)%is_Electrostatic .and. &
939	–	PropertyMap(me_j)%is_Electrostatic) then
940	–	call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
941	–	pot, eFrame, f, t, do_pot)
942	–	endif
943	–
944	–	if (FF_uses_dipoles .and. SIM_uses_dipoles) then
945	–	if ( PropertyMap(me_i)%is_Dipole .and. &
946	–	PropertyMap(me_j)%is_Dipole) then
947	–	if (FF_uses_RF .and. SIM_uses_RF) then
948	–	call accumulate_rf(i, j, r, eFrame, sw)
949	–	call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair)
950	–	endif
951	–	endif
952	–	endif
953	–	endif
1222
1223	+	if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1224	+	call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1225	+	pot(ELECTROSTATIC_POT), eFrame, f, t, do_pot)
1226
1227	<	if (FF_uses_Sticky .and. SIM_uses_sticky) then
1227	>	if (electrostaticSummationMethod == REACTION_FIELD) then
1228
1229	<	if ( PropertyMap(me_i)%is_Sticky .and. PropertyMap(me_j)%is_Sticky) then
1230	<	call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1231	<	pot, A, f, t, do_pot)
1229	>	! CHECK ME (RF needs to know about all electrostatic types)
1230	>	call accumulate_rf(i, j, r, eFrame, sw)
1231	>	call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair)
1232		endif
1233	<
1233	>
1234		endif
1235
1236	+	if ( iand(iHash, STICKY_PAIR).ne.0 ) then
1237	+	call do_sticky_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1238	+	pot(STICKY_POT), A, f, t, do_pot)
1239	+	endif
1240
1241	<	if (FF_uses_GayBerne .and. SIM_uses_GayBerne) then
1242	<
1243	<	if ( PropertyMap(me_i)%is_GayBerne .and. &
969	<	PropertyMap(me_j)%is_GayBerne) then
970	<	call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
971	<	pot, A, f, t, do_pot)
972	<	endif
973	<
1241	>	if ( iand(iHash, STICKYPOWER_PAIR).ne.0 ) then
1242	>	call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1243	>	pot(STICKYPOWER_POT), A, f, t, do_pot)
1244		endif
1245	+
1246	+	if ( iand(iHash, GAYBERNE_PAIR).ne.0 ) then
1247	+	call do_gb_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1248	+	pot(GAYBERNE_POT), A, f, t, do_pot)
1249	+	endif
1250
1251	<	if (FF_uses_EAM .and. SIM_uses_EAM) then
1252	<
1253	<	if ( PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) then
979	<	call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, &
980	<	do_pot)
981	<	endif
982	<
1251	>	if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then
1252	>	!      call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1253	>	!           pot(GAYBERNE_LJ_POT), A, f, t, do_pot)
1254		endif
1255
1256	+	if ( iand(iHash, EAM_PAIR).ne.0 ) then
1257	+	call do_eam_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot(EAM_POT), f, &
1258	+	do_pot)
1259	+	endif
1260
1261	<	!    write(*,*) PropertyMap(me_i)%is_Shape,PropertyMap(me_j)%is_Shape
1261	>	if ( iand(iHash, SHAPE_PAIR).ne.0 ) then
1262	>	call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1263	>	pot(SHAPE_POT), A, f, t, do_pot)
1264	>	endif
1265
1266	<	if (FF_uses_Shapes .and. SIM_uses_Shapes) then
1267	<	if ( PropertyMap(me_i)%is_Shape .and. &
1268	<	PropertyMap(me_j)%is_Shape ) then
991	<	call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
992	<	pot, A, f, t, do_pot)
993	<	endif
994	<
1266	>	if ( iand(iHash, SHAPE_LJ).ne.0 ) then
1267	>	call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1268	>	pot(SHAPE_LJ_POT), A, f, t, do_pot)
1269		endif
1270
1271		end subroutine do_pair
#	Line 999 | Line 1273 | contains
1273		subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, &
1274		do_pot, do_stress, eFrame, A, f, t, pot)
1275
1276	<	real( kind = dp ) :: pot, sw
1277	<	real( kind = dp ), dimension(9,nLocal) :: eFrame
1278	<	real (kind=dp), dimension(9,nLocal) :: A
1279	<	real (kind=dp), dimension(3,nLocal) :: f
1280	<	real (kind=dp), dimension(3,nLocal) :: t
1281	<
1008	<	logical, intent(inout) :: do_pot, do_stress
1009	<	integer, intent(in) :: i, j
1010	<	real ( kind = dp ), intent(inout)    :: rijsq, rcijsq
1011	<	real ( kind = dp )                :: r, rc
1012	<	real ( kind = dp ), intent(inout) :: d(3), dc(3)
1013	<
1014	<	logical :: is_EAM_i, is_EAM_j
1015	<
1016	<	integer :: me_i, me_j
1017	<
1276	>	real( kind = dp ) :: sw
1277	>	real( kind = dp ), dimension(POT_ARRAY_SIZE) :: pot
1278	>	real( kind = dp ), dimension(9,nLocal) :: eFrame
1279	>	real (kind=dp), dimension(9,nLocal) :: A
1280	>	real (kind=dp), dimension(3,nLocal) :: f
1281	>	real (kind=dp), dimension(3,nLocal) :: t
1282
1283	+	logical, intent(inout) :: do_pot, do_stress
1284	+	integer, intent(in) :: i, j
1285	+	real ( kind = dp ), intent(inout)    :: rijsq, rcijsq
1286	+	real ( kind = dp )                :: r, rc
1287	+	real ( kind = dp ), intent(inout) :: d(3), dc(3)
1288	+
1289	+	integer :: me_i, me_j, iHash
1290	+
1291		r = sqrt(rijsq)
1020	–	if (SIM_uses_molecular_cutoffs) then
1021	–	rc = sqrt(rcijsq)
1022	–	else
1023	–	rc = r
1024	–	endif
1025	–
1292
1293		#ifdef IS_MPI
1294	<	me_i = atid_row(i)
1295	<	me_j = atid_col(j)
1294	>	me_i = atid_row(i)
1295	>	me_j = atid_col(j)
1296		#else
1297	<	me_i = atid(i)
1298	<	me_j = atid(j)
1297	>	me_i = atid(i)
1298	>	me_j = atid(j)
1299		#endif
1034	–
1035	–	if (FF_uses_EAM .and. SIM_uses_EAM) then
1036	–
1037	–	if (PropertyMap(me_i)%is_EAM .and. PropertyMap(me_j)%is_EAM) &
1038	–	call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1039	–
1040	–	endif
1041	–
1042	–	end subroutine do_prepair
1043	–
1044	–
1045	–	subroutine do_preforce(nlocal,pot)
1046	–	integer :: nlocal
1047	–	real( kind = dp ) :: pot
1048	–
1049	–	if (FF_uses_EAM .and. SIM_uses_EAM) then
1050	–	call calc_EAM_preforce_Frho(nlocal,pot)
1051	–	endif
1052	–
1053	–
1054	–	end subroutine do_preforce
1055	–
1056	–
1057	–	subroutine get_interatomic_vector(q_i, q_j, d, r_sq)
1058	–
1059	–	real (kind = dp), dimension(3) :: q_i
1060	–	real (kind = dp), dimension(3) :: q_j
1061	–	real ( kind = dp ), intent(out) :: r_sq
1062	–	real( kind = dp ) :: d(3), scaled(3)
1063	–	integer i
1064	–
1065	–	d(1:3) = q_j(1:3) - q_i(1:3)
1066	–
1067	–	! Wrap back into periodic box if necessary
1068	–	if ( SIM_uses_PBC ) then
1069	–
1070	–	if( .not.boxIsOrthorhombic ) then
1071	–	! calc the scaled coordinates.
1072	–
1073	–	scaled = matmul(HmatInv, d)
1074	–
1075	–	! wrap the scaled coordinates
1076	–
1077	–	scaled = scaled  - anint(scaled)
1078	–
1079	–
1080	–	! calc the wrapped real coordinates from the wrapped scaled
1081	–	! coordinates
1082	–
1083	–	d = matmul(Hmat,scaled)
1084	–
1085	–	else
1086	–	! calc the scaled coordinates.
1087	–
1088	–	do i = 1, 3
1089	–	scaled(i) = d(i) * HmatInv(i,i)
1090	–
1091	–	! wrap the scaled coordinates
1092	–
1093	–	scaled(i) = scaled(i) - anint(scaled(i))
1094	–
1095	–	! calc the wrapped real coordinates from the wrapped scaled
1096	–	! coordinates
1097	–
1098	–	d(i) = scaled(i)*Hmat(i,i)
1099	–	enddo
1100	–	endif
1101	–
1102	–	endif
1103	–
1104	–	r_sq = dot_product(d,d)
1105	–
1106	–	end subroutine get_interatomic_vector
1107	–
1108	–	subroutine zero_work_arrays()
1109	–
1110	–	#ifdef IS_MPI
1111	–
1112	–	q_Row = 0.0_dp
1113	–	q_Col = 0.0_dp
1300
1301	<	q_group_Row = 0.0_dp
1302	<	q_group_Col = 0.0_dp
1303	<
1304	<	eFrame_Row = 0.0_dp
1305	<	eFrame_Col = 0.0_dp
1306	<
1307	<	A_Row = 0.0_dp
1308	<	A_Col = 0.0_dp
1309	<
1310	<	f_Row = 0.0_dp
1311	<	f_Col = 0.0_dp
1312	<	f_Temp = 0.0_dp
1313	<
1314	<	t_Row = 0.0_dp
1315	<	t_Col = 0.0_dp
1316	<	t_Temp = 0.0_dp
1317	<
1318	<	pot_Row = 0.0_dp
1319	<	pot_Col = 0.0_dp
1320	<	pot_Temp = 0.0_dp
1321	<
1322	<	rf_Row = 0.0_dp
1323	<	rf_Col = 0.0_dp
1324	<	rf_Temp = 0.0_dp
1325	<
1326	<	#endif
1327	<
1328	<	if (FF_uses_EAM .and. SIM_uses_EAM) then
1329	<	call clean_EAM()
1330	<	endif
1331	<
1332	<	rf = 0.0_dp
1333	<	tau_Temp = 0.0_dp
1334	<	virial_Temp = 0.0_dp
1335	<	end subroutine zero_work_arrays
1336	<
1337	<	function skipThisPair(atom1, atom2) result(skip_it)
1338	<	integer, intent(in) :: atom1
1339	<	integer, intent(in), optional :: atom2
1340	<	logical :: skip_it
1341	<	integer :: unique_id_1, unique_id_2
1342	<	integer :: me_i,me_j
1343	<	integer :: i
1344	<
1345	<	skip_it = .false.
1346	<
1347	<	!! there are a number of reasons to skip a pair or a particle
1348	<	!! mostly we do this to exclude atoms who are involved in short
1349	<	!! range interactions (bonds, bends, torsions), but we also need
1350	<	!! to exclude some overcounted interactions that result from
1351	<	!! the parallel decomposition
1352	<
1301	>	iHash = InteractionHash(me_i, me_j)
1302	>
1303	>	if ( iand(iHash, EAM_PAIR).ne.0 ) then
1304	>	call calc_EAM_prepair_rho(i, j, d, r, rijsq )
1305	>	endif
1306	>
1307	>	end subroutine do_prepair
1308	>
1309	>
1310	>	subroutine do_preforce(nlocal,pot)
1311	>	integer :: nlocal
1312	>	real( kind = dp ),dimension(POT_ARRAY_SIZE) :: pot
1313	>
1314	>	if (FF_uses_EAM .and. SIM_uses_EAM) then
1315	>	call calc_EAM_preforce_Frho(nlocal,pot(EAM_POT))
1316	>	endif
1317	>
1318	>
1319	>	end subroutine do_preforce
1320	>
1321	>
1322	>	subroutine get_interatomic_vector(q_i, q_j, d, r_sq)
1323	>
1324	>	real (kind = dp), dimension(3) :: q_i
1325	>	real (kind = dp), dimension(3) :: q_j
1326	>	real ( kind = dp ), intent(out) :: r_sq
1327	>	real( kind = dp ) :: d(3), scaled(3)
1328	>	integer i
1329	>
1330	>	d(1:3) = q_j(1:3) - q_i(1:3)
1331	>
1332	>	! Wrap back into periodic box if necessary
1333	>	if ( SIM_uses_PBC ) then
1334	>
1335	>	if( .not.boxIsOrthorhombic ) then
1336	>	! calc the scaled coordinates.
1337	>
1338	>	scaled = matmul(HmatInv, d)
1339	>
1340	>	! wrap the scaled coordinates
1341	>
1342	>	scaled = scaled  - anint(scaled)
1343	>
1344	>
1345	>	! calc the wrapped real coordinates from the wrapped scaled
1346	>	! coordinates
1347	>
1348	>	d = matmul(Hmat,scaled)
1349	>
1350	>	else
1351	>	! calc the scaled coordinates.
1352	>
1353	>	do i = 1, 3
1354	>	scaled(i) = d(i) * HmatInv(i,i)
1355	>
1356	>	! wrap the scaled coordinates
1357	>
1358	>	scaled(i) = scaled(i) - anint(scaled(i))
1359	>
1360	>	! calc the wrapped real coordinates from the wrapped scaled
1361	>	! coordinates
1362	>
1363	>	d(i) = scaled(i)*Hmat(i,i)
1364	>	enddo
1365	>	endif
1366	>
1367	>	endif
1368	>
1369	>	r_sq = dot_product(d,d)
1370	>
1371	>	end subroutine get_interatomic_vector
1372	>
1373	>	subroutine zero_work_arrays()
1374	>
1375		#ifdef IS_MPI
1376	<	!! in MPI, we have to look up the unique IDs for each atom
1377	<	unique_id_1 = AtomRowToGlobal(atom1)
1376	>
1377	>	q_Row = 0.0_dp
1378	>	q_Col = 0.0_dp
1379	>
1380	>	q_group_Row = 0.0_dp
1381	>	q_group_Col = 0.0_dp
1382	>
1383	>	eFrame_Row = 0.0_dp
1384	>	eFrame_Col = 0.0_dp
1385	>
1386	>	A_Row = 0.0_dp
1387	>	A_Col = 0.0_dp
1388	>
1389	>	f_Row = 0.0_dp
1390	>	f_Col = 0.0_dp
1391	>	f_Temp = 0.0_dp
1392	>
1393	>	t_Row = 0.0_dp
1394	>	t_Col = 0.0_dp
1395	>	t_Temp = 0.0_dp
1396	>
1397	>	pot_Row = 0.0_dp
1398	>	pot_Col = 0.0_dp
1399	>	pot_Temp = 0.0_dp
1400	>
1401	>	rf_Row = 0.0_dp
1402	>	rf_Col = 0.0_dp
1403	>	rf_Temp = 0.0_dp
1404	>
1405	>	#endif
1406	>
1407	>	if (FF_uses_EAM .and. SIM_uses_EAM) then
1408	>	call clean_EAM()
1409	>	endif
1410	>
1411	>	rf = 0.0_dp
1412	>	tau_Temp = 0.0_dp
1413	>	virial_Temp = 0.0_dp
1414	>	end subroutine zero_work_arrays
1415	>
1416	>	function skipThisPair(atom1, atom2) result(skip_it)
1417	>	integer, intent(in) :: atom1
1418	>	integer, intent(in), optional :: atom2
1419	>	logical :: skip_it
1420	>	integer :: unique_id_1, unique_id_2
1421	>	integer :: me_i,me_j
1422	>	integer :: i
1423	>
1424	>	skip_it = .false.
1425	>
1426	>	!! there are a number of reasons to skip a pair or a particle
1427	>	!! mostly we do this to exclude atoms who are involved in short
1428	>	!! range interactions (bonds, bends, torsions), but we also need
1429	>	!! to exclude some overcounted interactions that result from
1430	>	!! the parallel decomposition
1431	>
1432	>	#ifdef IS_MPI
1433	>	!! in MPI, we have to look up the unique IDs for each atom
1434	>	unique_id_1 = AtomRowToGlobal(atom1)
1435		#else
1436	<	!! in the normal loop, the atom numbers are unique
1437	<	unique_id_1 = atom1
1436	>	!! in the normal loop, the atom numbers are unique
1437	>	unique_id_1 = atom1
1438		#endif
1439	<
1440	<	!! We were called with only one atom, so just check the global exclude
1441	<	!! list for this atom
1442	<	if (.not. present(atom2)) then
1443	<	do i = 1, nExcludes_global
1444	<	if (excludesGlobal(i) == unique_id_1) then
1445	<	skip_it = .true.
1446	<	return
1447	<	end if
1448	<	end do
1449	<	return
1450	<	end if
1451	<
1439	>
1440	>	!! We were called with only one atom, so just check the global exclude
1441	>	!! list for this atom
1442	>	if (.not. present(atom2)) then
1443	>	do i = 1, nExcludes_global
1444	>	if (excludesGlobal(i) == unique_id_1) then
1445	>	skip_it = .true.
1446	>	return
1447	>	end if
1448	>	end do
1449	>	return
1450	>	end if
1451	>
1452		#ifdef IS_MPI
1453	<	unique_id_2 = AtomColToGlobal(atom2)
1453	>	unique_id_2 = AtomColToGlobal(atom2)
1454		#else
1455	<	unique_id_2 = atom2
1455	>	unique_id_2 = atom2
1456		#endif
1457	<
1457	>
1458		#ifdef IS_MPI
1459	<	!! this situation should only arise in MPI simulations
1460	<	if (unique_id_1 == unique_id_2) then
1461	<	skip_it = .true.
1462	<	return
1463	<	end if
1464	<
1465	<	!! this prevents us from doing the pair on multiple processors
1466	<	if (unique_id_1 < unique_id_2) then
1467	<	if (mod(unique_id_1 + unique_id_2,2) == 0) then
1468	<	skip_it = .true.
1469	<	return
1470	<	endif
1471	<	else
1472	<	if (mod(unique_id_1 + unique_id_2,2) == 1) then
1473	<	skip_it = .true.
1474	<	return
1475	<	endif
1476	<	endif
1459	>	!! this situation should only arise in MPI simulations
1460	>	if (unique_id_1 == unique_id_2) then
1461	>	skip_it = .true.
1462	>	return
1463	>	end if
1464	>
1465	>	!! this prevents us from doing the pair on multiple processors
1466	>	if (unique_id_1 < unique_id_2) then
1467	>	if (mod(unique_id_1 + unique_id_2,2) == 0) then
1468	>	skip_it = .true.
1469	>	return
1470	>	endif
1471	>	else
1472	>	if (mod(unique_id_1 + unique_id_2,2) == 1) then
1473	>	skip_it = .true.
1474	>	return
1475	>	endif
1476	>	endif
1477		#endif
1478	<
1479	<	!! the rest of these situations can happen in all simulations:
1480	<	do i = 1, nExcludes_global
1481	<	if ((excludesGlobal(i) == unique_id_1) .or. &
1482	<	(excludesGlobal(i) == unique_id_2)) then
1483	<	skip_it = .true.
1484	<	return
1485	<	endif
1486	<	enddo
1487	<
1488	<	do i = 1, nSkipsForAtom(atom1)
1489	<	if (skipsForAtom(atom1, i) .eq. unique_id_2) then
1490	<	skip_it = .true.
1491	<	return
1492	<	endif
1493	<	end do
1494	<
1495	<	return
1496	<	end function skipThisPair
1497	<
1498	<	function FF_UsesDirectionalAtoms() result(doesit)
1499	<	logical :: doesit
1500	<	doesit = FF_uses_DirectionalAtoms .or. FF_uses_Dipoles .or. &
1501	<	FF_uses_Quadrupoles .or. FF_uses_Sticky .or. &
1502	<	FF_uses_GayBerne .or. FF_uses_Shapes
1503	<	end function FF_UsesDirectionalAtoms
1504	<
1505	<	function FF_RequiresPrepairCalc() result(doesit)
1506	<	logical :: doesit
1507	<	doesit = FF_uses_EAM
1508	<	end function FF_RequiresPrepairCalc
1509	<
1510	<	function FF_RequiresPostpairCalc() result(doesit)
1511	<	logical :: doesit
1512	<	doesit = FF_uses_RF
1248	<	end function FF_RequiresPostpairCalc
1249	<
1478	>
1479	>	!! the rest of these situations can happen in all simulations:
1480	>	do i = 1, nExcludes_global
1481	>	if ((excludesGlobal(i) == unique_id_1) .or. &
1482	>	(excludesGlobal(i) == unique_id_2)) then
1483	>	skip_it = .true.
1484	>	return
1485	>	endif
1486	>	enddo
1487	>
1488	>	do i = 1, nSkipsForAtom(atom1)
1489	>	if (skipsForAtom(atom1, i) .eq. unique_id_2) then
1490	>	skip_it = .true.
1491	>	return
1492	>	endif
1493	>	end do
1494	>
1495	>	return
1496	>	end function skipThisPair
1497	>
1498	>	function FF_UsesDirectionalAtoms() result(doesit)
1499	>	logical :: doesit
1500	>	doesit = FF_uses_DirectionalAtoms
1501	>	end function FF_UsesDirectionalAtoms
1502	>
1503	>	function FF_RequiresPrepairCalc() result(doesit)
1504	>	logical :: doesit
1505	>	doesit = FF_uses_EAM
1506	>	end function FF_RequiresPrepairCalc
1507	>
1508	>	function FF_RequiresPostpairCalc() result(doesit)
1509	>	logical :: doesit
1510	>	if (electrostaticSummationMethod == REACTION_FIELD) doesit = .true.
1511	>	end function FF_RequiresPostpairCalc
1512	>
1513		#ifdef PROFILE
1514	<	function getforcetime() result(totalforcetime)
1515	<	real(kind=dp) :: totalforcetime
1516	<	totalforcetime = forcetime
1517	<	end function getforcetime
1514	>	function getforcetime() result(totalforcetime)
1515	>	real(kind=dp) :: totalforcetime
1516	>	totalforcetime = forcetime
1517	>	end function getforcetime
1518		#endif
1256	–
1257	–	!! This cleans componets of force arrays belonging only to fortran
1519
1520	<	subroutine add_stress_tensor(dpair, fpair)
1521	<
1522	<	real( kind = dp ), dimension(3), intent(in) :: dpair, fpair
1523	<
1524	<	! because the d vector is the rj - ri vector, and
1525	<	! because fx, fy, fz are the force on atom i, we need a
1526	<	! negative sign here:
1527	<
1528	<	tau_Temp(1) = tau_Temp(1) - dpair(1) * fpair(1)
1529	<	tau_Temp(2) = tau_Temp(2) - dpair(1) * fpair(2)
1530	<	tau_Temp(3) = tau_Temp(3) - dpair(1) * fpair(3)
1531	<	tau_Temp(4) = tau_Temp(4) - dpair(2) * fpair(1)
1532	<	tau_Temp(5) = tau_Temp(5) - dpair(2) * fpair(2)
1533	<	tau_Temp(6) = tau_Temp(6) - dpair(2) * fpair(3)
1534	<	tau_Temp(7) = tau_Temp(7) - dpair(3) * fpair(1)
1535	<	tau_Temp(8) = tau_Temp(8) - dpair(3) * fpair(2)
1536	<	tau_Temp(9) = tau_Temp(9) - dpair(3) * fpair(3)
1537	<
1538	<	virial_Temp = virial_Temp + &
1539	<	(tau_Temp(1) + tau_Temp(5) + tau_Temp(9))
1540	<
1541	<	end subroutine add_stress_tensor
1542	<
1520	>	!! This cleans componets of force arrays belonging only to fortran
1521	>
1522	>	subroutine add_stress_tensor(dpair, fpair)
1523	>
1524	>	real( kind = dp ), dimension(3), intent(in) :: dpair, fpair
1525	>
1526	>	! because the d vector is the rj - ri vector, and
1527	>	! because fx, fy, fz are the force on atom i, we need a
1528	>	! negative sign here:
1529	>
1530	>	tau_Temp(1) = tau_Temp(1) - dpair(1) * fpair(1)
1531	>	tau_Temp(2) = tau_Temp(2) - dpair(1) * fpair(2)
1532	>	tau_Temp(3) = tau_Temp(3) - dpair(1) * fpair(3)
1533	>	tau_Temp(4) = tau_Temp(4) - dpair(2) * fpair(1)
1534	>	tau_Temp(5) = tau_Temp(5) - dpair(2) * fpair(2)
1535	>	tau_Temp(6) = tau_Temp(6) - dpair(2) * fpair(3)
1536	>	tau_Temp(7) = tau_Temp(7) - dpair(3) * fpair(1)
1537	>	tau_Temp(8) = tau_Temp(8) - dpair(3) * fpair(2)
1538	>	tau_Temp(9) = tau_Temp(9) - dpair(3) * fpair(3)
1539	>
1540	>	virial_Temp = virial_Temp + &
1541	>	(tau_Temp(1) + tau_Temp(5) + tau_Temp(9))
1542	>
1543	>	end subroutine add_stress_tensor
1544	>
1545		end module doForces

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines