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 726 by chrisfen, Fri Nov 11 15:22:11 2005 UTC vs.
branches/development/src/io/DumpWriter.cpp (file contents), Revision 1878 by gezelter, Thu Jun 13 14:26:09 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
92	+
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	+	}
101
75	–	dumpFile_ = createOStream(filename_);
76	–
77	–	if (!dumpFile_) {
78	–	sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
79	–	filename_.c_str());
80	–	painCave.isFatal = 1;
81	–	simError();
82	–	}
83	–
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_);
144
145	<	dumpFile_ = createOStream(filename_);
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
120	–	if (!dumpFile_) {
121	–	sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
122	–	filename_.c_str());
123	–	painCave.isFatal = 1;
124	–	simError();
125	–	}
126	–
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	+	}
159	+
160	+	DumpWriter::DumpWriter(SimInfo* info, const std::string& filename, bool writeDumpFile)
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	+	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";
181	+	eorFilename_ += ".gz";
182	+	}
183	+	#endif
184	+
185	+	#ifdef IS_MPI
186	+
187	+	if (worldRank == 0) {
188	+	#endif // is_mpi
189	+
190	+	createDumpFile_ = writeDumpFile;
191	+	if (createDumpFile_) {
192	+	dumpFile_ = createOStream(filename_);
193	+
194	+	if (!dumpFile_) {
195	+	sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
196	+	filename_.c_str());
197	+	painCave.isFatal = 1;
198	+	simError();
199	+	}
200	+	}
201	+	#ifdef IS_MPI
202	+
203		}
204
205	+
206	+	#endif // is_mpi
207	+
208	+	}
209	+
210		DumpWriter::~DumpWriter() {
211
212		#ifdef IS_MPI
213
214		if (worldRank == 0) {
215		#endif // is_mpi
216	<
217	<	delete dumpFile_;
218	<
216	>	if (createDumpFile_){
217	>	writeClosing(*dumpFile_);
218	>	delete dumpFile_;
219	>	}
220		#ifdef IS_MPI
221
222		}
#	Line 152 | 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	<	double currentTime;
231	<	Mat3x3d hmat;
232	<	double chi;
233	<	double integralOfChiDt;
234	<	Mat3x3d eta;
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	<	currentTime = s->getTime();
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) {
186	–	const int BUFFERSIZE = 2000;
187	–	const int MINIBUFFERSIZE = 100;
303
304	<	char tempBuffer[BUFFERSIZE];
305	<	char writeLine[BUFFERSIZE];
304	>	#ifdef IS_MPI
305	>	MPI::Status istatus;
306	>	#endif
307
192	–	Quat4d q;
193	–	Vector3d ji;
194	–	Vector3d pos;
195	–	Vector3d vel;
196	–	Vector3d frc;
197	–	Vector3d trq;
198	–
308		Molecule* mol;
309	<	StuntDouble* integrableObject;
309	>	StuntDouble* sd;
310		SimInfo::MoleculeIterator mi;
311		Molecule::IntegrableObjectIterator ii;
312	<
204	<	int nTotObjects;
205	<	nTotObjects = info_->getNGlobalIntegrableObjects();
312	>	RigidBody::AtomIterator ai;
313
314		#ifndef IS_MPI
315	+	os << "  <Snapshot>\n";
316	+
317	+	writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
318
319	+	os << "    <StuntDoubles>\n";
320	+	for (mol = info_->beginMolecule(mi); mol != NULL;
321	+	mol = info_->nextMolecule(mi)) {
322	+
323	+	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
324	+	sd = mol->nextIntegrableObject(ii)) {
325	+	os << prepareDumpLine(sd);
326	+
327	+	}
328	+	}
329	+	os << "    </StuntDoubles>\n";
330
331	<	os << nTotObjects << "\n";
332	<
333	<	writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot());
331	>	if (doSiteData_) {
332	>	os << "    <SiteData>\n";
333	>	for (mol = info_->beginMolecule(mi); mol != NULL;
334	>	mol = info_->nextMolecule(mi)) {
335	>
336	>	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
337	>	sd = mol->nextIntegrableObject(ii)) {
338
339	<	for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
339	>	int ioIndex = sd->getGlobalIntegrableObjectIndex();
340	>	// do one for the IO itself
341	>	os << prepareSiteLine(sd, ioIndex, 0);
342
343	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
344	<	integrableObject = mol->nextIntegrableObject(ii)) {
345	<
343	>	if (sd->isRigidBody()) {
344	>
345	>	RigidBody* rb = static_cast<RigidBody*>(sd);
346	>	int siteIndex = 0;
347	>	for (Atom* atom = rb->beginAtom(ai); atom != NULL;
348	>	atom = rb->nextAtom(ai)) {
349	>	os << prepareSiteLine(atom, ioIndex, siteIndex);
350	>	siteIndex++;
351	>	}
352	>	}
353	>	}
354	>	}
355	>	os << "    </SiteData>\n";
356	>	}
357	>	os << "  </Snapshot>\n";
358
359	<	pos = integrableObject->getPos();
360	<	vel = integrableObject->getVel();
359	>	os.flush();
360	>	#else
361
362	<	sprintf(tempBuffer, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
363	<	integrableObject->getType().c_str(),
364	<	pos[0], pos[1], pos[2],
226	<	vel[0], vel[1], vel[2]);
362	>	const int masterNode = 0;
363	>	int worldRank = MPI::COMM_WORLD.Get_rank();
364	>	int nProc = MPI::COMM_WORLD.Get_size();
365
366	<	strcpy(writeLine, tempBuffer);
366	>	if (worldRank == masterNode) {
367	>	os << "  <Snapshot>\n";
368	>	writeFrameProperties(os,
369	>	info_->getSnapshotManager()->getCurrentSnapshot());
370	>	os << "    <StuntDoubles>\n";
371	>	}
372
373	<	if (integrableObject->isDirectional()) {
374	<	q = integrableObject->getQ();
375	<	ji = integrableObject->getJ();
373	>	//every node prepares the dump lines for integrable objects belong to itself
374	>	std::string buffer;
375	>	for (mol = info_->beginMolecule(mi); mol != NULL;
376	>	mol = info_->nextMolecule(mi)) {
377	>	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
378	>	sd = mol->nextIntegrableObject(ii)) {
379	>	buffer += prepareDumpLine(sd);
380	>	}
381	>	}
382	>
383	>	if (worldRank == masterNode) {
384	>	os << buffer;
385	>
386	>	for (int i = 1; i < nProc; ++i) {
387	>	// tell processor i to start sending us data:
388	>	MPI::COMM_WORLD.Bcast(&i, 1, MPI::INT, masterNode);
389
390	<	sprintf(tempBuffer, "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
391	<	q[0], q[1], q[2], q[3],
392	<	ji[0], ji[1], ji[2]);
393	<	strcat(writeLine, tempBuffer);
394	<	} else {
239	<	strcat(writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0");
240	<	}
390	>	// receive the length of the string buffer that was
391	>	// prepared by processor i:
392	>	int recvLength;
393	>	MPI::COMM_WORLD.Recv(&recvLength, 1, MPI::INT, i, MPI::ANY_TAG,
394	>	istatus);
395
396	<	if (needForceVector_) {
397	<	frc = integrableObject->getFrc();
398	<	trq = integrableObject->getTrq();
399	<
400	<	sprintf(tempBuffer, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
401	<	frc[0], frc[1], frc[2],
402	<	trq[0], trq[1], trq[2]);
403	<	strcat(writeLine, tempBuffer);
404	<	}
405	<
406	<	strcat(writeLine, "\n");
407	<	os << writeLine;
396	>	// create a buffer to receive the data
397	>	char* recvBuffer = new char[recvLength];
398	>	if (recvBuffer == NULL) {
399	>	} else {
400	>	// receive the data:
401	>	MPI::COMM_WORLD.Recv(recvBuffer, recvLength, MPI::CHAR, i,
402	>	MPI::ANY_TAG, istatus);
403	>	// send it to the file:
404	>	os << recvBuffer;
405	>	// get rid of the receive buffer:
406	>	delete [] recvBuffer;
407	>	}
408	>	}
409	>	} else {
410	>	int sendBufferLength = buffer.size() + 1;
411	>	int myturn = 0;
412	>	for (int i = 1; i < nProc; ++i){
413	>	// wait for the master node to call our number:
414	>	MPI::COMM_WORLD.Bcast(&myturn, 1, MPI::INT, masterNode);
415	>	if (myturn == worldRank){
416	>	// send the length of our buffer:
417	>	MPI::COMM_WORLD.Send(&sendBufferLength, 1, MPI::INT, masterNode, 0);
418
419	+	// send our buffer:
420	+	MPI::COMM_WORLD.Send((void *)buffer.c_str(), sendBufferLength,
421	+	MPI::CHAR, masterNode, 0);
422	+
423	+	}
424		}
425		}
257	–
258	–	os.flush();
259	–	#else // is_mpi
260	–	/*********************************************************************
261	–	* Documentation?  You want DOCUMENTATION?
262	–	*
263	–	* Why all the potatoes below?
264	–	*
265	–	* To make a long story short, the original version of DumpWriter
266	–	* worked in the most inefficient way possible.  Node 0 would
267	–	* poke each of the node for an individual atom's formatted data
268	–	* as node 0 worked its way down the global index. This was particularly
269	–	* inefficient since the method blocked all processors at every atom
270	–	* (and did it twice!).
271	–	*
272	–	* An intermediate version of DumpWriter could be described from Node
273	–	* zero's perspective as follows:
274	–	*
275	–	*  1) Have 100 of your friends stand in a circle.
276	–	*  2) When you say go, have all of them start tossing potatoes at
277	–	*     you (one at a time).
278	–	*  3) Catch the potatoes.
279	–	*
280	–	* It was an improvement, but MPI has buffers and caches that could
281	–	* best be described in this analogy as "potato nets", so there's no
282	–	* need to block the processors atom-by-atom.
283	–	*
284	–	* This new and improved DumpWriter works in an even more efficient
285	–	* way:
286	–	*
287	–	*  1) Have 100 of your friend stand in a circle.
288	–	*  2) When you say go, have them start tossing 5-pound bags of
289	–	*     potatoes at you.
290	–	*  3) Once you've caught a friend's bag of potatoes,
291	–	*     toss them a spud to let them know they can toss another bag.
292	–	*
293	–	* How's THAT for documentation?
294	–	*
295	–	*********************************************************************/
296	–	const int masterNode = 0;
297	–
298	–	int * potatoes;
299	–	int myPotato;
300	–	int nProc;
301	–	int which_node;
302	–	double atomData[19];
303	–	int isDirectional;
304	–	char MPIatomTypeString[MINIBUFFERSIZE];
305	–	int msgLen; // the length of message actually recieved at master nodes
306	–	int haveError;
307	–	MPI_Status istatus;
308	–	int nCurObj;
426
427	<	// code to find maximum tag value
428	<	int * tagub;
312	<	int flag;
313	<	int MAXTAG;
314	<	MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
315	<
316	<	if (flag) {
317	<	MAXTAG = *tagub;
318	<	} else {
319	<	MAXTAG = 32767;
427	>	if (worldRank == masterNode) {
428	>	os << "    </StuntDoubles>\n";
429		}
430
431	<	if (worldRank == masterNode) { //master node (node 0) is responsible for writing the dump file
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	<	// Node 0 needs a list of the magic potatoes for each processor;
446	>	if (sd->isRigidBody()) {
447	>
448	>	RigidBody* rb = static_cast<RigidBody*>(sd);
449	>	int siteIndex = 0;
450	>	for (Atom* 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	<	MPI_Comm_size(MPI_COMM_WORLD, &nProc);
460	<	potatoes = new int[nProc];
461	<
462	<	//write out the comment lines
463	<	for(int i = 0; i < nProc; i++) {
464	<	potatoes[i] = 0;
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	+	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	<	os << nTotObjects << "\n";
524	<	writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot());
523	>	Vector3d pos;
524	>	Vector3d vel;
525	>	pos = sd->getPos();
526
527	<	for(int i = 0; i < info_->getNGlobalMolecules(); 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	<	// Get the Node number which has this atom;
537	>	vel = sd->getVel();
538
539	<	which_node = info_->getMolToProc(i);
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	<	if (which_node != masterNode) { //current molecule is in slave node
550	<	if (potatoes[which_node] + 1 >= MAXTAG) {
551	<	// The potato was going to exceed the maximum value,
552	<	// so wrap this processor potato back to 0:
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	<	potatoes[which_node] = 0;
555	<	MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0,
556	<	MPI_COMM_WORLD);
557	<	}
554	>	if (sd->isDirectional()) {
555	>	type += "qj";
556	>	Quat4d q;
557	>	Vector3d ji;
558	>	q = sd->getQ();
559
560	<	myPotato = potatoes[which_node];
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	<	//recieve the number of integrableObject in current molecule
357	<	MPI_Recv(&nCurObj, 1, MPI_INT, which_node, myPotato,
358	<	MPI_COMM_WORLD, &istatus);
359	<	myPotato++;
571	>	ji = sd->getJ();
572
573	<	for(int l = 0; l < nCurObj; l++) {
574	<	if (potatoes[which_node] + 2 >= MAXTAG) {
575	<	// The potato was going to exceed the maximum value,
576	<	// so wrap this processor potato back to 0:
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	<	potatoes[which_node] = 0;
584	<	MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node,
585	<	0, MPI_COMM_WORLD);
586	<	}
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_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR,
590	<	which_node, myPotato, MPI_COMM_WORLD,
591	<	&istatus);
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	<	myPotato++;
623	>	sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str());
624	>	return std::string(tempBuffer);
625	>	}
626
627	<	MPI_Recv(atomData, 19, MPI_DOUBLE, which_node, myPotato,
628	<	MPI_COMM_WORLD, &istatus);
379	<	myPotato++;
627	>	std::string DumpWriter::prepareSiteLine(StuntDouble* sd, int ioIndex, int siteIndex) {
628	>
629
630	<	MPI_Get_count(&istatus, MPI_DOUBLE, &msgLen);
630	>	std::string id;
631	>	std::string type;
632	>	std::string line;
633	>	char tempBuffer[4096];
634
635	<	if (msgLen == 13 || msgLen == 19)
636	<	isDirectional = 1;
637	<	else
638	<	isDirectional = 0;
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	<	// If we've survived to here, format the line:
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	<	if (!isDirectional) {
683	<	sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
684	<	MPIatomTypeString, atomData[0],
685	<	atomData[1], atomData[2],
686	<	atomData[3], atomData[4],
687	<	atomData[5]);
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
397	–	strcat(writeLine,
398	–	"0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0");
399	–	} else {
400	–	sprintf(writeLine,
401	–	"%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",
402	–	MPIatomTypeString,
403	–	atomData[0],
404	–	atomData[1],
405	–	atomData[2],
406	–	atomData[3],
407	–	atomData[4],
408	–	atomData[5],
409	–	atomData[6],
410	–	atomData[7],
411	–	atomData[8],
412	–	atomData[9],
413	–	atomData[10],
414	–	atomData[11],
415	–	atomData[12]);
416	–	}
417	–
418	–	if (needForceVector_) {
419	–	if (!isDirectional) {
420	–	sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
421	–	atomData[6],
422	–	atomData[7],
423	–	atomData[8],
424	–	atomData[9],
425	–	atomData[10],
426	–	atomData[11]);
427	–	} else {
428	–	sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
429	–	atomData[13],
430	–	atomData[14],
431	–	atomData[15],
432	–	atomData[16],
433	–	atomData[17],
434	–	atomData[18]);
435	–	}
436	–	}
699
700	<	sprintf(writeLine, "\n");
701	<	os << writeLine;
702	<
703	<	} // end for(int l =0)
704	<
705	<	potatoes[which_node] = myPotato;
706	<	} else { //master node has current molecule
707	<
708	<	mol = info_->getMoleculeByGlobalIndex(i);
447	<
448	<	if (mol == NULL) {
449	<	sprintf(painCave.errMsg, "Molecule not found on node %d!", worldRank);
450	<	painCave.isFatal = 1;
451	<	simError();
452	<	}
453	<
454	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
455	<	integrableObject = mol->nextIntegrableObject(ii)) {
456	<
457	<	pos = integrableObject->getPos();
458	<	vel = integrableObject->getVel();
459	<
460	<	atomData[0] = pos[0];
461	<	atomData[1] = pos[1];
462	<	atomData[2] = pos[2];
463	<
464	<	atomData[3] = vel[0];
465	<	atomData[4] = vel[1];
466	<	atomData[5] = vel[2];
467	<
468	<	isDirectional = 0;
469	<
470	<	if (integrableObject->isDirectional()) {
471	<	isDirectional = 1;
472	<
473	<	q = integrableObject->getQ();
474	<	ji = integrableObject->getJ();
475	<
476	<	for(int j = 0; j < 6; j++) {
477	<	atomData[j] = atomData[j];
478	<	}
479	<
480	<	atomData[6] = q[0];
481	<	atomData[7] = q[1];
482	<	atomData[8] = q[2];
483	<	atomData[9] = q[3];
484	<
485	<	atomData[10] = ji[0];
486	<	atomData[11] = ji[1];
487	<	atomData[12] = ji[2];
488	<	}
489	<
490	<	if (needForceVector_) {
491	<	frc = integrableObject->getFrc();
492	<	trq = integrableObject->getTrq();
493	<
494	<	if (!isDirectional) {
495	<	atomData[6] = frc[0];
496	<	atomData[7] = frc[1];
497	<	atomData[8] = frc[2];
498	<	atomData[9] = trq[0];
499	<	atomData[10] = trq[1];
500	<	atomData[11] = trq[2];
501	<	} else {
502	<	atomData[13] = frc[0];
503	<	atomData[14] = frc[1];
504	<	atomData[15] = frc[2];
505	<	atomData[16] = trq[0];
506	<	atomData[17] = trq[1];
507	<	atomData[18] = trq[2];
508	<	}
509	<	}
510	<
511	<	// If we've survived to here, format the line:
512	<
513	<	if (!isDirectional) {
514	<	sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
515	<	integrableObject->getType().c_str(), atomData[0],
516	<	atomData[1], atomData[2],
517	<	atomData[3], atomData[4],
518	<	atomData[5]);
519	<
520	<	strcat(writeLine,
521	<	"0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0");
522	<	} else {
523	<	sprintf(writeLine,
524	<	"%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",
525	<	integrableObject->getType().c_str(),
526	<	atomData[0],
527	<	atomData[1],
528	<	atomData[2],
529	<	atomData[3],
530	<	atomData[4],
531	<	atomData[5],
532	<	atomData[6],
533	<	atomData[7],
534	<	atomData[8],
535	<	atomData[9],
536	<	atomData[10],
537	<	atomData[11],
538	<	atomData[12]);
539	<	}
540	<
541	<	if (needForceVector_) {
542	<	if (!isDirectional) {
543	<	sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
544	<	atomData[6],
545	<	atomData[7],
546	<	atomData[8],
547	<	atomData[9],
548	<	atomData[10],
549	<	atomData[11]);
550	<	} else {
551	<	sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
552	<	atomData[13],
553	<	atomData[14],
554	<	atomData[15],
555	<	atomData[16],
556	<	atomData[17],
557	<	atomData[18]);
558	<	}
559	<	}
560	<
561	<	sprintf(writeLine, "\n");
562	<	os << writeLine;
563	<
564	<	} //end for(iter = integrableObject.begin())
565	<	}
566	<	} //end for(i = 0; i < mpiSim->getNmol())
567	<
568	<	os.flush();
569	<
570	<	sprintf(checkPointMsg, "Sucessfully took a dump.\n");
571	<	MPIcheckPoint();
572	<
573	<	delete [] potatoes;
574	<	} else {
575	<
576	<	// worldRank != 0, so I'm a remote node.
577	<
578	<	// Set my magic potato to 0:
579	<
580	<	myPotato = 0;
581	<
582	<	for(int i = 0; i < info_->getNGlobalMolecules(); i++) {
583	<
584	<	// Am I the node which has this integrableObject?
585	<	int whichNode = info_->getMolToProc(i);
586	<	if (whichNode == worldRank) {
587	<	if (myPotato + 1 >= MAXTAG) {
588	<
589	<	// The potato was going to exceed the maximum value,
590	<	// so wrap this processor potato back to 0 (and block until
591	<	// node 0 says we can go:
592	<
593	<	MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD,
594	<	&istatus);
595	<	}
596	<
597	<	mol = info_->getMoleculeByGlobalIndex(i);
598	<
599	<
600	<	nCurObj = mol->getNIntegrableObjects();
601	<
602	<	MPI_Send(&nCurObj, 1, MPI_INT, 0, myPotato, MPI_COMM_WORLD);
603	<	myPotato++;
604	<
605	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
606	<	integrableObject = mol->nextIntegrableObject(ii)) {
607	<
608	<	if (myPotato + 2 >= MAXTAG) {
609	<
610	<	// The potato was going to exceed the maximum value,
611	<	// so wrap this processor potato back to 0 (and block until
612	<	// node 0 says we can go:
613	<
614	<	MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD,
615	<	&istatus);
616	<	}
617	<
618	<	pos = integrableObject->getPos();
619	<	vel = integrableObject->getVel();
620	<
621	<	atomData[0] = pos[0];
622	<	atomData[1] = pos[1];
623	<	atomData[2] = pos[2];
624	<
625	<	atomData[3] = vel[0];
626	<	atomData[4] = vel[1];
627	<	atomData[5] = vel[2];
628	<
629	<	isDirectional = 0;
630	<
631	<	if (integrableObject->isDirectional()) {
632	<	isDirectional = 1;
633	<
634	<	q = integrableObject->getQ();
635	<	ji = integrableObject->getJ();
636	<
637	<	atomData[6] = q[0];
638	<	atomData[7] = q[1];
639	<	atomData[8] = q[2];
640	<	atomData[9] = q[3];
641	<
642	<	atomData[10] = ji[0];
643	<	atomData[11] = ji[1];
644	<	atomData[12] = ji[2];
645	<	}
646	<
647	<	if (needForceVector_) {
648	<	frc = integrableObject->getFrc();
649	<	trq = integrableObject->getTrq();
650	<
651	<	if (!isDirectional) {
652	<	atomData[6] = frc[0];
653	<	atomData[7] = frc[1];
654	<	atomData[8] = frc[2];
655	<
656	<	atomData[9] = trq[0];
657	<	atomData[10] = trq[1];
658	<	atomData[11] = trq[2];
659	<	} else {
660	<	atomData[13] = frc[0];
661	<	atomData[14] = frc[1];
662	<	atomData[15] = frc[2];
663	<
664	<	atomData[16] = trq[0];
665	<	atomData[17] = trq[1];
666	<	atomData[18] = trq[2];
667	<	}
668	<	}
669	<
670	<	strncpy(MPIatomTypeString, integrableObject->getType().c_str(), MINIBUFFERSIZE);
671	<
672	<	// null terminate the  std::string before sending (just in case):
673	<	MPIatomTypeString[MINIBUFFERSIZE - 1] = '\0';
674	<
675	<	MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
676	<	myPotato, MPI_COMM_WORLD);
677	<
678	<	myPotato++;
679	<
680	<	if (isDirectional && needForceVector_) {
681	<	MPI_Send(atomData, 19, MPI_DOUBLE, 0, myPotato,
682	<	MPI_COMM_WORLD);
683	<	} else if (isDirectional) {
684	<	MPI_Send(atomData, 13, MPI_DOUBLE, 0, myPotato,
685	<	MPI_COMM_WORLD);
686	<	} else if (needForceVector_) {
687	<	MPI_Send(atomData, 12, MPI_DOUBLE, 0, myPotato,
688	<	MPI_COMM_WORLD);
689	<	} else {
690	<	MPI_Send(atomData, 6, MPI_DOUBLE, 0, myPotato,
691	<	MPI_COMM_WORLD);
692	<	}
693	<
694	<	myPotato++;
695	<	}
696	<
697	<	}
698	<
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 715 | Line 726 | namespace oopse {
726		#ifdef IS_MPI
727		if (worldRank == 0) {
728		#endif // is_mpi
729	<
729	>
730		eorStream = createOStream(eorFilename_);
731
732		#ifdef IS_MPI
733		}
734	<	#endif // is_mpi
735	<
734	>	#endif
735	>
736		writeFrame(*eorStream);
737	<
737	>
738		#ifdef IS_MPI
739		if (worldRank == 0) {
740	<	#endif // is_mpi
741	<	delete eorStream;
742	<
740	>	#endif
741	>
742	>	writeClosing(*eorStream);
743	>	delete eorStream;
744	>
745		#ifdef IS_MPI
746		}
747		#endif // is_mpi
#	Line 761 | Line 774 | namespace oopse {
774		#ifdef IS_MPI
775		if (worldRank == 0) {
776		#endif // is_mpi
777	<	delete eorStream;
778	<
777	>	writeClosing(*eorStream);
778	>	delete eorStream;
779		#ifdef IS_MPI
780		}
781		#endif // is_mpi
782
783		}
784
785	<	std::ostream* DumpWriter::createOStream(const std::string& filename) {
785	>	std::ostream* DumpWriter::createOStream(const std::string& filename) {
786
787		std::ostream* newOStream;
788	<	#ifdef HAVE_LIBZ
788	>	#ifdef HAVE_ZLIB
789		if (needCompression_) {
790	<	newOStream = new ogzstream(filename.c_str());
790	>	newOStream = new ogzstream(filename.c_str());
791		} else {
792	<	newOStream = new std::ofstream(filename.c_str());
792	>	newOStream = new std::ofstream(filename.c_str());
793		}
794		#else
795		newOStream = new std::ofstream(filename.c_str());
796		#endif
797	+	//write out MetaData first
798	+	(*newOStream) << "<OpenMD version=2>" << std::endl;
799	+	(*newOStream) << "  <MetaData>" << std::endl;
800	+	(*newOStream) << info_->getRawMetaData();
801	+	(*newOStream) << "  </MetaData>" << std::endl;
802		return newOStream;
803	<	}
803	>	}
804
805	<	}//end namespace oopse
805	>	void DumpWriter::writeClosing(std::ostream& os) {
806	>
807	>	os << "</OpenMD>\n";
808	>	os.flush();
809	>	}
810	>
811	>	}//end namespace OpenMD

Comparing:
trunk/src/io/DumpWriter.cpp (property svn:keywords), Revision 726 by chrisfen, Fri Nov 11 15:22:11 2005 UTC vs.
branches/development/src/io/DumpWriter.cpp (property svn:keywords), Revision 1878 by gezelter, Thu Jun 13 14:26:09 2013 UTC

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

Diff Legend

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