[ViewVC] Diff of: OpenMD/branches/development/src/brains/ForceManager.cpp

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1760 by gezelter, Thu Jun 21 19:26:46 2012 UTC vs.
Revision 1761 by gezelter, Fri Jun 22 20:01:37 2012 UTC

#	Line 676 \| Line 676 \| namespace OpenMD {
676		idat.pot = &workPot;
677		idat.excludedPot = &exPot;
678		sdat.pot = fDecomp_->getEmbeddingPotential();
679	+	sdat.excludedPot = fDecomp_->getExcludedSelfPotential();
680		idat.vpair = &vpair;
681		idat.dVdFQ1 = &dVdFQ1;
682		idat.dVdFQ2 = &dVdFQ2;
#	Line 886 \| Line 887 \| namespace OpenMD {
887
888		//store the long range potential
889		curSnapshot->setLongRangePotential(lrPot);
890	<
891	<	curSnapshot->setExcludedPotentials(*(fDecomp_->getExcludedPotential()));
890	>
891	>	curSnapshot->setExcludedPotentials(*(fDecomp_->getExcludedSelfPotential()) +
892	>	*(fDecomp_->getExcludedPotential()));
893
894		}
895

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines