ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/do_Forces.F90
(Generate patch)

Comparing trunk/OOPSE/libmdtools/do_Forces.F90 (file contents):
Revision 895 by chuckv, Mon Jan 5 22:12:11 2004 UTC vs.
Revision 897 by chuckv, Mon Jan 5 22:18:52 2004 UTC

# Line 4 | Line 4
4  
5   !! @author Charles F. Vardeman II
6   !! @author Matthew Meineke
7 < !! @version $Id: do_Forces.F90,v 1.42 2004-01-05 22:12:11 chuckv Exp $, $Date: 2004-01-05 22:12:11 $, $Name: not supported by cvs2svn $, $Revision: 1.42 $
7 > !! @version $Id: do_Forces.F90,v 1.43 2004-01-05 22:18:52 chuckv Exp $, $Date: 2004-01-05 22:18:52 $, $Name: not supported by cvs2svn $, $Revision: 1.43 $
8  
9   module do_Forces
10    use force_globals
# Line 228 | Line 228 | contains
228      real( kind = DP ) ::  rijsq
229      real(kind=dp),dimension(3) :: d
230      real(kind=dp) :: rfpot, mu_i, virial
231 <    integer :: me_i
231 >    integer :: me_i, me_j
232      logical :: is_dp_i
233      integer :: neighborListSize
234      integer :: listerror, error
235      integer :: localError
236 +    integer :: propPack_i, propPack_j
237  
238      real(kind=dp) :: listSkin = 1.0  
239  
# Line 262 | Line 263 | contains
263  
264   #ifdef IS_MPI
265      if (.not.allocated(propertyMapI)) then
266 <       allocate(propertyMapI(5,getNrow())
266 >       allocate(propertyMapI(5,nrow))
267      endif
268  
269      do i = 1, nrow
270         me_i = atid_row(i)
271   #else
272      if (.not.allocated(propertyMapI)) then
273 <       allocate(propertyMapI(5,getNlocal())
273 >       allocate(propertyMapI(5,nlocal))
274      endif
275  
276      do i = 1, natoms
# Line 297 | Line 298 | contains
298  
299   #ifdef IS_MPI
300      if (.not.allocated(propertyMapJ)) then
301 <       allocate(propertyMapJ(5,getNcol())
301 >       allocate(propertyMapJ(5,ncol))
302      endif
303  
304      do j = 1, ncol
305         me_j = atid_col(j)
306   #else
307      if (.not.allocated(propertyMapJ)) then
308 <       allocate(propertyMapJ(5,getNlocal())
308 >       allocate(propertyMapJ(5,nlocal))
309      endif
310  
311      do j = 1, natoms

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines