ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/io/DumpWriter.cpp

Comparing:
trunk/src/io/DumpWriter.cpp (file contents), Revision 966 by chrisfen, Fri May 19 21:26:41 2006 UTC vs.
branches/development/src/io/DumpWriter.cpp (file contents), Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
2	>	* Copyright (c) 2009 The University of Notre Dame. All Rights Reserved.
3		*
4		* The University of Notre Dame grants you ("Licensee") a
5		* non-exclusive, royalty free, license to use, modify and
6		* redistribute this software in source and binary code form, provided
7		* that the following conditions are met:
8		*
9	<	* 1. Acknowledgement of the program authors must be made in any
10	<	*    publication of scientific results based in part on use of the
11	<	*    program.  An acceptable form of acknowledgement is citation of
12	<	*    the article in which the program was described (Matthew
13	<	*    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14	<	*    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15	<	*    Parallel Simulation Engine for Molecular Dynamics,"
16	<	*    J. Comput. Chem. 26, pp. 252-271 (2005))
17	<	*
18	<	* 2. Redistributions of source code must retain the above copyright
9	>	* 1. Redistributions of source code must retain the above copyright
10		*    notice, this list of conditions and the following disclaimer.
11		*
12	<	* 3. Redistributions in binary form must reproduce the above copyright
12	>	* 2. Redistributions in binary form must reproduce the above copyright
13		*    notice, this list of conditions and the following disclaimer in the
14		*    documentation and/or other materials provided with the
15		*    distribution.
#	Line 37 | Line 28
28		* arising out of the use of or inability to use software, even if the
29		* University of Notre Dame has been advised of the possibility of
30		* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
35	+	*
36	+	* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37	+	* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	+	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).
39	+	* [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40	+	* [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43		#include "io/DumpWriter.hpp"
44		#include "primitives/Molecule.hpp"
45		#include "utils/simError.h"
46		#include "io/basic_teebuf.hpp"
47	+	#ifdef HAVE_ZLIB
48		#include "io/gzstream.hpp"
49	+	#endif
50		#include "io/Globals.hpp"
51
52	+	#ifdef _MSC_VER
53	+	#define isnan(x) _isnan((x))
54	+	#define isinf(x) (!_finite(x) && !_isnan(x))
55	+	#endif
56	+
57		#ifdef IS_MPI
58		#include <mpi.h>
59	<	#endif //is_mpi
59	>	#endif
60
61	<	namespace oopse {
61	>	using namespace std;
62	>	namespace OpenMD {
63
64		DumpWriter::DumpWriter(SimInfo* info)
65		: info_(info), filename_(info->getDumpFileName()), eorFilename_(info->getFinalConfigFileName()){
66
67		Globals* simParams = info->getSimParams();
68	<	needCompression_ = simParams->getCompressDumpFile();
69	<	needForceVector_ = simParams->getOutputForceVector();
68	>	needCompression_   = simParams->getCompressDumpFile();
69	>	needForceVector_   = simParams->getOutputForceVector();
70	>	needParticlePot_   = simParams->getOutputParticlePotential();
71	>	needFlucQ_         = simParams->getOutputFluctuatingCharges();
72	>	needElectricField_ = simParams->getOutputElectricField();
73	>
74	>	if (needParticlePot_ || needFlucQ_ || needElectricField_) {
75	>	doSiteData_ = true;
76	>	} else {
77	>	doSiteData_ = false;
78	>	}
79	>
80		createDumpFile_ = true;
81		#ifdef HAVE_LIBZ
82		if (needCompression_) {
83	<	filename_ += ".gz";
84	<	eorFilename_ += ".gz";
83	>	filename_ += ".gz";
84	>	eorFilename_ += ".gz";
85		}
86		#endif
87
88		#ifdef IS_MPI
89
90	<	if (worldRank == 0) {
90	>	if (worldRank == 0) {
91		#endif // is_mpi
73	–
92
93	<	dumpFile_ = createOStream(filename_);
93	>	dumpFile_ = createOStream(filename_);
94
95	<	if (!dumpFile_) {
96	<	sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
97	<	filename_.c_str());
98	<	painCave.isFatal = 1;
99	<	simError();
100	<	}
95	>	if (!dumpFile_) {
96	>	sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
97	>	filename_.c_str());
98	>	painCave.isFatal = 1;
99	>	simError();
100	>	}
101
102		#ifdef IS_MPI
103
104	<	}
104	>	}
105
88	–	sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n");
89	–	MPIcheckPoint();
90	–
106		#endif // is_mpi
107
108	<	}
108	>	}
109
110
111		DumpWriter::DumpWriter(SimInfo* info, const std::string& filename)
#	Line 99 | Line 114 | namespace oopse {
114		Globals* simParams = info->getSimParams();
115		eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor";
116
117	<	needCompression_ = simParams->getCompressDumpFile();
118	<	needForceVector_ = simParams->getOutputForceVector();
117	>	needCompression_   = simParams->getCompressDumpFile();
118	>	needForceVector_   = simParams->getOutputForceVector();
119	>	needParticlePot_   = simParams->getOutputParticlePotential();
120	>	needFlucQ_         = simParams->getOutputFluctuatingCharges();
121	>	needElectricField_ = simParams->getOutputElectricField();
122	>
123	>	if (needParticlePot_ || needFlucQ_ || needElectricField_) {
124	>	doSiteData_ = true;
125	>	} else {
126	>	doSiteData_ = false;
127	>	}
128	>
129		createDumpFile_ = true;
130		#ifdef HAVE_LIBZ
131		if (needCompression_) {
132	<	filename_ += ".gz";
133	<	eorFilename_ += ".gz";
132	>	filename_ += ".gz";
133	>	eorFilename_ += ".gz";
134		}
135		#endif
136
137		#ifdef IS_MPI
138
139	<	if (worldRank == 0) {
139	>	if (worldRank == 0) {
140		#endif // is_mpi
141
142
143	<	dumpFile_ = createOStream(filename_);
143	>	dumpFile_ = createOStream(filename_);
144
145	<	if (!dumpFile_) {
146	<	sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
147	<	filename_.c_str());
148	<	painCave.isFatal = 1;
149	<	simError();
150	<	}
145	>	if (!dumpFile_) {
146	>	sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
147	>	filename_.c_str());
148	>	painCave.isFatal = 1;
149	>	simError();
150	>	}
151
152		#ifdef IS_MPI
153
154	<	}
154	>	}
155
131	–	sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n");
132	–	MPIcheckPoint();
133	–
156		#endif // is_mpi
157
158	<	}
158	>	}
159
160		DumpWriter::DumpWriter(SimInfo* info, const std::string& filename, bool writeDumpFile)
161	<	: info_(info), filename_(filename){
161	>	: info_(info), filename_(filename){
162
163		Globals* simParams = info->getSimParams();
164		eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor";
165
166	<	needCompression_ = simParams->getCompressDumpFile();
167	<	needForceVector_ = simParams->getOutputForceVector();
168	<
166	>	needCompression_   = simParams->getCompressDumpFile();
167	>	needForceVector_   = simParams->getOutputForceVector();
168	>	needParticlePot_   = simParams->getOutputParticlePotential();
169	>	needFlucQ_         = simParams->getOutputFluctuatingCharges();
170	>	needElectricField_ = simParams->getOutputElectricField();
171	>
172	>	if (needParticlePot_ || needFlucQ_ || needElectricField_) {
173	>	doSiteData_ = true;
174	>	} else {
175	>	doSiteData_ = false;
176	>	}
177	>
178		#ifdef HAVE_LIBZ
179		if (needCompression_) {
180		filename_ += ".gz";
#	Line 170 | Line 201 | namespace oopse {
201		#ifdef IS_MPI
202
203		}
204	+
205
174	–	sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n");
175	–	MPIcheckPoint();
176	–
206		#endif // is_mpi
207
208		}
180	–
181	–
182	–
183	–
184	–
209
210		DumpWriter::~DumpWriter() {
211
#	Line 190 | Line 214 | namespace oopse {
214		if (worldRank == 0) {
215		#endif // is_mpi
216		if (createDumpFile_){
217	+	writeClosing(*dumpFile_);
218		delete dumpFile_;
219		}
220		#ifdef IS_MPI
#	Line 200 | Line 225 | namespace oopse {
225
226		}
227
228	<	void DumpWriter::writeCommentLine(std::ostream& os, Snapshot* s) {
228	>	void DumpWriter::writeFrameProperties(std::ostream& os, Snapshot* s) {
229
230	<	RealType currentTime;
231	<	Mat3x3d hmat;
232	<	RealType chi;
233	<	RealType integralOfChiDt;
234	<	Mat3x3d eta;
235	<
236	<	currentTime = s->getTime();
230	>	char buffer[1024];
231	>
232	>	os << "    <FrameData>\n";
233	>
234	>	RealType currentTime = s->getTime();
235	>
236	>	if (isinf(currentTime) || isnan(currentTime)) {
237	>	sprintf( painCave.errMsg,
238	>	"DumpWriter detected a numerical error writing the time");
239	>	painCave.isFatal = 1;
240	>	simError();
241	>	}
242	>
243	>	sprintf(buffer, "        Time: %.10g\n", currentTime);
244	>	os << buffer;
245	>
246	>	Mat3x3d hmat;
247		hmat = s->getHmat();
248	<	chi = s->getChi();
249	<	integralOfChiDt = s->getIntegralOfChiDt();
250	<	eta = s->getEta();
248	>
249	>	for (unsigned int i = 0; i < 3; i++) {
250	>	for (unsigned int j = 0; j < 3; j++) {
251	>	if (isinf(hmat(i,j)) || isnan(hmat(i,j))) {
252	>	sprintf( painCave.errMsg,
253	>	"DumpWriter detected a numerical error writing the box");
254	>	painCave.isFatal = 1;
255	>	simError();
256	>	}
257	>	}
258	>	}
259
260	<	os << currentTime << ";\t"
261	<	<< hmat(0, 0) << "\t" << hmat(1, 0) << "\t" << hmat(2, 0) << ";\t"
262	<	<< hmat(0, 1) << "\t" << hmat(1, 1) << "\t" << hmat(2, 1) << ";\t"
263	<	<< hmat(0, 2) << "\t" << hmat(1, 2) << "\t" << hmat(2, 2) << ";\t";
260	>	sprintf(buffer, "        Hmat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
261	>	hmat(0, 0), hmat(1, 0), hmat(2, 0),
262	>	hmat(0, 1), hmat(1, 1), hmat(2, 1),
263	>	hmat(0, 2), hmat(1, 2), hmat(2, 2));
264	>	os << buffer;
265
266	<	//write out additional parameters, such as chi and eta
266	>	pair<RealType, RealType> thermostat = s->getThermostat();
267
268	<	os << chi << "\t" << integralOfChiDt << ";\t";
268	>	if (isinf(thermostat.first)  || isnan(thermostat.first) ||
269	>	isinf(thermostat.second) || isnan(thermostat.second)) {
270	>	sprintf( painCave.errMsg,
271	>	"DumpWriter detected a numerical error writing the thermostat");
272	>	painCave.isFatal = 1;
273	>	simError();
274	>	}
275	>	sprintf(buffer, "  Thermostat: %.10g , %.10g\n", thermostat.first,
276	>	thermostat.second);
277	>	os << buffer;
278
279	<	os << eta(0, 0) << "\t" << eta(1, 0) << "\t" << eta(2, 0) << ";\t"
280	<	<< eta(0, 1) << "\t" << eta(1, 1) << "\t" << eta(2, 1) << ";\t"
281	<	<< eta(0, 2) << "\t" << eta(1, 2) << "\t" << eta(2, 2) << ";";
282	<
283	<	os << "\n";
279	>	Mat3x3d eta;
280	>	eta = s->getBarostat();
281	>
282	>	for (unsigned int i = 0; i < 3; i++) {
283	>	for (unsigned int j = 0; j < 3; j++) {
284	>	if (isinf(eta(i,j)) || isnan(eta(i,j))) {
285	>	sprintf( painCave.errMsg,
286	>	"DumpWriter detected a numerical error writing the barostat");
287	>	painCave.isFatal = 1;
288	>	simError();
289	>	}
290	>	}
291	>	}
292	>
293	>	sprintf(buffer, "    Barostat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
294	>	eta(0, 0), eta(1, 0), eta(2, 0),
295	>	eta(0, 1), eta(1, 1), eta(2, 1),
296	>	eta(0, 2), eta(1, 2), eta(2, 2));
297	>	os << buffer;
298	>
299	>	os << "    </FrameData>\n";
300		}
301
302		void DumpWriter::writeFrame(std::ostream& os) {
234	–	const int BUFFERSIZE = 2000;
235	–	const int MINIBUFFERSIZE = 100;
303
304	<	char tempBuffer[BUFFERSIZE];
305	<	char writeLine[BUFFERSIZE];
304	>	#ifdef IS_MPI
305	>	MPI::Status istatus;
306	>	#endif
307
240	–	Quat4d q;
241	–	Vector3d ji;
242	–	Vector3d pos;
243	–	Vector3d vel;
244	–	Vector3d frc;
245	–	Vector3d trq;
246	–
308		Molecule* mol;
309	<	StuntDouble* integrableObject;
309	>	StuntDouble* sd;
310		SimInfo::MoleculeIterator mi;
311		Molecule::IntegrableObjectIterator ii;
312	<
313	<	int nTotObjects;
253	<	nTotObjects = info_->getNGlobalIntegrableObjects();
312	>	RigidBody::AtomIterator ai;
313	>	Atom* atom;
314
315		#ifndef IS_MPI
316	+	os << "  <Snapshot>\n";
317	+
318	+	writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
319
320	<
258	<	os << nTotObjects << "\n";
259	<
260	<	writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot());
261	<
320	>	os << "    <StuntDoubles>\n";
321		for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
322
323	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
324	<	integrableObject = mol->nextIntegrableObject(ii)) {
325	<
323	>
324	>	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
325	>	sd = mol->nextIntegrableObject(ii)) {
326	>	os << prepareDumpLine(sd);
327	>
328	>	}
329	>	}
330	>	os << "    </StuntDoubles>\n";
331
332	<	pos = integrableObject->getPos();
333	<	vel = integrableObject->getVel();
332	>	if (doSiteData_) {
333	>	os << "    <SiteData>\n";
334	>	for (mol = info_->beginMolecule(mi); mol != NULL;
335	>	mol = info_->nextMolecule(mi)) {
336	>
337	>	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
338	>	sd = mol->nextIntegrableObject(ii)) {
339
340	<	sprintf(tempBuffer, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
341	<	integrableObject->getType().c_str(),
342	<	pos[0], pos[1], pos[2],
274	<	vel[0], vel[1], vel[2]);
340	>	int ioIndex = sd->getGlobalIntegrableObjectIndex();
341	>	// do one for the IO itself
342	>	os << prepareSiteLine(sd, ioIndex, 0);
343
344	<	strcpy(writeLine, tempBuffer);
345	<
346	<	if (integrableObject->isDirectional()) {
347	<	q = integrableObject->getQ();
348	<	ji = integrableObject->getJ();
349	<
350	<	sprintf(tempBuffer, "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
351	<	q[0], q[1], q[2], q[3],
352	<	ji[0], ji[1], ji[2]);
353	<	strcat(writeLine, tempBuffer);
354	<	} else {
355	<	strcat(writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0");
356	<	}
289	<
290	<	if (needForceVector_) {
291	<	frc = integrableObject->getFrc();
292	<	trq = integrableObject->getTrq();
293	<
294	<	sprintf(tempBuffer, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
295	<	frc[0], frc[1], frc[2],
296	<	trq[0], trq[1], trq[2]);
297	<	strcat(writeLine, tempBuffer);
298	<	}
299	<
300	<	strcat(writeLine, "\n");
301	<	os << writeLine;
302	<
303	<	}
344	>	if (sd->isRigidBody()) {
345	>
346	>	RigidBody* rb = static_cast<RigidBody*>(sd);
347	>	int siteIndex = 0;
348	>	for (atom = rb->beginAtom(ai); atom != NULL;
349	>	atom = rb->nextAtom(ai)) {
350	>	os << prepareSiteLine(atom, ioIndex, siteIndex);
351	>	siteIndex++;
352	>	}
353	>	}
354	>	}
355	>	}
356	>	os << "    </SiteData>\n";
357		}
358	+	os << "  </Snapshot>\n";
359
360		os.flush();
361	<	#else // is_mpi
362	<	/*********************************************************************
309	<	* Documentation?  You want DOCUMENTATION?
310	<	*
311	<	* Why all the potatoes below?
312	<	*
313	<	* To make a long story short, the original version of DumpWriter
314	<	* worked in the most inefficient way possible.  Node 0 would
315	<	* poke each of the node for an individual atom's formatted data
316	<	* as node 0 worked its way down the global index. This was particularly
317	<	* inefficient since the method blocked all processors at every atom
318	<	* (and did it twice!).
319	<	*
320	<	* An intermediate version of DumpWriter could be described from Node
321	<	* zero's perspective as follows:
322	<	*
323	<	*  1) Have 100 of your friends stand in a circle.
324	<	*  2) When you say go, have all of them start tossing potatoes at
325	<	*     you (one at a time).
326	<	*  3) Catch the potatoes.
327	<	*
328	<	* It was an improvement, but MPI has buffers and caches that could
329	<	* best be described in this analogy as "potato nets", so there's no
330	<	* need to block the processors atom-by-atom.
331	<	*
332	<	* This new and improved DumpWriter works in an even more efficient
333	<	* way:
334	<	*
335	<	*  1) Have 100 of your friend stand in a circle.
336	<	*  2) When you say go, have them start tossing 5-pound bags of
337	<	*     potatoes at you.
338	<	*  3) Once you've caught a friend's bag of potatoes,
339	<	*     toss them a spud to let them know they can toss another bag.
340	<	*
341	<	* How's THAT for documentation?
342	<	*
343	<	*********************************************************************/
361	>	#else
362	>
363		const int masterNode = 0;
364	+	int worldRank = MPI::COMM_WORLD.Get_rank();
365	+	int nProc = MPI::COMM_WORLD.Get_size();
366
367	<	int * potatoes;
368	<	int myPotato;
369	<	int nProc;
370	<	int which_node;
371	<	RealType atomData[19];
372	<	int isDirectional;
352	<	char MPIatomTypeString[MINIBUFFERSIZE];
353	<	int msgLen; // the length of message actually recieved at master nodes
354	<	int haveError;
355	<	MPI_Status istatus;
356	<	int nCurObj;
357	<
358	<	// code to find maximum tag value
359	<	int * tagub;
360	<	int flag;
361	<	int MAXTAG;
362	<	MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
367	>	if (worldRank == masterNode) {
368	>	os << "  <Snapshot>\n";
369	>	writeFrameProperties(os,
370	>	info_->getSnapshotManager()->getCurrentSnapshot());
371	>	os << "    <StuntDoubles>\n";
372	>	}
373
374	<	if (flag) {
375	<	MAXTAG = *tagub;
376	<	} else {
377	<	MAXTAG = 32767;
374	>	//every node prepares the dump lines for integrable objects belong to itself
375	>	std::string buffer;
376	>	for (mol = info_->beginMolecule(mi); mol != NULL;
377	>	mol = info_->nextMolecule(mi)) {
378	>	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
379	>	sd = mol->nextIntegrableObject(ii)) {
380	>	buffer += prepareDumpLine(sd);
381	>	}
382		}
383	+
384	+	if (worldRank == masterNode) {
385	+	os << buffer;
386	+
387	+	for (int i = 1; i < nProc; ++i) {
388	+	// tell processor i to start sending us data:
389	+	MPI::COMM_WORLD.Bcast(&i, 1, MPI::INT, masterNode);
390
391	<	if (worldRank == masterNode) { //master node (node 0) is responsible for writing the dump file
391	>	// receive the length of the string buffer that was
392	>	// prepared by processor i:
393	>	int recvLength;
394	>	MPI::COMM_WORLD.Recv(&recvLength, 1, MPI::INT, i, MPI::ANY_TAG,
395	>	istatus);
396
397	<	// Node 0 needs a list of the magic potatoes for each processor;
397	>	// create a buffer to receive the data
398	>	char* recvBuffer = new char[recvLength];
399	>	if (recvBuffer == NULL) {
400	>	} else {
401	>	// receive the data:
402	>	MPI::COMM_WORLD.Recv(recvBuffer, recvLength, MPI::CHAR, i,
403	>	MPI::ANY_TAG, istatus);
404	>	// send it to the file:
405	>	os << recvBuffer;
406	>	// get rid of the receive buffer:
407	>	delete [] recvBuffer;
408	>	}
409	>	}
410	>	} else {
411	>	int sendBufferLength = buffer.size() + 1;
412	>	int myturn = 0;
413	>	for (int i = 1; i < nProc; ++i){
414	>	// wait for the master node to call our number:
415	>	MPI::COMM_WORLD.Bcast(&myturn, 1, MPI::INT, masterNode);
416	>	if (myturn == worldRank){
417	>	// send the length of our buffer:
418	>	MPI::COMM_WORLD.Send(&sendBufferLength, 1, MPI::INT, masterNode, 0);
419
420	<	MPI_Comm_size(MPI_COMM_WORLD, &nProc);
421	<	potatoes = new int[nProc];
420	>	// send our buffer:
421	>	MPI::COMM_WORLD.Send((void *)buffer.c_str(), sendBufferLength,
422	>	MPI::CHAR, masterNode, 0);
423	>	}
424	>	}
425	>	}
426	>
427	>	if (worldRank == masterNode) {
428	>	os << "    </StuntDoubles>\n";
429	>	}
430
431	<	//write out the comment lines
432	<	for(int i = 0; i < nProc; i++) {
433	<	potatoes[i] = 0;
431	>	if (doSiteData_) {
432	>	if (worldRank == masterNode) {
433	>	os << "    <SiteData>\n";
434		}
435	+	buffer.clear();
436	+	for (mol = info_->beginMolecule(mi); mol != NULL;
437	+	mol = info_->nextMolecule(mi)) {
438	+
439	+	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
440	+	sd = mol->nextIntegrableObject(ii)) {
441	+
442	+	int ioIndex = sd->getGlobalIntegrableObjectIndex();
443	+	// do one for the IO itself
444	+	buffer += prepareSiteLine(sd, ioIndex, 0);
445
446	+	if (sd->isRigidBody()) {
447	+
448	+	RigidBody* rb = static_cast<RigidBody*>(sd);
449	+	int siteIndex = 0;
450	+	for (atom = rb->beginAtom(ai); atom != NULL;
451	+	atom = rb->nextAtom(ai)) {
452	+	buffer += prepareSiteLine(atom, ioIndex, siteIndex);
453	+	siteIndex++;
454	+	}
455	+	}
456	+	}
457	+	}
458
459	<	os << nTotObjects << "\n";
460	<	writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot());
459	>	if (worldRank == masterNode) {
460	>	os << buffer;
461	>
462	>	for (int i = 1; i < nProc; ++i) {
463	>
464	>	// tell processor i to start sending us data:
465	>	MPI::COMM_WORLD.Bcast(&i, 1, MPI::INT, masterNode);
466	>
467	>	// receive the length of the string buffer that was
468	>	// prepared by processor i:
469	>	int recvLength;
470	>	MPI::COMM_WORLD.Recv(&recvLength, 1, MPI::INT, i, MPI::ANY_TAG,
471	>	istatus);
472	>
473	>	// create a buffer to receive the data
474	>	char* recvBuffer = new char[recvLength];
475	>	if (recvBuffer == NULL) {
476	>	} else {
477	>	// receive the data:
478	>	MPI::COMM_WORLD.Recv(recvBuffer, recvLength, MPI::CHAR, i,
479	>	MPI::ANY_TAG, istatus);
480	>	// send it to the file:
481	>	os << recvBuffer;
482	>	// get rid of the receive buffer:
483	>	delete [] recvBuffer;
484	>	}
485	>	}
486	>	} else {
487	>	int sendBufferLength = buffer.size() + 1;
488	>	int myturn = 0;
489	>	for (int i = 1; i < nProc; ++i){
490	>	// wait for the master node to call our number:
491	>	MPI::COMM_WORLD.Bcast(&myturn, 1, MPI::INT, masterNode);
492	>	if (myturn == worldRank){
493	>	// send the length of our buffer:
494	>	MPI::COMM_WORLD.Send(&sendBufferLength, 1, MPI::INT, masterNode, 0);
495	>	// send our buffer:
496	>	MPI::COMM_WORLD.Send((void *)buffer.c_str(), sendBufferLength,
497	>	MPI::CHAR, masterNode, 0);
498	>	}
499	>	}
500	>	}
501	>
502	>	if (worldRank == masterNode) {
503	>	os << "    </SiteData>\n";
504	>	}
505	>	}
506	>
507	>	if (worldRank == masterNode) {
508	>	os << "  </Snapshot>\n";
509	>	os.flush();
510	>	}
511	>
512	>	#endif // is_mpi
513	>
514	>	}
515
516	<	for(int i = 0; i < info_->getNGlobalMolecules(); i++) {
516	>	std::string DumpWriter::prepareDumpLine(StuntDouble* sd) {
517	>
518	>	int index = sd->getGlobalIntegrableObjectIndex();
519	>	std::string type("pv");
520	>	std::string line;
521	>	char tempBuffer[4096];
522
523	<	// Get the Node number which has this atom;
523	>	Vector3d pos;
524	>	Vector3d vel;
525	>	pos = sd->getPos();
526
527	<	which_node = info_->getMolToProc(i);
527	>	if (isinf(pos[0]) || isnan(pos[0]) ||
528	>	isinf(pos[1]) || isnan(pos[1]) ||
529	>	isinf(pos[2]) || isnan(pos[2]) ) {
530	>	sprintf( painCave.errMsg,
531	>	"DumpWriter detected a numerical error writing the position"
532	>	" for object %d", index);
533	>	painCave.isFatal = 1;
534	>	simError();
535	>	}
536
537	<	if (which_node != masterNode) { //current molecule is in slave node
393	<	if (potatoes[which_node] + 1 >= MAXTAG) {
394	<	// The potato was going to exceed the maximum value,
395	<	// so wrap this processor potato back to 0:
537	>	vel = sd->getVel();
538
539	<	potatoes[which_node] = 0;
540	<	MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0,
541	<	MPI_COMM_WORLD);
542	<	}
543	<
544	<	myPotato = potatoes[which_node];
539	>	if (isinf(vel[0]) || isnan(vel[0]) ||
540	>	isinf(vel[1]) || isnan(vel[1]) ||
541	>	isinf(vel[2]) || isnan(vel[2]) ) {
542	>	sprintf( painCave.errMsg,
543	>	"DumpWriter detected a numerical error writing the velocity"
544	>	" for object %d", index);
545	>	painCave.isFatal = 1;
546	>	simError();
547	>	}
548
549	<	//recieve the number of integrableObject in current molecule
550	<	MPI_Recv(&nCurObj, 1, MPI_INT, which_node, myPotato,
551	<	MPI_COMM_WORLD, &istatus);
552	<	myPotato++;
549	>	sprintf(tempBuffer, "%18.10g %18.10g %18.10g %13e %13e %13e",
550	>	pos[0], pos[1], pos[2],
551	>	vel[0], vel[1], vel[2]);
552	>	line += tempBuffer;
553
554	<	for(int l = 0; l < nCurObj; l++) {
555	<	if (potatoes[which_node] + 2 >= MAXTAG) {
556	<	// The potato was going to exceed the maximum value,
557	<	// so wrap this processor potato back to 0:
554	>	if (sd->isDirectional()) {
555	>	type += "qj";
556	>	Quat4d q;
557	>	Vector3d ji;
558	>	q = sd->getQ();
559
560	<	potatoes[which_node] = 0;
561	<	MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node,
562	<	0, MPI_COMM_WORLD);
563	<	}
560	>	if (isinf(q[0]) || isnan(q[0]) ||
561	>	isinf(q[1]) || isnan(q[1]) ||
562	>	isinf(q[2]) || isnan(q[2]) ||
563	>	isinf(q[3]) || isnan(q[3]) ) {
564	>	sprintf( painCave.errMsg,
565	>	"DumpWriter detected a numerical error writing the quaternion"
566	>	" for object %d", index);
567	>	painCave.isFatal = 1;
568	>	simError();
569	>	}
570
571	<	MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR,
420	<	which_node, myPotato, MPI_COMM_WORLD,
421	<	&istatus);
571	>	ji = sd->getJ();
572
573	<	myPotato++;
573	>	if (isinf(ji[0]) || isnan(ji[0]) ||
574	>	isinf(ji[1]) || isnan(ji[1]) ||
575	>	isinf(ji[2]) || isnan(ji[2]) ) {
576	>	sprintf( painCave.errMsg,
577	>	"DumpWriter detected a numerical error writing the angular"
578	>	" momentum for object %d", index);
579	>	painCave.isFatal = 1;
580	>	simError();
581	>	}
582
583	<	MPI_Recv(atomData, 19, MPI_REALTYPE, which_node, myPotato,
584	<	MPI_COMM_WORLD, &istatus);
585	<	myPotato++;
583	>	sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e %13e",
584	>	q[0], q[1], q[2], q[3],
585	>	ji[0], ji[1], ji[2]);
586	>	line += tempBuffer;
587	>	}
588
589	<	MPI_Get_count(&istatus, MPI_REALTYPE, &msgLen);
589	>	if (needForceVector_) {
590	>	type += "f";
591	>	Vector3d frc = sd->getFrc();
592	>	if (isinf(frc[0]) || isnan(frc[0]) ||
593	>	isinf(frc[1]) || isnan(frc[1]) ||
594	>	isinf(frc[2]) || isnan(frc[2]) ) {
595	>	sprintf( painCave.errMsg,
596	>	"DumpWriter detected a numerical error writing the force"
597	>	" for object %d", index);
598	>	painCave.isFatal = 1;
599	>	simError();
600	>	}
601	>	sprintf(tempBuffer, " %13e %13e %13e",
602	>	frc[0], frc[1], frc[2]);
603	>	line += tempBuffer;
604	>
605	>	if (sd->isDirectional()) {
606	>	type += "t";
607	>	Vector3d trq = sd->getTrq();
608	>	if (isinf(trq[0]) || isnan(trq[0]) ||
609	>	isinf(trq[1]) || isnan(trq[1]) ||
610	>	isinf(trq[2]) || isnan(trq[2]) ) {
611	>	sprintf( painCave.errMsg,
612	>	"DumpWriter detected a numerical error writing the torque"
613	>	" for object %d", index);
614	>	painCave.isFatal = 1;
615	>	simError();
616	>	}
617	>	sprintf(tempBuffer, " %13e %13e %13e",
618	>	trq[0], trq[1], trq[2]);
619	>	line += tempBuffer;
620	>	}
621	>	}
622
623	<	if (msgLen == 13 || msgLen == 19)
624	<	isDirectional = 1;
625	<	else
434	<	isDirectional = 0;
623	>	sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str());
624	>	return std::string(tempBuffer);
625	>	}
626
627	<	// If we've survived to here, format the line:
627	>	std::string DumpWriter::prepareSiteLine(StuntDouble* sd, int ioIndex, int siteIndex) {
628	>
629
630	<	if (!isDirectional) {
631	<	sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
632	<	MPIatomTypeString, atomData[0],
633	<	atomData[1], atomData[2],
442	<	atomData[3], atomData[4],
443	<	atomData[5]);
630	>	std::string id;
631	>	std::string type;
632	>	std::string line;
633	>	char tempBuffer[4096];
634
635	<	strcat(writeLine,
636	<	"0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0");
637	<	} else {
638	<	sprintf(writeLine,
639	<	"%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
640	<	MPIatomTypeString,
641	<	atomData[0],
642	<	atomData[1],
643	<	atomData[2],
644	<	atomData[3],
645	<	atomData[4],
646	<	atomData[5],
647	<	atomData[6],
648	<	atomData[7],
649	<	atomData[8],
650	<	atomData[9],
651	<	atomData[10],
652	<	atomData[11],
653	<	atomData[12]);
654	<	}
655	<
656	<	if (needForceVector_) {
657	<	if (!isDirectional) {
658	<	sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
659	<	atomData[6],
660	<	atomData[7],
661	<	atomData[8],
662	<	atomData[9],
663	<	atomData[10],
664	<	atomData[11]);
665	<	} else {
476	<	sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
477	<	atomData[13],
478	<	atomData[14],
479	<	atomData[15],
480	<	atomData[16],
481	<	atomData[17],
482	<	atomData[18]);
483	<	}
484	<	}
635	>	if (sd->isRigidBody()) {
636	>	sprintf(tempBuffer, "%10d           ", ioIndex);
637	>	id = std::string(tempBuffer);
638	>	} else {
639	>	sprintf(tempBuffer, "%10d %10d", ioIndex, siteIndex);
640	>	id = std::string(tempBuffer);
641	>	}
642	>
643	>	if (needFlucQ_) {
644	>	type += "cw";
645	>	RealType fqPos = sd->getFlucQPos();
646	>	if (isinf(fqPos) || isnan(fqPos) ) {
647	>	sprintf( painCave.errMsg,
648	>	"DumpWriter detected a numerical error writing the"
649	>	" fluctuating charge for object %s", id.c_str());
650	>	painCave.isFatal = 1;
651	>	simError();
652	>	}
653	>	sprintf(tempBuffer, " %13e ", fqPos);
654	>	line += tempBuffer;
655	>
656	>	RealType fqVel = sd->getFlucQVel();
657	>	if (isinf(fqVel) || isnan(fqVel) ) {
658	>	sprintf( painCave.errMsg,
659	>	"DumpWriter detected a numerical error writing the"
660	>	" fluctuating charge velocity for object %s", id.c_str());
661	>	painCave.isFatal = 1;
662	>	simError();
663	>	}
664	>	sprintf(tempBuffer, " %13e ", fqVel);
665	>	line += tempBuffer;
666
667	<	os << writeLine << "\n";
667	>	if (needForceVector_) {
668	>	type += "g";
669	>	RealType fqFrc = sd->getFlucQFrc();
670	>	if (isinf(fqFrc) || isnan(fqFrc) ) {
671	>	sprintf( painCave.errMsg,
672	>	"DumpWriter detected a numerical error writing the"
673	>	" fluctuating charge force for object %s", id.c_str());
674	>	painCave.isFatal = 1;
675	>	simError();
676	>	}
677	>	sprintf(tempBuffer, " %13e ", fqFrc);
678	>	line += tempBuffer;
679	>	}
680	>	}
681
682	<	} // end for(int l =0)
682	>	if (needElectricField_) {
683	>	type += "e";
684	>	Vector3d eField= sd->getElectricField();
685	>	if (isinf(eField[0]) || isnan(eField[0]) ||
686	>	isinf(eField[1]) || isnan(eField[1]) ||
687	>	isinf(eField[2]) || isnan(eField[2]) ) {
688	>	sprintf( painCave.errMsg,
689	>	"DumpWriter detected a numerical error writing the electric"
690	>	" field for object %s", id.c_str());
691	>	painCave.isFatal = 1;
692	>	simError();
693	>	}
694	>	sprintf(tempBuffer, " %13e %13e %13e",
695	>	eField[0], eField[1], eField[2]);
696	>	line += tempBuffer;
697	>	}
698
490	–	potatoes[which_node] = myPotato;
491	–	} else { //master node has current molecule
699
700	<	mol = info_->getMoleculeByGlobalIndex(i);
701	<
702	<	if (mol == NULL) {
703	<	sprintf(painCave.errMsg, "Molecule not found on node %d!", worldRank);
704	<	painCave.isFatal = 1;
705	<	simError();
706	<	}
707	<
708	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
502	<	integrableObject = mol->nextIntegrableObject(ii)) {
503	<
504	<	pos = integrableObject->getPos();
505	<	vel = integrableObject->getVel();
506	<
507	<	atomData[0] = pos[0];
508	<	atomData[1] = pos[1];
509	<	atomData[2] = pos[2];
510	<
511	<	atomData[3] = vel[0];
512	<	atomData[4] = vel[1];
513	<	atomData[5] = vel[2];
514	<
515	<	isDirectional = 0;
516	<
517	<	if (integrableObject->isDirectional()) {
518	<	isDirectional = 1;
519	<
520	<	q = integrableObject->getQ();
521	<	ji = integrableObject->getJ();
522	<
523	<	for(int j = 0; j < 6; j++) {
524	<	atomData[j] = atomData[j];
525	<	}
526	<
527	<	atomData[6] = q[0];
528	<	atomData[7] = q[1];
529	<	atomData[8] = q[2];
530	<	atomData[9] = q[3];
531	<
532	<	atomData[10] = ji[0];
533	<	atomData[11] = ji[1];
534	<	atomData[12] = ji[2];
535	<	}
536	<
537	<	if (needForceVector_) {
538	<	frc = integrableObject->getFrc();
539	<	trq = integrableObject->getTrq();
540	<
541	<	if (!isDirectional) {
542	<	atomData[6] = frc[0];
543	<	atomData[7] = frc[1];
544	<	atomData[8] = frc[2];
545	<	atomData[9] = trq[0];
546	<	atomData[10] = trq[1];
547	<	atomData[11] = trq[2];
548	<	} else {
549	<	atomData[13] = frc[0];
550	<	atomData[14] = frc[1];
551	<	atomData[15] = frc[2];
552	<	atomData[16] = trq[0];
553	<	atomData[17] = trq[1];
554	<	atomData[18] = trq[2];
555	<	}
556	<	}
557	<
558	<	// If we've survived to here, format the line:
559	<
560	<	if (!isDirectional) {
561	<	sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
562	<	integrableObject->getType().c_str(), atomData[0],
563	<	atomData[1], atomData[2],
564	<	atomData[3], atomData[4],
565	<	atomData[5]);
566	<
567	<	strcat(writeLine,
568	<	"0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0");
569	<	} else {
570	<	sprintf(writeLine,
571	<	"%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
572	<	integrableObject->getType().c_str(),
573	<	atomData[0],
574	<	atomData[1],
575	<	atomData[2],
576	<	atomData[3],
577	<	atomData[4],
578	<	atomData[5],
579	<	atomData[6],
580	<	atomData[7],
581	<	atomData[8],
582	<	atomData[9],
583	<	atomData[10],
584	<	atomData[11],
585	<	atomData[12]);
586	<	}
587	<
588	<	if (needForceVector_) {
589	<	if (!isDirectional) {
590	<	sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
591	<	atomData[6],
592	<	atomData[7],
593	<	atomData[8],
594	<	atomData[9],
595	<	atomData[10],
596	<	atomData[11]);
597	<	} else {
598	<	sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
599	<	atomData[13],
600	<	atomData[14],
601	<	atomData[15],
602	<	atomData[16],
603	<	atomData[17],
604	<	atomData[18]);
605	<	}
606	<	}
607	<
608	<	os << writeLine << "\n";
609	<
610	<	} //end for(iter = integrableObject.begin())
611	<	}
612	<	} //end for(i = 0; i < mpiSim->getNmol())
613	<
614	<	os.flush();
615	<
616	<	sprintf(checkPointMsg, "Sucessfully took a dump.\n");
617	<	MPIcheckPoint();
618	<
619	<	delete [] potatoes;
620	<	} else {
621	<
622	<	// worldRank != 0, so I'm a remote node.
623	<
624	<	// Set my magic potato to 0:
625	<
626	<	myPotato = 0;
627	<
628	<	for(int i = 0; i < info_->getNGlobalMolecules(); i++) {
629	<
630	<	// Am I the node which has this integrableObject?
631	<	int whichNode = info_->getMolToProc(i);
632	<	if (whichNode == worldRank) {
633	<	if (myPotato + 1 >= MAXTAG) {
634	<
635	<	// The potato was going to exceed the maximum value,
636	<	// so wrap this processor potato back to 0 (and block until
637	<	// node 0 says we can go:
638	<
639	<	MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD,
640	<	&istatus);
641	<	}
642	<
643	<	mol = info_->getMoleculeByGlobalIndex(i);
644	<
645	<
646	<	nCurObj = mol->getNIntegrableObjects();
647	<
648	<	MPI_Send(&nCurObj, 1, MPI_INT, 0, myPotato, MPI_COMM_WORLD);
649	<	myPotato++;
650	<
651	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
652	<	integrableObject = mol->nextIntegrableObject(ii)) {
653	<
654	<	if (myPotato + 2 >= MAXTAG) {
655	<
656	<	// The potato was going to exceed the maximum value,
657	<	// so wrap this processor potato back to 0 (and block until
658	<	// node 0 says we can go:
659	<
660	<	MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD,
661	<	&istatus);
662	<	}
663	<
664	<	pos = integrableObject->getPos();
665	<	vel = integrableObject->getVel();
666	<
667	<	atomData[0] = pos[0];
668	<	atomData[1] = pos[1];
669	<	atomData[2] = pos[2];
670	<
671	<	atomData[3] = vel[0];
672	<	atomData[4] = vel[1];
673	<	atomData[5] = vel[2];
674	<
675	<	isDirectional = 0;
676	<
677	<	if (integrableObject->isDirectional()) {
678	<	isDirectional = 1;
679	<
680	<	q = integrableObject->getQ();
681	<	ji = integrableObject->getJ();
682	<
683	<	atomData[6] = q[0];
684	<	atomData[7] = q[1];
685	<	atomData[8] = q[2];
686	<	atomData[9] = q[3];
687	<
688	<	atomData[10] = ji[0];
689	<	atomData[11] = ji[1];
690	<	atomData[12] = ji[2];
691	<	}
692	<
693	<	if (needForceVector_) {
694	<	frc = integrableObject->getFrc();
695	<	trq = integrableObject->getTrq();
696	<
697	<	if (!isDirectional) {
698	<	atomData[6] = frc[0];
699	<	atomData[7] = frc[1];
700	<	atomData[8] = frc[2];
701	<
702	<	atomData[9] = trq[0];
703	<	atomData[10] = trq[1];
704	<	atomData[11] = trq[2];
705	<	} else {
706	<	atomData[13] = frc[0];
707	<	atomData[14] = frc[1];
708	<	atomData[15] = frc[2];
709	<
710	<	atomData[16] = trq[0];
711	<	atomData[17] = trq[1];
712	<	atomData[18] = trq[2];
713	<	}
714	<	}
715	<
716	<	strncpy(MPIatomTypeString, integrableObject->getType().c_str(), MINIBUFFERSIZE);
717	<
718	<	// null terminate the  std::string before sending (just in case):
719	<	MPIatomTypeString[MINIBUFFERSIZE - 1] = '\0';
720	<
721	<	MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
722	<	myPotato, MPI_COMM_WORLD);
723	<
724	<	myPotato++;
725	<
726	<	if (isDirectional && needForceVector_) {
727	<	MPI_Send(atomData, 19, MPI_REALTYPE, 0, myPotato,
728	<	MPI_COMM_WORLD);
729	<	} else if (isDirectional) {
730	<	MPI_Send(atomData, 13, MPI_REALTYPE, 0, myPotato,
731	<	MPI_COMM_WORLD);
732	<	} else if (needForceVector_) {
733	<	MPI_Send(atomData, 12, MPI_REALTYPE, 0, myPotato,
734	<	MPI_COMM_WORLD);
735	<	} else {
736	<	MPI_Send(atomData, 6, MPI_REALTYPE, 0, myPotato,
737	<	MPI_COMM_WORLD);
738	<	}
739	<
740	<	myPotato++;
741	<	}
742	<
743	<	}
744	<
700	>	if (needParticlePot_) {
701	>	type += "u";
702	>	RealType particlePot = sd->getParticlePot();
703	>	if (isinf(particlePot) || isnan(particlePot)) {
704	>	sprintf( painCave.errMsg,
705	>	"DumpWriter detected a numerical error writing the particle "
706	>	" potential for object %s", id.c_str());
707	>	painCave.isFatal = 1;
708	>	simError();
709		}
710	<	sprintf(checkPointMsg, "Sucessfully took a dump.\n");
711	<	MPIcheckPoint();
710	>	sprintf(tempBuffer, " %13e", particlePot);
711	>	line += tempBuffer;
712		}
713	+
714
715	<	#endif // is_mpi
716	<
715	>	sprintf(tempBuffer, "%s %7s %s\n", id.c_str(), type.c_str(), line.c_str());
716	>	return std::string(tempBuffer);
717		}
718
719		void DumpWriter::writeDump() {
#	Line 761 | Line 726 | namespace oopse {
726		#ifdef IS_MPI
727		if (worldRank == 0) {
728		#endif // is_mpi
729	<
729	>
730		eorStream = createOStream(eorFilename_);
731	<
731	>	writeFrame(*eorStream);
732	>
733		#ifdef IS_MPI
734		}
769	–	#endif // is_mpi
770	–
771	–	writeFrame(*eorStream);
772	–
773	–	#ifdef IS_MPI
735		if (worldRank == 0) {
736		#endif // is_mpi
776	–	delete eorStream;
737
738	+	writeClosing(*eorStream);
739	+	delete eorStream;
740	+
741		#ifdef IS_MPI
742		}
743		#endif // is_mpi
#	Line 807 | Line 770 | namespace oopse {
770		#ifdef IS_MPI
771		if (worldRank == 0) {
772		#endif // is_mpi
773	<	delete eorStream;
774	<
773	>	writeClosing(*eorStream);
774	>	delete eorStream;
775		#ifdef IS_MPI
776		}
777		#endif // is_mpi
778
779		}
780
781	<	std::ostream* DumpWriter::createOStream(const std::string& filename) {
781	>	std::ostream* DumpWriter::createOStream(const std::string& filename) {
782
783		std::ostream* newOStream;
784	<	#ifdef HAVE_LIBZ
784	>	#ifdef HAVE_ZLIB
785		if (needCompression_) {
786	<	newOStream = new ogzstream(filename.c_str());
786	>	newOStream = new ogzstream(filename.c_str());
787		} else {
788	<	newOStream = new std::ofstream(filename.c_str());
788	>	newOStream = new std::ofstream(filename.c_str());
789		}
790		#else
791		newOStream = new std::ofstream(filename.c_str());
792		#endif
793	+	//write out MetaData first
794	+	(*newOStream) << "<OpenMD version=2>" << std::endl;
795	+	(*newOStream) << "  <MetaData>" << std::endl;
796	+	(*newOStream) << info_->getRawMetaData();
797	+	(*newOStream) << "  </MetaData>" << std::endl;
798		return newOStream;
799	<	}
799	>	}
800
801	<	}//end namespace oopse
801	>	void DumpWriter::writeClosing(std::ostream& os) {
802	>
803	>	os << "</OpenMD>\n";
804	>	os.flush();
805	>	}
806	>
807	>	}//end namespace OpenMD

Comparing:
trunk/src/io/DumpWriter.cpp (property svn:keywords), Revision 966 by chrisfen, Fri May 19 21:26:41 2006 UTC vs.
branches/development/src/io/DumpWriter.cpp (property svn:keywords), Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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