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. |
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, 24107 (2008). |
39 |
+ |
* [4] Vardeman & Gezelter, in progress (2009). |
40 |
|
*/ |
41 |
|
|
42 |
|
#include "io/DumpWriter.hpp" |
46 |
|
#include "io/gzstream.hpp" |
47 |
|
#include "io/Globals.hpp" |
48 |
|
|
49 |
+ |
|
50 |
|
#ifdef IS_MPI |
51 |
|
#include <mpi.h> |
52 |
|
#endif //is_mpi |
53 |
|
|
54 |
< |
namespace oopse { |
54 |
> |
using namespace std; |
55 |
> |
namespace OpenMD { |
56 |
|
|
57 |
|
DumpWriter::DumpWriter(SimInfo* info) |
58 |
|
: info_(info), filename_(info->getDumpFileName()), eorFilename_(info->getFinalConfigFileName()){ |
59 |
|
|
60 |
|
Globals* simParams = info->getSimParams(); |
61 |
|
needCompression_ = simParams->getCompressDumpFile(); |
62 |
< |
needForceVector_ = simParams->getDumpForceVector(); |
63 |
< |
|
62 |
> |
needForceVector_ = simParams->getOutputForceVector(); |
63 |
> |
createDumpFile_ = true; |
64 |
|
#ifdef HAVE_LIBZ |
65 |
|
if (needCompression_) { |
66 |
< |
filename_ += ".gz"; |
67 |
< |
eorFilename_ += ".gz"; |
66 |
> |
filename_ += ".gz"; |
67 |
> |
eorFilename_ += ".gz"; |
68 |
|
} |
69 |
|
#endif |
70 |
|
|
71 |
|
#ifdef IS_MPI |
72 |
|
|
73 |
< |
if (worldRank == 0) { |
73 |
> |
if (worldRank == 0) { |
74 |
|
#endif // is_mpi |
75 |
+ |
|
76 |
+ |
dumpFile_ = createOStream(filename_); |
77 |
|
|
78 |
+ |
if (!dumpFile_) { |
79 |
+ |
sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n", |
80 |
+ |
filename_.c_str()); |
81 |
+ |
painCave.isFatal = 1; |
82 |
+ |
simError(); |
83 |
+ |
} |
84 |
|
|
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 |
– |
|
85 |
|
#ifdef IS_MPI |
86 |
|
|
87 |
< |
} |
87 |
> |
} |
88 |
|
|
88 |
– |
sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n"); |
89 |
– |
MPIcheckPoint(); |
90 |
– |
|
89 |
|
#endif // is_mpi |
90 |
|
|
91 |
< |
} |
91 |
> |
} |
92 |
|
|
93 |
|
|
94 |
|
DumpWriter::DumpWriter(SimInfo* info, const std::string& filename) |
98 |
|
eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor"; |
99 |
|
|
100 |
|
needCompression_ = simParams->getCompressDumpFile(); |
101 |
< |
needForceVector_ = simParams->getDumpForceVector(); |
102 |
< |
|
101 |
> |
needForceVector_ = simParams->getOutputForceVector(); |
102 |
> |
createDumpFile_ = true; |
103 |
|
#ifdef HAVE_LIBZ |
104 |
|
if (needCompression_) { |
105 |
< |
filename_ += ".gz"; |
106 |
< |
eorFilename_ += ".gz"; |
105 |
> |
filename_ += ".gz"; |
106 |
> |
eorFilename_ += ".gz"; |
107 |
|
} |
108 |
|
#endif |
109 |
|
|
110 |
|
#ifdef IS_MPI |
111 |
|
|
112 |
< |
if (worldRank == 0) { |
112 |
> |
if (worldRank == 0) { |
113 |
|
#endif // is_mpi |
114 |
|
|
115 |
+ |
|
116 |
+ |
dumpFile_ = createOStream(filename_); |
117 |
|
|
118 |
< |
dumpFile_ = createOStream(filename_); |
118 |
> |
if (!dumpFile_) { |
119 |
> |
sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n", |
120 |
> |
filename_.c_str()); |
121 |
> |
painCave.isFatal = 1; |
122 |
> |
simError(); |
123 |
> |
} |
124 |
|
|
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 |
– |
|
125 |
|
#ifdef IS_MPI |
126 |
|
|
127 |
< |
} |
127 |
> |
} |
128 |
|
|
131 |
– |
sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n"); |
132 |
– |
MPIcheckPoint(); |
133 |
– |
|
129 |
|
#endif // is_mpi |
130 |
|
|
131 |
+ |
} |
132 |
+ |
|
133 |
+ |
DumpWriter::DumpWriter(SimInfo* info, const std::string& filename, bool writeDumpFile) |
134 |
+ |
: info_(info), filename_(filename){ |
135 |
+ |
|
136 |
+ |
Globals* simParams = info->getSimParams(); |
137 |
+ |
eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor"; |
138 |
+ |
|
139 |
+ |
needCompression_ = simParams->getCompressDumpFile(); |
140 |
+ |
needForceVector_ = simParams->getOutputForceVector(); |
141 |
+ |
|
142 |
+ |
#ifdef HAVE_LIBZ |
143 |
+ |
if (needCompression_) { |
144 |
+ |
filename_ += ".gz"; |
145 |
+ |
eorFilename_ += ".gz"; |
146 |
|
} |
147 |
+ |
#endif |
148 |
+ |
|
149 |
+ |
#ifdef IS_MPI |
150 |
+ |
|
151 |
+ |
if (worldRank == 0) { |
152 |
+ |
#endif // is_mpi |
153 |
+ |
|
154 |
+ |
createDumpFile_ = writeDumpFile; |
155 |
+ |
if (createDumpFile_) { |
156 |
+ |
dumpFile_ = createOStream(filename_); |
157 |
+ |
|
158 |
+ |
if (!dumpFile_) { |
159 |
+ |
sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n", |
160 |
+ |
filename_.c_str()); |
161 |
+ |
painCave.isFatal = 1; |
162 |
+ |
simError(); |
163 |
+ |
} |
164 |
+ |
} |
165 |
+ |
#ifdef IS_MPI |
166 |
+ |
|
167 |
+ |
} |
168 |
|
|
169 |
+ |
|
170 |
+ |
#endif // is_mpi |
171 |
+ |
|
172 |
+ |
} |
173 |
+ |
|
174 |
|
DumpWriter::~DumpWriter() { |
175 |
|
|
176 |
|
#ifdef IS_MPI |
177 |
|
|
178 |
|
if (worldRank == 0) { |
179 |
|
#endif // is_mpi |
180 |
< |
|
181 |
< |
delete dumpFile_; |
182 |
< |
|
180 |
> |
if (createDumpFile_){ |
181 |
> |
writeClosing(*dumpFile_); |
182 |
> |
delete dumpFile_; |
183 |
> |
} |
184 |
|
#ifdef IS_MPI |
185 |
|
|
186 |
|
} |
189 |
|
|
190 |
|
} |
191 |
|
|
192 |
< |
void DumpWriter::writeCommentLine(std::ostream& os, Snapshot* s) { |
192 |
> |
void DumpWriter::writeFrameProperties(std::ostream& os, Snapshot* s) { |
193 |
|
|
194 |
< |
double currentTime; |
195 |
< |
Mat3x3d hmat; |
196 |
< |
double chi; |
197 |
< |
double integralOfChiDt; |
198 |
< |
Mat3x3d eta; |
194 |
> |
char buffer[1024]; |
195 |
> |
|
196 |
> |
os << " <FrameData>\n"; |
197 |
> |
|
198 |
> |
RealType currentTime = s->getTime(); |
199 |
> |
|
200 |
> |
if (isinf(currentTime) || isnan(currentTime)) { |
201 |
> |
sprintf( painCave.errMsg, |
202 |
> |
"DumpWriter detected a numerical error writing the time"); |
203 |
> |
painCave.isFatal = 1; |
204 |
> |
simError(); |
205 |
> |
} |
206 |
|
|
207 |
< |
currentTime = s->getTime(); |
207 |
> |
sprintf(buffer, " Time: %.10g\n", currentTime); |
208 |
> |
os << buffer; |
209 |
> |
|
210 |
> |
Mat3x3d hmat; |
211 |
|
hmat = s->getHmat(); |
212 |
< |
chi = s->getChi(); |
213 |
< |
integralOfChiDt = s->getIntegralOfChiDt(); |
214 |
< |
eta = s->getEta(); |
212 |
> |
|
213 |
> |
for (unsigned int i = 0; i < 3; i++) { |
214 |
> |
for (unsigned int j = 0; j < 3; j++) { |
215 |
> |
if (isinf(hmat(i,j)) || isnan(hmat(i,j))) { |
216 |
> |
sprintf( painCave.errMsg, |
217 |
> |
"DumpWriter detected a numerical error writing the box"); |
218 |
> |
painCave.isFatal = 1; |
219 |
> |
simError(); |
220 |
> |
} |
221 |
> |
} |
222 |
> |
} |
223 |
|
|
224 |
< |
os << currentTime << ";\t" |
225 |
< |
<< hmat(0, 0) << "\t" << hmat(1, 0) << "\t" << hmat(2, 0) << ";\t" |
226 |
< |
<< hmat(0, 1) << "\t" << hmat(1, 1) << "\t" << hmat(2, 1) << ";\t" |
227 |
< |
<< hmat(0, 2) << "\t" << hmat(1, 2) << "\t" << hmat(2, 2) << ";\t"; |
224 |
> |
sprintf(buffer, " Hmat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n", |
225 |
> |
hmat(0, 0), hmat(1, 0), hmat(2, 0), |
226 |
> |
hmat(0, 1), hmat(1, 1), hmat(2, 1), |
227 |
> |
hmat(0, 2), hmat(1, 2), hmat(2, 2)); |
228 |
> |
os << buffer; |
229 |
|
|
230 |
< |
//write out additional parameters, such as chi and eta |
230 |
> |
RealType chi = s->getChi(); |
231 |
> |
RealType integralOfChiDt = s->getIntegralOfChiDt(); |
232 |
> |
if (isinf(chi) || isnan(chi) || |
233 |
> |
isinf(integralOfChiDt) || isnan(integralOfChiDt)) { |
234 |
> |
sprintf( painCave.errMsg, |
235 |
> |
"DumpWriter detected a numerical error writing the thermostat"); |
236 |
> |
painCave.isFatal = 1; |
237 |
> |
simError(); |
238 |
> |
} |
239 |
> |
sprintf(buffer, " Thermostat: %.10g , %.10g\n", chi, integralOfChiDt); |
240 |
> |
os << buffer; |
241 |
|
|
242 |
< |
os << chi << "\t" << integralOfChiDt << "\t;"; |
242 |
> |
Mat3x3d eta; |
243 |
> |
eta = s->getEta(); |
244 |
|
|
245 |
< |
os << eta(0, 0) << "\t" << eta(1, 0) << "\t" << eta(2, 0) << ";\t" |
246 |
< |
<< eta(0, 1) << "\t" << eta(1, 1) << "\t" << eta(2, 1) << ";\t" |
247 |
< |
<< eta(0, 2) << "\t" << eta(1, 2) << "\t" << eta(2, 2) << ";"; |
248 |
< |
|
249 |
< |
os << "\n"; |
245 |
> |
for (unsigned int i = 0; i < 3; i++) { |
246 |
> |
for (unsigned int j = 0; j < 3; j++) { |
247 |
> |
if (isinf(eta(i,j)) || isnan(eta(i,j))) { |
248 |
> |
sprintf( painCave.errMsg, |
249 |
> |
"DumpWriter detected a numerical error writing the barostat"); |
250 |
> |
painCave.isFatal = 1; |
251 |
> |
simError(); |
252 |
> |
} |
253 |
> |
} |
254 |
> |
} |
255 |
> |
|
256 |
> |
sprintf(buffer, " Barostat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n", |
257 |
> |
eta(0, 0), eta(1, 0), eta(2, 0), |
258 |
> |
eta(0, 1), eta(1, 1), eta(2, 1), |
259 |
> |
eta(0, 2), eta(1, 2), eta(2, 2)); |
260 |
> |
os << buffer; |
261 |
> |
|
262 |
> |
os << " </FrameData>\n"; |
263 |
|
} |
264 |
|
|
265 |
|
void DumpWriter::writeFrame(std::ostream& os) { |
186 |
– |
const int BUFFERSIZE = 2000; |
187 |
– |
const int MINIBUFFERSIZE = 100; |
266 |
|
|
267 |
< |
char tempBuffer[BUFFERSIZE]; |
268 |
< |
char writeLine[BUFFERSIZE]; |
267 |
> |
#ifdef IS_MPI |
268 |
> |
MPI_Status istatus; |
269 |
> |
#endif |
270 |
|
|
192 |
– |
Quat4d q; |
193 |
– |
Vector3d ji; |
194 |
– |
Vector3d pos; |
195 |
– |
Vector3d vel; |
196 |
– |
Vector3d frc; |
197 |
– |
Vector3d trq; |
198 |
– |
|
271 |
|
Molecule* mol; |
272 |
|
StuntDouble* integrableObject; |
273 |
|
SimInfo::MoleculeIterator mi; |
274 |
|
Molecule::IntegrableObjectIterator ii; |
203 |
– |
|
204 |
– |
int nTotObjects; |
205 |
– |
nTotObjects = info_->getNGlobalIntegrableObjects(); |
275 |
|
|
276 |
|
#ifndef IS_MPI |
277 |
+ |
os << " <Snapshot>\n"; |
278 |
+ |
|
279 |
+ |
writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot()); |
280 |
|
|
281 |
+ |
os << " <StuntDoubles>\n"; |
282 |
+ |
for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) { |
283 |
|
|
284 |
< |
os << nTotObjects << "\n"; |
285 |
< |
|
286 |
< |
writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot()); |
284 |
> |
|
285 |
> |
for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; |
286 |
> |
integrableObject = mol->nextIntegrableObject(ii)) { |
287 |
> |
os << prepareDumpLine(integrableObject); |
288 |
> |
|
289 |
> |
} |
290 |
> |
} |
291 |
> |
os << " </StuntDoubles>\n"; |
292 |
> |
|
293 |
> |
os << " </Snapshot>\n"; |
294 |
|
|
295 |
+ |
os.flush(); |
296 |
+ |
#else |
297 |
+ |
//every node prepares the dump lines for integrable objects belong to itself |
298 |
+ |
std::string buffer; |
299 |
|
for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) { |
300 |
|
|
301 |
+ |
|
302 |
|
for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; |
303 |
< |
integrableObject = mol->nextIntegrableObject(ii)) { |
304 |
< |
|
303 |
> |
integrableObject = mol->nextIntegrableObject(ii)) { |
304 |
> |
buffer += prepareDumpLine(integrableObject); |
305 |
> |
} |
306 |
> |
} |
307 |
> |
|
308 |
> |
const int masterNode = 0; |
309 |
|
|
310 |
< |
pos = integrableObject->getPos(); |
311 |
< |
vel = integrableObject->getVel(); |
310 |
> |
if (worldRank == masterNode) { |
311 |
> |
os << " <Snapshot>\n"; |
312 |
> |
writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot()); |
313 |
> |
os << " <StuntDoubles>\n"; |
314 |
> |
|
315 |
> |
os << buffer; |
316 |
|
|
317 |
< |
sprintf(tempBuffer, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", |
318 |
< |
integrableObject->getType().c_str(), |
319 |
< |
pos[0], pos[1], pos[2], |
226 |
< |
vel[0], vel[1], vel[2]); |
317 |
> |
int nProc; |
318 |
> |
MPI_Comm_size(MPI_COMM_WORLD, &nProc); |
319 |
> |
for (int i = 1; i < nProc; ++i) { |
320 |
|
|
321 |
< |
strcpy(writeLine, tempBuffer); |
321 |
> |
// receive the length of the string buffer that was |
322 |
> |
// prepared by processor i |
323 |
|
|
324 |
< |
if (integrableObject->isDirectional()) { |
325 |
< |
q = integrableObject->getQ(); |
326 |
< |
ji = integrableObject->getJ(); |
324 |
> |
int recvLength; |
325 |
> |
MPI_Recv(&recvLength, 1, MPI_INT, i, 0, MPI_COMM_WORLD, &istatus); |
326 |
> |
char* recvBuffer = new char[recvLength]; |
327 |
> |
if (recvBuffer == NULL) { |
328 |
> |
} else { |
329 |
> |
MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, &istatus); |
330 |
> |
os << recvBuffer; |
331 |
> |
delete [] recvBuffer; |
332 |
> |
} |
333 |
> |
} |
334 |
> |
os << " </StuntDoubles>\n"; |
335 |
> |
|
336 |
> |
os << " </Snapshot>\n"; |
337 |
> |
os.flush(); |
338 |
> |
} else { |
339 |
> |
int sendBufferLength = buffer.size() + 1; |
340 |
> |
MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD); |
341 |
> |
MPI_Send((void *)buffer.c_str(), sendBufferLength, MPI_CHAR, masterNode, 0, MPI_COMM_WORLD); |
342 |
> |
} |
343 |
|
|
344 |
< |
sprintf(tempBuffer, "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf", |
235 |
< |
q[0], q[1], q[2], q[3], |
236 |
< |
ji[0], ji[1], ji[2]); |
237 |
< |
strcat(writeLine, tempBuffer); |
238 |
< |
} else { |
239 |
< |
strcat(writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0"); |
240 |
< |
} |
344 |
> |
#endif // is_mpi |
345 |
|
|
346 |
< |
if (needForceVector_) { |
347 |
< |
frc = integrableObject->getFrc(); |
348 |
< |
trq = integrableObject->getTrq(); |
245 |
< |
|
246 |
< |
sprintf(tempBuffer, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf", |
247 |
< |
frc[0], frc[1], frc[2], |
248 |
< |
trq[0], trq[1], trq[2]); |
249 |
< |
strcat(writeLine, tempBuffer); |
250 |
< |
} |
346 |
> |
} |
347 |
> |
|
348 |
> |
std::string DumpWriter::prepareDumpLine(StuntDouble* integrableObject) { |
349 |
|
|
350 |
< |
strcat(writeLine, "\n"); |
351 |
< |
os << writeLine; |
350 |
> |
int index = integrableObject->getGlobalIntegrableObjectIndex(); |
351 |
> |
std::string type("pv"); |
352 |
> |
std::string line; |
353 |
> |
char tempBuffer[4096]; |
354 |
|
|
355 |
< |
} |
355 |
> |
Vector3d pos; |
356 |
> |
Vector3d vel; |
357 |
> |
pos = integrableObject->getPos(); |
358 |
> |
|
359 |
> |
if (isinf(pos[0]) || isnan(pos[0]) || |
360 |
> |
isinf(pos[1]) || isnan(pos[1]) || |
361 |
> |
isinf(pos[2]) || isnan(pos[2]) ) { |
362 |
> |
sprintf( painCave.errMsg, |
363 |
> |
"DumpWriter detected a numerical error writing the position" |
364 |
> |
" for object %d", index); |
365 |
> |
painCave.isFatal = 1; |
366 |
> |
simError(); |
367 |
|
} |
368 |
|
|
369 |
< |
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; |
369 |
> |
vel = integrableObject->getVel(); |
370 |
|
|
371 |
< |
int * potatoes; |
372 |
< |
int myPotato; |
373 |
< |
int nProc; |
374 |
< |
int which_node; |
375 |
< |
double atomData[19]; |
376 |
< |
int isDirectional; |
377 |
< |
char MPIatomTypeString[MINIBUFFERSIZE]; |
378 |
< |
int msgLen; // the length of message actually recieved at master nodes |
306 |
< |
int haveError; |
307 |
< |
MPI_Status istatus; |
308 |
< |
int nCurObj; |
309 |
< |
|
310 |
< |
// code to find maximum tag value |
311 |
< |
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; |
371 |
> |
if (isinf(vel[0]) || isnan(vel[0]) || |
372 |
> |
isinf(vel[1]) || isnan(vel[1]) || |
373 |
> |
isinf(vel[2]) || isnan(vel[2]) ) { |
374 |
> |
sprintf( painCave.errMsg, |
375 |
> |
"DumpWriter detected a numerical error writing the velocity" |
376 |
> |
" for object %d", index); |
377 |
> |
painCave.isFatal = 1; |
378 |
> |
simError(); |
379 |
|
} |
380 |
|
|
381 |
< |
if (worldRank == masterNode) { //master node (node 0) is responsible for writing the dump file |
381 |
> |
sprintf(tempBuffer, "%18.10g %18.10g %18.10g %13e %13e %13e", |
382 |
> |
pos[0], pos[1], pos[2], |
383 |
> |
vel[0], vel[1], vel[2]); |
384 |
> |
line += tempBuffer; |
385 |
|
|
386 |
< |
// Node 0 needs a list of the magic potatoes for each processor; |
386 |
> |
if (integrableObject->isDirectional()) { |
387 |
> |
type += "qj"; |
388 |
> |
Quat4d q; |
389 |
> |
Vector3d ji; |
390 |
> |
q = integrableObject->getQ(); |
391 |
|
|
392 |
< |
MPI_Comm_size(MPI_COMM_WORLD, &nProc); |
393 |
< |
potatoes = new int[nProc]; |
394 |
< |
|
395 |
< |
//write out the comment lines |
396 |
< |
for(int i = 0; i < nProc; i++) { |
397 |
< |
potatoes[i] = 0; |
392 |
> |
if (isinf(q[0]) || isnan(q[0]) || |
393 |
> |
isinf(q[1]) || isnan(q[1]) || |
394 |
> |
isinf(q[2]) || isnan(q[2]) || |
395 |
> |
isinf(q[3]) || isnan(q[3]) ) { |
396 |
> |
sprintf( painCave.errMsg, |
397 |
> |
"DumpWriter detected a numerical error writing the quaternion" |
398 |
> |
" for object %d", index); |
399 |
> |
painCave.isFatal = 1; |
400 |
> |
simError(); |
401 |
|
} |
402 |
|
|
403 |
+ |
ji = integrableObject->getJ(); |
404 |
|
|
405 |
< |
os << nTotObjects << "\n"; |
406 |
< |
writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot()); |
407 |
< |
|
408 |
< |
for(int i = 0; i < info_->getNGlobalMolecules(); i++) { |
409 |
< |
|
410 |
< |
// Get the Node number which has this atom; |
405 |
> |
if (isinf(ji[0]) || isnan(ji[0]) || |
406 |
> |
isinf(ji[1]) || isnan(ji[1]) || |
407 |
> |
isinf(ji[2]) || isnan(ji[2]) ) { |
408 |
> |
sprintf( painCave.errMsg, |
409 |
> |
"DumpWriter detected a numerical error writing the angular" |
410 |
> |
" momentum for object %d", index); |
411 |
> |
painCave.isFatal = 1; |
412 |
> |
simError(); |
413 |
> |
} |
414 |
|
|
415 |
< |
which_node = info_->getMolToProc(i); |
415 |
> |
sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e %13e", |
416 |
> |
q[0], q[1], q[2], q[3], |
417 |
> |
ji[0], ji[1], ji[2]); |
418 |
> |
line += tempBuffer; |
419 |
> |
} |
420 |
|
|
421 |
< |
if (which_node != masterNode) { //current molecule is in slave node |
422 |
< |
if (potatoes[which_node] + 1 >= MAXTAG) { |
423 |
< |
// The potato was going to exceed the maximum value, |
347 |
< |
// so wrap this processor potato back to 0: |
421 |
> |
if (needForceVector_) { |
422 |
> |
type += "f"; |
423 |
> |
Vector3d frc; |
424 |
|
|
425 |
< |
potatoes[which_node] = 0; |
350 |
< |
MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0, |
351 |
< |
MPI_COMM_WORLD); |
352 |
< |
} |
425 |
> |
frc = integrableObject->getFrc(); |
426 |
|
|
427 |
< |
myPotato = potatoes[which_node]; |
428 |
< |
|
429 |
< |
//recieve the number of integrableObject in current molecule |
430 |
< |
MPI_Recv(&nCurObj, 1, MPI_INT, which_node, myPotato, |
431 |
< |
MPI_COMM_WORLD, &istatus); |
432 |
< |
myPotato++; |
433 |
< |
|
434 |
< |
for(int l = 0; l < nCurObj; l++) { |
362 |
< |
if (potatoes[which_node] + 2 >= MAXTAG) { |
363 |
< |
// The potato was going to exceed the maximum value, |
364 |
< |
// so wrap this processor potato back to 0: |
365 |
< |
|
366 |
< |
potatoes[which_node] = 0; |
367 |
< |
MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, |
368 |
< |
0, MPI_COMM_WORLD); |
369 |
< |
} |
370 |
< |
|
371 |
< |
MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, |
372 |
< |
which_node, myPotato, MPI_COMM_WORLD, |
373 |
< |
&istatus); |
374 |
< |
|
375 |
< |
myPotato++; |
376 |
< |
|
377 |
< |
MPI_Recv(atomData, 19, MPI_DOUBLE, which_node, myPotato, |
378 |
< |
MPI_COMM_WORLD, &istatus); |
379 |
< |
myPotato++; |
380 |
< |
|
381 |
< |
MPI_Get_count(&istatus, MPI_DOUBLE, &msgLen); |
382 |
< |
|
383 |
< |
if (msgLen == 13 || msgLen == 19) |
384 |
< |
isDirectional = 1; |
385 |
< |
else |
386 |
< |
isDirectional = 0; |
387 |
< |
|
388 |
< |
// If we've survived to here, format the line: |
389 |
< |
|
390 |
< |
if (!isDirectional) { |
391 |
< |
sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", |
392 |
< |
MPIatomTypeString, atomData[0], |
393 |
< |
atomData[1], atomData[2], |
394 |
< |
atomData[3], atomData[4], |
395 |
< |
atomData[5]); |
396 |
< |
|
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 |
< |
} |
437 |
< |
|
438 |
< |
sprintf(writeLine, "\n"); |
439 |
< |
os << writeLine; |
440 |
< |
|
441 |
< |
} // end for(int l =0) |
442 |
< |
|
443 |
< |
potatoes[which_node] = myPotato; |
444 |
< |
} else { //master node has current molecule |
445 |
< |
|
446 |
< |
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 |
< |
|
427 |
> |
if (isinf(frc[0]) || isnan(frc[0]) || |
428 |
> |
isinf(frc[1]) || isnan(frc[1]) || |
429 |
> |
isinf(frc[2]) || isnan(frc[2]) ) { |
430 |
> |
sprintf( painCave.errMsg, |
431 |
> |
"DumpWriter detected a numerical error writing the force" |
432 |
> |
" for object %d", index); |
433 |
> |
painCave.isFatal = 1; |
434 |
> |
simError(); |
435 |
|
} |
436 |
< |
sprintf(checkPointMsg, "Sucessfully took a dump.\n"); |
437 |
< |
MPIcheckPoint(); |
436 |
> |
sprintf(tempBuffer, " %13e %13e %13e", |
437 |
> |
frc[0], frc[1], frc[2]); |
438 |
> |
line += tempBuffer; |
439 |
> |
|
440 |
> |
if (integrableObject->isDirectional()) { |
441 |
> |
type += "t"; |
442 |
> |
Vector3d trq; |
443 |
> |
|
444 |
> |
trq = integrableObject->getTrq(); |
445 |
> |
|
446 |
> |
if (isinf(trq[0]) || isnan(trq[0]) || |
447 |
> |
isinf(trq[1]) || isnan(trq[1]) || |
448 |
> |
isinf(trq[2]) || isnan(trq[2]) ) { |
449 |
> |
sprintf( painCave.errMsg, |
450 |
> |
"DumpWriter detected a numerical error writing the torque" |
451 |
> |
" for object %d", index); |
452 |
> |
painCave.isFatal = 1; |
453 |
> |
simError(); |
454 |
> |
} |
455 |
> |
|
456 |
> |
sprintf(tempBuffer, " %13e %13e %13e", |
457 |
> |
trq[0], trq[1], trq[2]); |
458 |
> |
line += tempBuffer; |
459 |
> |
} |
460 |
|
} |
461 |
< |
|
462 |
< |
#endif // is_mpi |
463 |
< |
|
461 |
> |
|
462 |
> |
sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str()); |
463 |
> |
return std::string(tempBuffer); |
464 |
|
} |
465 |
|
|
466 |
|
void DumpWriter::writeDump() { |
485 |
|
#ifdef IS_MPI |
486 |
|
if (worldRank == 0) { |
487 |
|
#endif // is_mpi |
488 |
< |
delete eorStream; |
489 |
< |
|
488 |
> |
writeClosing(*eorStream); |
489 |
> |
delete eorStream; |
490 |
|
#ifdef IS_MPI |
491 |
|
} |
492 |
|
#endif // is_mpi |
519 |
|
#ifdef IS_MPI |
520 |
|
if (worldRank == 0) { |
521 |
|
#endif // is_mpi |
522 |
< |
delete eorStream; |
523 |
< |
|
522 |
> |
writeClosing(*eorStream); |
523 |
> |
delete eorStream; |
524 |
|
#ifdef IS_MPI |
525 |
|
} |
526 |
|
#endif // is_mpi |
527 |
|
|
528 |
|
} |
529 |
|
|
530 |
< |
std::ostream* DumpWriter::createOStream(const std::string& filename) { |
530 |
> |
std::ostream* DumpWriter::createOStream(const std::string& filename) { |
531 |
|
|
532 |
|
std::ostream* newOStream; |
533 |
|
#ifdef HAVE_LIBZ |
534 |
|
if (needCompression_) { |
535 |
< |
newOStream = new ogzstream(filename.c_str()); |
535 |
> |
newOStream = new ogzstream(filename.c_str()); |
536 |
|
} else { |
537 |
< |
newOStream = new std::ofstream(filename.c_str()); |
537 |
> |
newOStream = new std::ofstream(filename.c_str()); |
538 |
|
} |
539 |
|
#else |
540 |
|
newOStream = new std::ofstream(filename.c_str()); |
541 |
|
#endif |
542 |
+ |
//write out MetaData first |
543 |
+ |
(*newOStream) << "<OpenMD version=1>" << std::endl; |
544 |
+ |
(*newOStream) << " <MetaData>" << std::endl; |
545 |
+ |
(*newOStream) << info_->getRawMetaData(); |
546 |
+ |
(*newOStream) << " </MetaData>" << std::endl; |
547 |
|
return newOStream; |
548 |
< |
} |
548 |
> |
} |
549 |
|
|
550 |
< |
}//end namespace oopse |
550 |
> |
void DumpWriter::writeClosing(std::ostream& os) { |
551 |
> |
|
552 |
> |
os << "</OpenMD>\n"; |
553 |
> |
os.flush(); |
554 |
> |
} |
555 |
> |
|
556 |
> |
}//end namespace OpenMD |