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

Comparing trunk/src/nonbonded/InteractionManager.cpp (file contents):
Revision 1935 by gezelter, Tue Sep 24 13:52:54 2013 UTC vs.
Revision 2031 by jmichalk, Fri Oct 31 18:40:40 2014 UTC

#	Line 371 \| Line 371 \| namespace OpenMD {
371		atid1 = atype1->getIdent();
372		for (jt = it; jt != simTypes.end(); ++jt) {
373		atype2 = (*jt);
374	<	atid1 = atype1->getIdent();
374	>	atid2 = atype2->getIdent();
375
376		if (interactions_[atid1][atid2].size() == 0) {
377		sprintf( painCave.errMsg,
#	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