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

Comparing trunk/src/brains/ForceManager.cpp (file contents):
Revision 1808 by gezelter, Wed Aug 29 20:17:07 2012 UTC vs.
Revision 1809 by gezelter, Mon Nov 5 19:41:28 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines