9 |
|
!! @author Matthew Meineke |
10 |
|
!! @author Christopher Fennel |
11 |
|
!! @author J. Daniel Gezelter |
12 |
< |
!! @version $Id: calc_sticky_pair.F90,v 1.12 2003-07-17 20:38:11 gezelter Exp $, $Date: 2003-07-17 20:38:11 $, $Name: not supported by cvs2svn $, $Revision: 1.12 $ |
12 |
> |
!! @version $Id: calc_sticky_pair.F90,v 1.15 2003-10-29 20:41:38 mmeineke Exp $, $Date: 2003-10-29 20:41:38 $, $Name: not supported by cvs2svn $, $Revision: 1.15 $ |
13 |
|
|
14 |
|
module sticky_pair |
15 |
|
|
111 |
|
real (kind=dp) :: rijtest, rjitest |
112 |
|
real (kind=dp) :: radcomxi, radcomyi, radcomzi |
113 |
|
real (kind=dp) :: radcomxj, radcomyj, radcomzj |
114 |
< |
|
114 |
> |
integer :: id1, id2 |
115 |
|
|
116 |
|
if (.not.sticky_initialized) then |
117 |
|
write(*,*) 'Sticky forces not initialized!' |
118 |
|
return |
119 |
|
endif |
120 |
|
|
121 |
+ |
|
122 |
|
if ( rij .LE. SSD_rbig ) then |
123 |
|
|
124 |
|
r3 = r2*rij |
347 |
|
#endif |
348 |
|
|
349 |
|
if (do_stress) then |
350 |
< |
if (molMembershipList(atom1) .ne. molMembershipList(atom2)) then |
350 |
> |
|
351 |
> |
#ifdef IS_MPI |
352 |
> |
id1 = tagRow(atom1) |
353 |
> |
id2 = tagColumn(atom2) |
354 |
> |
#else |
355 |
> |
id1 = atom1 |
356 |
> |
id2 = atom2 |
357 |
> |
#endif |
358 |
|
|
359 |
+ |
if (molMembershipList(id1) .ne. molMembershipList(id2)) then |
360 |
+ |
|
361 |
|
! because the d vector is the rj - ri vector, and |
362 |
|
! because fxradial, fyradial, and fzradial are the |
363 |
|
! (positive) force on atom i (negative on atom j) we need |