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 2407 by chrisfen, Wed Nov 2 20:35:34 2005 UTC vs.
Revision 2411 by chrisfen, Wed Nov 2 21:01:21 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.66 2005-11-02 20:35:34 chrisfen Exp $, $Date: 2005-11-02 20:35:34 $, $Name: not supported by cvs2svn $, $Revision: 1.66 $
48 > !! @version $Id: doForces.F90,v 1.67 2005-11-02 21:01:18 chrisfen Exp $, $Date: 2005-11-02 21:01:18 $, $Name: not supported by cvs2svn $, $Revision: 1.67 $
49  
50  
51   module doForces
# Line 745 | Line 745 | contains
745      real( kind = DP ) :: sw, dswdr, swderiv, mf
746      real( kind = DP ) :: rVal
747      real(kind=dp),dimension(3) :: d_atm, d_grp, fpair, fij
748    real(kind=dp), dimension(3) :: fstrs, f2strs
748      real(kind=dp) :: rfpot, mu_i, virial
749      integer :: me_i, me_j, n_in_i, n_in_j
750      logical :: is_dp_i
# Line 953 | Line 952 | contains
952   #ifdef IS_MPI                      
953                              call do_pair(atom1, atom2, ratmsq, d_atm, sw, &
954                                   do_pot, eFrame, A, f, t, pot_local, vpair, &
955 <                                 fpair, d_grp, rgrp, fstrs)
955 >                                 fpair, d_grp, rgrp)
956   #else
957                              call do_pair(atom1, atom2, ratmsq, d_atm, sw, &
958                                   do_pot, eFrame, A, f, t, pot, vpair, fpair, &
959 <                                 d_grp, rgrp, fstrs)
959 >                                 d_grp, rgrp)
960   #endif
962                            f2strs(1:3) = f2strs(1:3) + fstrs(1:3)
961                              vij = vij + vpair
962                              fij(1:3) = fij(1:3) + fpair(1:3)
963                           endif
# Line 1165 | Line 1163 | contains
1163      
1164    end subroutine do_force_loop
1165  
1168 !!$  subroutine do_pair(i, j, rijsq, d, sw, do_pot, &
1169 !!$       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, fstrs)
1167 >       eFrame, A, f, t, pot, vpair, fpair, d_grp, r_grp)
1168  
1169      real( kind = dp ) :: vpair, sw
1170      real( kind = dp ), dimension(LR_POT_TYPES) :: pot
1171      real( kind = dp ), dimension(3) :: fpair
1176    real( kind = dp ), dimension(3) :: fstrs
1172      real( kind = dp ), dimension(nLocal)   :: mfact
1173      real( kind = dp ), dimension(9,nLocal) :: eFrame
1174      real( kind = dp ), dimension(9,nLocal) :: A
# Line 1211 | Line 1206 | contains
1206      endif
1207      
1208      if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then
1214 !!$       call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1215 !!$            pot(ELECTROSTATIC_POT), eFrame, f, t, do_pot)
1209         call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, &
1210 <            pot(ELECTROSTATIC_POT), eFrame, f, t, do_pot, fstrs)
1210 >            pot(ELECTROSTATIC_POT), eFrame, f, t, do_pot)
1211      endif
1212      
1213      if ( iand(iHash, STICKY_PAIR).ne.0 ) then

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines