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 3164 by chuckv, Thu Jul 12 23:21:00 2007 UTC vs.
Revision 3177 by gezelter, Tue Jul 17 21:55:57 2007 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.91 2007-07-12 23:20:00 chuckv Exp $, $Date: 2007-07-12 23:20:00 $, $Name: not supported by cvs2svn $, $Revision: 1.91 $
48 > !! @version $Id: doForces.F90,v 1.92 2007-07-17 21:55:56 gezelter Exp $, $Date: 2007-07-17 21:55:56 $, $Name: not supported by cvs2svn $, $Revision: 1.92 $
49  
50  
51   module doForces
# Line 1185 | Line 1185 | contains
1185                              endif                            
1186                           enddo
1187                        endif
1188 +                      !if (do_stress.and.(.not.SIM_uses_AtomicVirial)) then
1189 +                      !   call add_stress_tensor(d_grp, fij, tau)
1190 +                      !endif
1191                     endif
1192                  endif
1193               endif
# Line 1508 | Line 1511 | contains
1511              pot(METALLIC_POT), f, do_pot)
1512      endif
1513      
1514 +    if ( iand(iHash, MNM_PAIR).ne.0 ) then      
1515 +       call do_mnm_pair(i, j, d, r, rijsq, rcut, sw, vpair, fpair, &
1516 +            pot(VDW_POT), A, f, t, do_pot)
1517 +    endif
1518 +
1519    end subroutine do_pair
1520  
1521    subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, rCut, &

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines