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

Comparing branches/new_design/OOPSE-4/src/UseTheForce/doForces.F90 (file contents):
Revision 1876 by gezelter, Thu Dec 9 20:42:47 2004 UTC vs.
Revision 1877 by tim, Thu Dec 9 21:15:19 2004 UTC

# Line 4 | Line 4
4  
5   !! @author Charles F. Vardeman II
6   !! @author Matthew Meineke
7 < !! @version $Id: doForces.F90,v 1.5.2.2 2004-12-09 20:42:47 gezelter Exp $, $Date: 2004-12-09 20:42:47 $, $Name: not supported by cvs2svn $, $Revision: 1.5.2.2 $
7 > !! @version $Id: doForces.F90,v 1.5.2.3 2004-12-09 21:15:19 tim Exp $, $Date: 2004-12-09 21:15:19 $, $Name: not supported by cvs2svn $, $Revision: 1.5.2.3 $
8  
9   module doForces
10    use force_globals
# Line 349 | Line 349 | contains
349         endif
350      endif
351  
352 <    if (FF_uses_sticky) then
353 <       call check_sticky_FF(my_status)
354 <       if (my_status /= 0) then
355 <          thisStat = -1
356 <          haveSaneForceField = .false.
357 <          return
358 <       end if
359 <    endif
352 >    !sticky module does not contain check_sticky_FF anymore
353 >    !if (FF_uses_sticky) then
354 >    !   call check_sticky_FF(my_status)
355 >    !   if (my_status /= 0) then
356 >    !      thisStat = -1
357 >    !      haveSaneForceField = .false.
358 >    !      return
359 >    !   end if
360 >    !endif
361  
362      if (FF_uses_EAM) then
363           call init_EAM_FF(my_status)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines