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 3443 by gezelter, Wed Sep 10 17:57:55 2008 UTC vs.
Revision 3444 by cli2, Wed Sep 10 19:40:06 2008 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.95 2008-09-10 17:57:55 gezelter Exp $, $Date: 2008-09-10 17:57:55 $, $Name: not supported by cvs2svn $, $Revision: 1.95 $
48 > !! @version $Id: doForces.F90,v 1.96 2008-09-10 19:40:06 cli2 Exp $, $Date: 2008-09-10 19:40:06 $, $Name: not supported by cvs2svn $, $Revision: 1.96 $
49  
50  
51   module doForces
# Line 1481 | Line 1481 | contains
1481   #endif
1482  
1483      iHash = InteractionHash(me_i, me_j)
1484 +
1485      vdwMult = vdwScale(topoDist)
1486      electroMult = electrostaticScale(topoDist)
1487 <    
1487 >
1488      if ( iand(iHash, LJ_PAIR).ne.0 ) then
1489         call do_lj_pair(i, j, d, r, rijsq, rcut, sw, vdwMult, vpair, fpair, &
1490              pot(VDW_POT), f, do_pot)
# Line 1539 | Line 1540 | contains
1540              pot(VDW_POT), A, f, t, do_pot)
1541      endif
1542  
1542
1543    if (topoDist .ne. 0) then
1544       write(*,*) i, j, vpair, fpair(1), fpair(2), fpair(3)
1545    endif
1546
1543    end subroutine do_pair
1544  
1545    subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, rCut, &

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines