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

Comparing branches/development/src/nonbonded/InteractionManager.cpp (file contents):
Revision 1553 by gezelter, Wed Apr 27 21:49:59 2011 UTC vs.
Revision 1554 by gezelter, Sat Apr 30 02:54:02 2011 UTC

#	Line 491 \| Line 491 \| namespace OpenMD {
491
492		set<NonBondedInteraction*>::iterator it;
493
494	<	for (it = interactions_[idat.atypes].begin();
495	<	it != interactions_[idat.atypes].end(); ++it){
494	>	for (it = interactions_[ *(idat.atypes) ].begin();
495	>	it != interactions_[ *(idat.atypes) ].end(); ++it){
496		if ((*it)->getFamily() == METALLIC_FAMILY) {
497		dynamic_cast<MetallicInteraction>(it)->calcDensity(idat);
498		}
#	Line 523 \| Line 523 \| namespace OpenMD {
523
524		set<NonBondedInteraction*>::iterator it;
525
526	<	for (it = interactions_[idat.atypes].begin();
527	<	it != interactions_[idat.atypes].end(); ++it)
526	>	for (it = interactions_[ *(idat.atypes) ].begin();
527	>	it != interactions_[ *(idat.atypes) ].end(); ++it)
528		(*it)->calcForce(idat);
529
530		return;
#	Line 536 \| Line 536 \| namespace OpenMD {
536
537		set<NonBondedInteraction*>::iterator it;
538
539	<	for (it = interactions_[idat.atypes].begin();
540	<	it != interactions_[idat.atypes].end(); ++it){
539	>	for (it = interactions_[ *(idat.atypes) ].begin();
540	>	it != interactions_[ *(idat.atypes) ].end(); ++it){
541		if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
542		dynamic_cast<ElectrostaticInteraction>(it)->calcSkipCorrection(idat);
543		}

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