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

Comparing branches/development/src/nonbonded/InteractionManager.cpp (file contents):
Revision 1570 by gezelter, Wed May 25 16:20:37 2011 UTC vs.
Revision 1571 by gezelter, Fri May 27 16:45:44 2011 UTC

#	Line 460 \| Line 460 \| namespace OpenMD {
460
461		set<NonBondedInteraction*>::iterator it;
462
463	<	for (it = interactions_[ *(idat.atypes) ].begin();
464	<	it != interactions_[ *(idat.atypes) ].end(); ++it){
463	>	for (it = interactions_[ idat.atypes ].begin();
464	>	it != interactions_[ idat.atypes ].end(); ++it){
465		if ((*it)->getFamily() == METALLIC_FAMILY) {
466		dynamic_cast<MetallicInteraction>(it)->calcDensity(idat);
467		}
#	Line 492 \| Line 492 \| namespace OpenMD {
492
493		set<NonBondedInteraction*>::iterator it;
494
495	<	for (it = interactions_[ *(idat.atypes) ].begin();
496	<	it != interactions_[ *(idat.atypes) ].end(); ++it)
495	>	for (it = interactions_[ idat.atypes ].begin();
496	>	it != interactions_[ idat.atypes ].end(); ++it)
497		(*it)->calcForce(idat);
498
499		return;
#	Line 505 \| Line 505 \| namespace OpenMD {
505
506		set<NonBondedInteraction*>::iterator it;
507
508	<	for (it = interactions_[ *(idat.atypes) ].begin();
509	<	it != interactions_[ *(idat.atypes) ].end(); ++it){
508	>	for (it = interactions_[ idat.atypes ].begin();
509	>	it != interactions_[ idat.atypes ].end(); ++it){
510		if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
511		dynamic_cast<ElectrostaticInteraction>(it)->calcSkipCorrection(idat);
512		}

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