4 |
|
|
5 |
|
!! @author Charles F. Vardeman II |
6 |
|
!! @author Matthew Meineke |
7 |
< |
!! @version $Id: do_Forces.F90,v 1.11 2003-03-11 23:13:06 gezelter Exp $, $Date: 2003-03-11 23:13:06 $, $Name: not supported by cvs2svn $, $Revision: 1.11 $ |
7 |
> |
!! @version $Id: do_Forces.F90,v 1.12 2003-03-12 15:39:01 gezelter Exp $, $Date: 2003-03-12 15:39:01 $, $Name: not supported by cvs2svn $, $Revision: 1.12 $ |
8 |
|
|
9 |
|
|
10 |
|
|
393 |
|
call getElementProperty(atypes, me_i, "is_LJ", is_LJ_i) |
394 |
|
call getElementProperty(atypes, me_j, "is_LJ", is_LJ_j) |
395 |
|
|
396 |
< |
if ( is_LJ_i .and. is_LJ_j ) call do_lj_pair(i, j, d, r, pot, f) |
396 |
> |
if ( is_LJ_i .and. is_LJ_j ) call do_lj_pair(i, j, d, r, rijsq, pot, f) |
397 |
|
|
398 |
|
call getElementProperty(atypes, me_i, "is_DP", is_DP_i) |
399 |
|
call getElementProperty(atypes, me_j, "is_DP", is_DP_j) |
403 |
|
call do_dipole_pair(i, j, d, r, pot, u_l, f, t) |
404 |
|
|
405 |
|
if (do_reaction_field) then |
406 |
< |
call accumulate_rf(i, j, r_ij) |
406 |
> |
call accumulate_rf(i, j, r) |
407 |
|
endif |
408 |
|
|
409 |
|
endif |
412 |
|
call getElementProperty(atypes, me_j, "is_Sticky", is_Sticky_j) |
413 |
|
|
414 |
|
if ( is_Sticky_i .and. is_Sticky_j ) then |
415 |
< |
call do_sticky_pair(i, j, d, r, pot, u_l, f, t) |
415 |
> |
call do_sticky_pair(i, j, d, r, rijsq, A, pot, f, t) |
416 |
|
endif |
417 |
|
|
418 |
|
|