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 2361 by gezelter, Wed Oct 12 21:00:50 2005 UTC vs.
Revision 2375 by gezelter, Mon Oct 17 19:12:45 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.57 2005-10-12 21:00:45 gezelter Exp $, $Date: 2005-10-12 21:00:45 $, $Name: not supported by cvs2svn $, $Revision: 1.57 $
48 > !! @version $Id: doForces.F90,v 1.59 2005-10-17 19:12:34 gezelter Exp $, $Date: 2005-10-17 19:12:34 $, $Name: not supported by cvs2svn $, $Revision: 1.59 $
49  
50  
51   module doForces
# Line 59 | Line 59 | module doForces
59    use sticky
60    use electrostatic_module
61    use reaction_field_module
62 <  use gb_pair
62 >  use gayberne
63    use shapes
64    use vector_class
65    use eam
# Line 707 | Line 707 | contains
707         end if
708      endif
709  
710    if (FF_uses_GayBerne) then
711       call check_gb_pair_FF(my_status)
712       if (my_status .ne. 0) then
713          thisStat = -1
714          haveSaneForceField = .false.
715          return
716       endif
717    endif
718
710      if (.not. haveNeighborList) then
711         !! Create neighbor lists
712         call expandNeighborList(nLocal, my_status)
# Line 1250 | Line 1241 | contains
1241      endif
1242      
1243      if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then
1244 < !      call do_gblj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1245 < !           pot(VDW_POT), A, f, t, do_pot)
1244 >       call do_gb_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
1245 >            pot(VDW_POT), A, f, t, do_pot)
1246      endif
1247  
1248      if ( iand(iHash, EAM_PAIR).ne.0 ) then      

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines