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

Comparing branches/development/src/nonbonded/Morse.cpp (file contents):
Revision 1554 by gezelter, Sat Apr 30 02:54:02 2011 UTC vs.
Revision 1571 by gezelter, Fri May 27 16:45:44 2011 UTC

#	Line 147 \| Line 147 \| namespace OpenMD {
147		if (!initialized_) initialize();
148
149		map<pair<AtomType, AtomType>, MorseInteractionData>::iterator it;
150	<	it = MixingMap.find( *(idat.atypes) );
150	>	it = MixingMap.find( idat.atypes );
151		if (it != MixingMap.end()) {
152		MorseInteractionData mixer = (*it).second;
153

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