ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/ForceManager.cpp
(Generate patch)

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1811 by gezelter, Mon Oct 22 20:42:10 2012 UTC vs.
Revision 1812 by gezelter, Fri Nov 16 21:18:42 2012 UTC

# Line 819 | Line 819 | namespace OpenMD {
819                fij += fg;
820  
821                if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
822 <                stressTensor -= outProduct( *(idat.d), fg);
823 <                if (doHeatFlux_)
824 <                  fDecomp_->addToHeatFlux(*(idat.d) * dot(fg, vel2));
825 <                
822 >                if (!fDecomp_->skipAtomPair(atomListRow[0],
823 >                                            atomListColumn[0],
824 >                                            cg1, cg2)) {
825 >                  stressTensor -= outProduct( *(idat.d), fg);
826 >                  if (doHeatFlux_)
827 >                    fDecomp_->addToHeatFlux(*(idat.d) * dot(fg, vel2));
828 >                }                
829                }
830            
831                for (ia = atomListRow.begin();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines