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 2402 by chrisfen, Tue Nov 1 19:09:30 2005 UTC vs.
Revision 2405 by chrisfen, Tue Nov 1 19:24:57 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.64 2005-11-01 19:09:23 chrisfen Exp $, $Date: 2005-11-01 19:09:23 $, $Name: not supported by cvs2svn $, $Revision: 1.64 $
48 > !! @version $Id: doForces.F90,v 1.65 2005-11-01 19:24:54 chrisfen Exp $, $Date: 2005-11-01 19:24:54 $, $Name: not supported by cvs2svn $, $Revision: 1.65 $
49  
50  
51   module doForces
# Line 1163 | Line 1163 | contains
1163  
1164    subroutine do_pair(i, j, rijsq, d, sw, do_pot, &
1165         eFrame, A, f, t, pot, vpair, fpair, d_grp, r_grp)
1166 !!$  subroutine do_pair(i, j, rijsq, d, sw, do_pot, &
1167 !!$       eFrame, A, f, t, pot, vpair, fpair, d_grp, r_grp, felec)
1166  
1167      real( kind = dp ) :: vpair, sw
1168      real( kind = dp ), dimension(LR_POT_TYPES) :: pot
1169      real( kind = dp ), dimension(3) :: fpair
1172    real( kind = dp ), dimension(3) :: felec
1170      real( kind = dp ), dimension(nLocal)   :: mfact
1171      real( kind = dp ), dimension(9,nLocal) :: eFrame
1172      real( kind = dp ), dimension(9,nLocal) :: A
# Line 1209 | Line 1206 | contains
1206      if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1207         call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1208              pot(ELECTROSTATIC_POT), eFrame, f, t, do_pot)
1212 !!$       call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1213 !!$            pot(ELECTROSTATIC_POT), eFrame, f, t, do_pot, felec)
1209      endif
1210      
1211      if ( iand(iHash, STICKY_PAIR).ne.0 ) then

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines