ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/UseTheForce/doForces.F90
(Generate patch)

Comparing trunk/OOPSE-2.0/src/UseTheForce/doForces.F90 (file contents):
Revision 2229 by chrisfen, Tue May 17 22:35:01 2005 UTC vs.
Revision 2231 by chrisfen, Wed May 18 18:31:40 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.17 2005-05-17 22:35:01 chrisfen Exp $, $Date: 2005-05-17 22:35:01 $, $Name: not supported by cvs2svn $, $Revision: 1.17 $
48 > !! @version $Id: doForces.F90,v 1.18 2005-05-18 18:31:40 chrisfen Exp $, $Date: 2005-05-18 18:31:40 $, $Name: not supported by cvs2svn $, $Revision: 1.18 $
49  
50  
51   module doForces
# Line 923 | Line 923 | contains
923      real ( kind = dp ), intent(inout) :: rijsq
924      real ( kind = dp )                :: r
925      real ( kind = dp ), intent(inout) :: d(3)
926 +    real ( kind = dp ) :: ebalance
927      integer :: me_i, me_j
928  
929      r = sqrt(rijsq)
# Line 953 | Line 954 | contains
954         if (PropertyMap(me_i)%is_Electrostatic .and. &
955              PropertyMap(me_j)%is_Electrostatic) then
956            call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
957 <               pot, eFrame, f, t, do_pot)
957 >               pot, eFrame, f, t, do_pot, ebalance)
958         endif
959  
960         if (FF_uses_dipoles .and. SIM_uses_dipoles) then      
# Line 981 | Line 982 | contains
982         if ( PropertyMap(me_i)%is_StickyPower .and. &
983              PropertyMap(me_j)%is_StickyPower) then
984            call do_sticky_power_pair(i, j, d, r, rijsq, sw, vpair, fpair, &
985 <               pot, A, f, t, do_pot)
985 >               pot, A, f, t, do_pot, ebalance)
986         endif
987      endif
988      

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines