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

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC vs.
Revision 1711 by gezelter, Sat May 19 02:58:35 2012 UTC

#	Line 388 \| Line 388 \| namespace OpenMD {
388		setupCutoffs();
389
390		info_->prepareTopology();
391	+
392	+	doParticlePot_ = info_->getSimParams()->getOutputParticlePotential();
393	+	cerr << "dPP = " << doParticlePot_ << "\n";
394	+
395		}
396
397		ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
#	Line 650 \| Line 654 \| namespace OpenMD {
654		idat.sw = &sw;
655		idat.shiftedPot = (cutoffMethod_ == SHIFTED_POTENTIAL) ? true : false;
656		idat.shiftedForce = (cutoffMethod_ == SHIFTED_FORCE) ? true : false;
657	+	idat.doParticlePot = doParticlePot_;
658	+	sdat.doParticlePot = doParticlePot_;
659
660		loopEnd = PAIR_LOOP;
661		if (info_->requiresPrepair() ) {

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