4 |
|
|
5 |
|
!! @author Charles F. Vardeman II |
6 |
|
!! @author Matthew Meineke |
7 |
< |
!! @version $Id: do_Forces.F90,v 1.16 2003-03-12 23:15:46 gezelter Exp $, $Date: 2003-03-12 23:15:46 $, $Name: not supported by cvs2svn $, $Revision: 1.16 $ |
7 |
> |
!! @version $Id: do_Forces.F90,v 1.17 2003-03-13 00:33:18 chuckv Exp $, $Date: 2003-03-13 00:33:18 $, $Name: not supported by cvs2svn $, $Revision: 1.17 $ |
8 |
|
|
9 |
|
|
10 |
|
|
38 |
|
contains |
39 |
|
|
40 |
|
subroutine init_FF(thisStat) |
41 |
< |
|
42 |
< |
integer, intent(out) :: my_status |
43 |
< |
integer :: thisStat = 0 |
41 |
> |
integer, intent(out) :: thisStat |
42 |
> |
integer :: my_status |
43 |
> |
character(len = 100) :: mix_Policy |
44 |
|
|
45 |
|
! be a smarter subroutine. |
46 |
< |
|
47 |
< |
|
48 |
< |
call init_lj_FF(my_status) |
46 |
> |
mix_Policy = "FIXME" |
47 |
> |
thisStat = 0 |
48 |
> |
call init_lj_FF(mix_Policy,my_status) |
49 |
|
if (my_status /= 0) then |
50 |
|
thisStat = -1 |
51 |
|
return |
100 |
|
logical :: is_dp_i |
101 |
|
integer :: neighborListSize |
102 |
|
integer :: listerror, error |
103 |
+ |
integer :: localError |
104 |
|
|
105 |
|
!! initialize local variables |
106 |
|
|
113 |
|
natoms = nlocal |
114 |
|
#endif |
115 |
|
|
116 |
< |
call getRcut(rcut,rcut2=rcutsq) |
116 |
> |
call getRcut(rcut,rc2=rcutsq) |
117 |
|
call getRlist(rlist,rlistsq) |
118 |
|
|
119 |
< |
call check_initialization() |
119 |
> |
call check_initialization(localError) |
120 |
> |
if ( localError .ne. 0 ) then |
121 |
> |
error = -1 |
122 |
> |
return |
123 |
> |
end if |
124 |
|
call zero_work_arrays() |
125 |
|
|
126 |
|
do_pot = do_pot_c |
171 |
|
|
172 |
|
inner: do j = 1, ncol |
173 |
|
|
174 |
< |
if (checkExcludes(i,j)) cycle inner: |
174 |
> |
if (checkExcludes(i,j)) cycle inner |
175 |
|
|
176 |
|
call get_interatomic_vector(q_Row(:,i), q_Col(:,j), d, rijsq) |
177 |
|
|
235 |
|
|
236 |
|
inner: do j = i+1, natoms |
237 |
|
|
238 |
< |
if (checkExcludes(i,j)) cycle inner: |
238 |
> |
if (checkExcludes(i,j)) cycle inner |
239 |
|
|
240 |
|
call get_interatomic_vector(q(:,i), q(:,j), d, rijsq) |
241 |
|
|
417 |
|
|
418 |
|
logical, intent(inout) :: do_pot, do_stress |
419 |
|
integer, intent(in) :: i, j |
420 |
< |
real ( kind = dp ), intent(in) :: rijsq |
420 |
> |
real ( kind = dp ), intent(inout) :: rijsq |
421 |
|
real ( kind = dp ) :: r |
422 |
|
real ( kind = dp ), intent(inout) :: d(3) |
423 |
|
logical :: is_LJ_i, is_LJ_j |