[ViewVC] Diff of: OpenMD/trunk/src/nonbonded/InteractionManager.cpp

Comparing trunk/src/nonbonded/InteractionManager.cpp (file contents):
Revision 2005 by gezelter, Wed Jun 11 18:37:56 2014 UTC vs.
Revision 2031 by jmichalk, Fri Oct 31 18:40:40 2014 UTC

#	Line 425 \| Line 425 \| namespace OpenMD {
425
426		int& sHash = sHash_[sdat.atid];
427
428	<	if ((sHash & EAM_INTERACTION) != 0) eam_->calcFunctional(sdat);
428	>	if ((sHash & EAM_INTERACTION) != 0) eam_->calcFunctional(sdat);
429		if ((sHash & SC_INTERACTION) != 0) sc_->calcFunctional(sdat);
430
431		// set<NonBondedInteraction*>::iterator it;

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