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 829 by gezelter, Tue Oct 28 16:03:37 2003 UTC vs.
Revision 872 by chrisfen, Fri Nov 21 19:31:05 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.32 2003-10-28 16:03:35 gezelter Exp $, $Date: 2003-10-28 16:03:35 $, $Name: not supported by cvs2svn $, $Revision: 1.32 $
7 > !! @version $Id: do_Forces.F90,v 1.37 2003-11-21 19:31:05 chrisfen Exp $, $Date: 2003-11-21 19:31:05 $, $Name: not supported by cvs2svn $, $Revision: 1.37 $
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 (1)
133 <          call init_lj_FF(1, my_status)            
134 <       case (2)
135 <          call init_lj_FF(2, my_status)
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)
136         case default
137            write(default_error,*) 'unknown LJ Mixing Policy!'
138            thisStat = -1
# Line 231 | Line 231 | contains
231      integer :: listerror, error
232      integer :: localError
233  
234 <    real(kind=dp) :: listSkin = 1.0
235 <    
234 >    real(kind=dp) :: listSkin = 1.0  
235  
236      !! initialize local variables  
237  
# Line 445 | Line 444 | contains
444   #ifdef IS_MPI
445      
446      if (update_nlist) then
448      
447         !! save current configuration, construct neighbor list,
448         !! and calculate forces
449         call saveNeighborList(nlocal, q)
# Line 511 | Line 509 | contains
509   #else
510      
511      if (update_nlist) then
512 <      
512 >
513         ! save current configuration, contruct neighbor list,
514         ! and calculate forces
515         call saveNeighborList(natoms, q)
# Line 730 | Line 728 | contains
728      endif
729  
730   #endif
733
734
731  
732    end subroutine do_force_loop
733  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines