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

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

#	Line 306 \| Line 306 \| namespace OpenMD {
306
307		if (!initialized_) initialize();
308
309	<	SCInteractionData mixer = MixingMap[ *(idat.atypes) ];
309	>	SCInteractionData mixer = MixingMap[ idat.atypes ];
310
311		RealType rcij = mixer.rCut;
312
#	Line 338 \| Line 338 \| namespace OpenMD {
338
339		if (!initialized_) initialize();
340
341	<	SCAtomData data1 = SCMap[idat.atypes->first];
342	<	SCAtomData data2 = SCMap[idat.atypes->second];
341	>	SCAtomData data1 = SCMap[idat.atypes.first];
342	>	SCAtomData data2 = SCMap[idat.atypes.second];
343
344	<	SCInteractionData mixer = MixingMap[*(idat.atypes)];
344	>	SCInteractionData mixer = MixingMap[idat.atypes];
345
346		RealType rcij = mixer.rCut;
347

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