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 694 by chuckv, Wed Aug 13 21:20:20 2003 UTC vs.
Revision 829 by gezelter, Tue Oct 28 16:03:37 2003 UTC

# Line 4 | Line 4
4  
5   !! @author Charles F. Vardeman II
6   !! @author Matthew Meineke
7 < !! @version $Id: do_Forces.F90,v 1.29 2003-08-13 21:20:20 chuckv Exp $, $Date: 2003-08-13 21:20:20 $, $Name: not supported by cvs2svn $, $Revision: 1.29 $
7 > !! @version $Id: do_Forces.F90,v 1.32 2003-10-28 16:03:35 gezelter Exp $, $Date: 2003-10-28 16:03:35 $, $Name: not supported by cvs2svn $, $Revision: 1.32 $
8  
9   module do_Forces
10    use force_globals
# Line 129 | Line 129 | contains
129      if (FF_uses_LJ) then
130        
131         select case (LJMIXPOLICY)
132 <       case (LB_MIXING_RULE)
133 <          call init_lj_FF(LB_MIXING_RULE, my_status)            
134 <       case (EXPLICIT_MIXING_RULE)
135 <          call init_lj_FF(EXPLICIT_MIXING_RULE, my_status)
132 >       case (1)
133 >          call init_lj_FF(1, my_status)            
134 >       case (2)
135 >          call init_lj_FF(2, my_status)
136         case default
137            write(default_error,*) 'unknown LJ Mixing Policy!'
138            thisStat = -1
# Line 154 | Line 154 | contains
154  
155  
156      if (FF_uses_EAM) then
157 <       call init_EAM_FF(my_status)
157 >         call init_EAM_FF(my_status)
158         if (my_status /= 0) then
159 +          write(*,*) "init_EAM_FF returned a bad status"
160            thisStat = -1
161            return
162         end if
# Line 784 | Line 785 | contains
785         call getElementProperty(atypes, me_j, "is_DP", is_DP_j)
786        
787         if ( is_DP_i .and. is_DP_j ) then
787          
788            call do_dipole_pair(i, j, d, r, rijsq, pot, u_l, f, t, &
789                 do_pot, do_stress)
790            if (FF_uses_RF .and. SimUsesRF()) then
# Line 809 | Line 809 | contains
809  
810      if (FF_uses_GB .and. SimUsesGB()) then
811  
812 +
813         call getElementProperty(atypes, me_i, "is_GB", is_GB_i)
814         call getElementProperty(atypes, me_j, "is_GB", is_GB_j)
815        

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines