| 45 |
|
|
| 46 |
|
!! @author Charles F. Vardeman II |
| 47 |
|
!! @author Matthew Meineke |
| 48 |
< |
!! @version $Id: doForces.F90,v 1.13 2005-04-15 22:03:37 gezelter Exp $, $Date: 2005-04-15 22:03:37 $, $Name: not supported by cvs2svn $, $Revision: 1.13 $ |
| 48 |
> |
!! @version $Id: doForces.F90,v 1.14 2005-04-21 14:12:19 chrisfen Exp $, $Date: 2005-04-21 14:12:19 $, $Name: not supported by cvs2svn $, $Revision: 1.14 $ |
| 49 |
|
|
| 50 |
|
|
| 51 |
|
module doForces |
| 991 |
|
call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
| 992 |
|
pot, A, f, t, do_pot) |
| 993 |
|
endif |
| 994 |
< |
|
| 994 |
> |
if ( (PropertyMap(me_i)%is_Shape .and. & |
| 995 |
> |
PropertyMap(me_j)%is_LennardJones) .or. & |
| 996 |
> |
(PropertyMap(me_i)%is_LennardJones .and. & |
| 997 |
> |
PropertyMap(me_j)%is_Shape) ) then |
| 998 |
> |
call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
| 999 |
> |
pot, A, f, t, do_pot) |
| 1000 |
> |
endif |
| 1001 |
|
endif |
| 1002 |
|
|
| 1003 |
|
end subroutine do_pair |
