ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/UseTheForce/doForces.F90
(Generate patch)

Comparing trunk/OOPSE-4/src/UseTheForce/doForces.F90 (file contents):
Revision 2350 by chuckv, Mon Oct 10 21:20:46 2005 UTC vs.
Revision 2351 by chuckv, Mon Oct 10 21:34:54 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.51 2005-10-10 21:20:46 chuckv Exp $, $Date: 2005-10-10 21:20:46 $, $Name: not supported by cvs2svn $, $Revision: 1.51 $
48 > !! @version $Id: doForces.F90,v 1.52 2005-10-10 21:34:54 chuckv Exp $, $Date: 2005-10-10 21:34:54 $, $Name: not supported by cvs2svn $, $Revision: 1.52 $
49  
50  
51   module doForces
# Line 265 | Line 265 | contains
265      logical :: GtypeFound
266  
267      integer :: myStatus, nAtypes,  i, j, istart, iend, jstart, jend
268 <    integer :: n_in_i, me_i, ia, g, atom1
268 >    integer :: n_in_i, me_i, ia, g, atom1, ja, n_in_j,me_j
269      integer :: nGroupsInRow
270      integer :: nGroupsInCol
271      integer :: nGroupTypesRow,nGroupTypesCol
# Line 377 | Line 377 | contains
377  
378   #ifdef IS_MPI
379         ! We only allocate new storage if we are in MPI because Ncol /= Nrow
380 <    if(.not.allocated(groupToGtypeCol)) then
380 >    if(.not.associated(groupToGtypeCol)) then
381         allocate(groupToGtypeCol(jend))
382      else
383         deallocate(groupToGtypeCol)
384         allocate(groupToGtypeCol(jend))
385      end if
386  
387 <    if(.not.allocated(groupToGtypeCol)) then
387 >    if(.not.associated(groupToGtypeCol)) then
388         allocate(groupToGtypeCol(jend))
389      else
390         deallocate(groupToGtypeCol)
391         allocate(groupToGtypeCol(jend))
392      end if
393 <    if(.not.allocated(gtypeMaxCutoffCol)) then
393 >    if(.not.associated(gtypeMaxCutoffCol)) then
394         allocate(gtypeMaxCutoffCol(jend))
395      else
396         deallocate(gtypeMaxCutoffCol)      

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines