ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/calc_LJ_FF.F90
(Generate patch)

Comparing trunk/OOPSE/libmdtools/calc_LJ_FF.F90 (file contents):
Revision 483 by gezelter, Wed Apr 9 04:06:43 2003 UTC vs.
Revision 491 by mmeineke, Fri Apr 11 18:46:37 2003 UTC

# Line 2 | Line 2
2   !! Corresponds to the force field defined in lj_FF.cpp
3   !! @author Charles F. Vardeman II
4   !! @author Matthew Meineke
5 < !! @version $Id: calc_LJ_FF.F90,v 1.4 2003-04-09 04:06:43 gezelter Exp $, $Date: 2003-04-09 04:06:43 $, $Name: not supported by cvs2svn $, $Revision: 1.4 $
5 > !! @version $Id: calc_LJ_FF.F90,v 1.6 2003-04-11 18:46:37 mmeineke Exp $, $Date: 2003-04-11 18:46:37 $, $Name: not supported by cvs2svn $, $Revision: 1.6 $
6  
7   module lj
8    use definitions
# Line 195 | Line 195 | contains
195      real( kind = dp ) :: t6
196      real( kind = dp ) :: t12
197      real( kind = dp ) :: delta
198 +    integer :: id1, id2
199  
200  
201      if (rij.lt.LJ_rcut)  then
# Line 255 | Line 256 | contains
256        
257         if (do_stress) then
258  
259 <          if (molMembershipList(atom1) .ne. molMembershipList(atom2)) then
259 > #ifdef IS_MPI
260 >          id1 = tagRow(atom1)
261 >          id2 = tagColumn(atom2)
262 > #else
263 >          id1 = atom1
264 >          id2 = atom2
265 > #endif
266 >
267 >          if (molMembershipList(id1) .ne. molMembershipList(id2)) then
268 >
269               tau_Temp(1) = tau_Temp(1) + fx * d(1)
270               tau_Temp(2) = tau_Temp(2) + fx * d(2)
271               tau_Temp(3) = tau_Temp(3) + fx * d(3)
# Line 267 | Line 277 | contains
277               tau_Temp(9) = tau_Temp(9) + fz * d(3)
278               virial_Temp = virial_Temp + &
279                    (tau_Temp(1) + tau_Temp(5) + tau_Temp(9))
270          endif
280  
281 +          endif
282         endif
283        
284      endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines