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 1787 by gezelter, Wed Aug 29 18:13:11 2012 UTC vs.
Revision 1812 by gezelter, Fri Nov 16 21:18:42 2012 UTC

# Line 44 | Line 44
44   * @file ForceManager.cpp
45   * @author tlin
46   * @date 11/09/2004
47 * @time 10:39am
47   * @version 1.0
48   */
49  
# Line 820 | 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();
# Line 908 | Line 910 | namespace OpenMD {
910        *(fDecomp_->getPairwisePotential());
911  
912      curSnapshot->setLongRangePotential(longRangePotential);
913 +
914 +    // collects single-atom information
915 +    fDecomp_->collectSelfData();
916 +
917 +    longRangePotential = *(fDecomp_->getEmbeddingPotential()) +
918 +      *(fDecomp_->getPairwisePotential());
919 +
920 +    curSnapshot->setLongRangePotential(longRangePotential);
921      
922      curSnapshot->setExcludedPotentials(*(fDecomp_->getExcludedSelfPotential()) +
923                                           *(fDecomp_->getExcludedPotential()));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines