[ViewVC] Diff of: OpenMD/trunk/src/io/DumpReader.cpp

Comparing trunk/src/io/DumpReader.cpp (file contents):
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC vs.
Revision 2069 by gezelter, Thu Mar 5 16:30:23 2015 UTC

#	Line 103 \| Line 103 \| namespace OpenMD {
103		#ifdef IS_MPI
104
105		if (worldRank == 0) {
106	<	#endif
107	<
106	>	#endif
107	>
108		delete inFile_;
109
110		#ifdef IS_MPI
#	Line 245 \| Line 245 \| namespace OpenMD {
245		readSet(whichFrame);
246
247		if (needCOMprops_) {
248	–	Snapshot* s = info_->getSnapshotManager()->getCurrentSnapshot();
248		Thermo thermo(info_);
249		Vector3d com;
250
#	Line 510 \| Line 509 \| namespace OpenMD {
509		sd->setElectricField(eField);
510		break;
511		}
512	+	case 's' : {
513	+
514	+	RealType sPot;
515	+	sPot = tokenizer.nextTokenAsDouble();
516	+	sd->setSitePotential(sPot);
517	+	break;
518	+	}
519		default: {
520		sprintf(painCave.errMsg,
521		"DumpReader Error: %s is an unrecognized type\n", type.c_str());
#	Line 612 \| Line 618 \| namespace OpenMD {
618		sd->setElectricField(eField);
619		break;
620		}
621	+	case 's' : {
622	+
623	+	RealType sPot;
624	+	sPot = tokenizer.nextTokenAsDouble();
625	+	sd->setSitePotential(sPot);
626	+	break;
627	+	}
628		default: {
629		sprintf(painCave.errMsg,
630		"DumpReader Error: %s is an unrecognized type\n", type.c_str());
#	Line 624 \| Line 637 \| namespace OpenMD {
637		}
638
639
640	<	void DumpReader::readStuntDoubles(std::istream& inputStream) {
640	>	void DumpReader::readStuntDoubles(std::istream& inputStream) {
641
642		inputStream.getline(buffer, bufferSize);
643		std::string line(buffer);

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