1 |
< |
/* |
2 |
< |
* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. |
1 |
> |
/* |
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] 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 |
+ |
#include "io/gzstream.hpp" |
48 |
+ |
#include "io/Globals.hpp" |
49 |
|
|
50 |
+ |
|
51 |
|
#ifdef IS_MPI |
52 |
|
#include <mpi.h> |
53 |
|
#endif //is_mpi |
54 |
|
|
55 |
< |
namespace oopse { |
55 |
> |
using namespace std; |
56 |
> |
namespace OpenMD { |
57 |
|
|
58 |
< |
DumpWriter::DumpWriter(SimInfo* info, const std::string& filename) |
59 |
< |
: info_(info), filename_(filename){ |
58 |
> |
DumpWriter::DumpWriter(SimInfo* info) |
59 |
> |
: info_(info), filename_(info->getDumpFileName()), eorFilename_(info->getFinalConfigFileName()){ |
60 |
> |
|
61 |
> |
Globals* simParams = info->getSimParams(); |
62 |
> |
needCompression_ = simParams->getCompressDumpFile(); |
63 |
> |
needForceVector_ = simParams->getOutputForceVector(); |
64 |
> |
needParticlePot_ = simParams->getOutputParticlePotential(); |
65 |
> |
createDumpFile_ = true; |
66 |
> |
#ifdef HAVE_LIBZ |
67 |
> |
if (needCompression_) { |
68 |
> |
filename_ += ".gz"; |
69 |
> |
eorFilename_ += ".gz"; |
70 |
> |
} |
71 |
> |
#endif |
72 |
> |
|
73 |
|
#ifdef IS_MPI |
74 |
|
|
75 |
|
if (worldRank == 0) { |
76 |
|
#endif // is_mpi |
77 |
+ |
|
78 |
+ |
dumpFile_ = createOStream(filename_); |
79 |
|
|
80 |
< |
dumpFile_.open(filename_.c_str(), std::ios::out | std::ios::trunc); |
80 |
> |
if (!dumpFile_) { |
81 |
> |
sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n", |
82 |
> |
filename_.c_str()); |
83 |
> |
painCave.isFatal = 1; |
84 |
> |
simError(); |
85 |
> |
} |
86 |
|
|
61 |
– |
if (!dumpFile_) { |
62 |
– |
sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n", |
63 |
– |
filename_.c_str()); |
64 |
– |
painCave.isFatal = 1; |
65 |
– |
simError(); |
66 |
– |
} |
67 |
– |
|
87 |
|
#ifdef IS_MPI |
88 |
|
|
89 |
|
} |
90 |
|
|
72 |
– |
sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n"); |
73 |
– |
MPIcheckPoint(); |
74 |
– |
|
91 |
|
#endif // is_mpi |
92 |
|
|
93 |
< |
} |
93 |
> |
} |
94 |
|
|
79 |
– |
DumpWriter::~DumpWriter() { |
95 |
|
|
96 |
+ |
DumpWriter::DumpWriter(SimInfo* info, const std::string& filename) |
97 |
+ |
: info_(info), filename_(filename){ |
98 |
+ |
|
99 |
+ |
Globals* simParams = info->getSimParams(); |
100 |
+ |
eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor"; |
101 |
+ |
|
102 |
+ |
needCompression_ = simParams->getCompressDumpFile(); |
103 |
+ |
needForceVector_ = simParams->getOutputForceVector(); |
104 |
+ |
createDumpFile_ = true; |
105 |
+ |
#ifdef HAVE_LIBZ |
106 |
+ |
if (needCompression_) { |
107 |
+ |
filename_ += ".gz"; |
108 |
+ |
eorFilename_ += ".gz"; |
109 |
+ |
} |
110 |
+ |
#endif |
111 |
+ |
|
112 |
|
#ifdef IS_MPI |
113 |
|
|
114 |
|
if (worldRank == 0) { |
115 |
|
#endif // is_mpi |
116 |
|
|
117 |
< |
dumpFile_.close(); |
117 |
> |
|
118 |
> |
dumpFile_ = createOStream(filename_); |
119 |
|
|
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 |
+ |
|
127 |
|
#ifdef IS_MPI |
128 |
|
|
129 |
|
} |
130 |
|
|
131 |
|
#endif // is_mpi |
132 |
|
|
133 |
< |
} |
133 |
> |
} |
134 |
> |
|
135 |
> |
DumpWriter::DumpWriter(SimInfo* info, const std::string& filename, bool writeDumpFile) |
136 |
> |
: info_(info), filename_(filename){ |
137 |
> |
|
138 |
> |
Globals* simParams = info->getSimParams(); |
139 |
> |
eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor"; |
140 |
> |
|
141 |
> |
needCompression_ = simParams->getCompressDumpFile(); |
142 |
> |
needForceVector_ = simParams->getOutputForceVector(); |
143 |
> |
needParticlePot_ = simParams->getOutputParticlePotential(); |
144 |
> |
|
145 |
> |
#ifdef HAVE_LIBZ |
146 |
> |
if (needCompression_) { |
147 |
> |
filename_ += ".gz"; |
148 |
> |
eorFilename_ += ".gz"; |
149 |
> |
} |
150 |
> |
#endif |
151 |
> |
|
152 |
> |
#ifdef IS_MPI |
153 |
> |
|
154 |
> |
if (worldRank == 0) { |
155 |
> |
#endif // is_mpi |
156 |
> |
|
157 |
> |
createDumpFile_ = writeDumpFile; |
158 |
> |
if (createDumpFile_) { |
159 |
> |
dumpFile_ = createOStream(filename_); |
160 |
> |
|
161 |
> |
if (!dumpFile_) { |
162 |
> |
sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n", |
163 |
> |
filename_.c_str()); |
164 |
> |
painCave.isFatal = 1; |
165 |
> |
simError(); |
166 |
> |
} |
167 |
> |
} |
168 |
> |
#ifdef IS_MPI |
169 |
> |
|
170 |
> |
} |
171 |
|
|
96 |
– |
void DumpWriter::writeCommentLine(std::ostream& os, Snapshot* s) { |
97 |
– |
|
98 |
– |
double currentTime; |
99 |
– |
Mat3x3d hmat; |
100 |
– |
double chi; |
101 |
– |
double integralOfChiDt; |
102 |
– |
Mat3x3d eta; |
172 |
|
|
173 |
< |
currentTime = s->getTime(); |
105 |
< |
hmat = s->getHmat(); |
106 |
< |
chi = s->getChi(); |
107 |
< |
integralOfChiDt = s->getIntegralOfChiDt(); |
108 |
< |
eta = s->getEta(); |
173 |
> |
#endif // is_mpi |
174 |
|
|
175 |
< |
os << currentTime << ";\t" |
111 |
< |
<< hmat(0, 0) << "\t" << hmat(1, 0) << "\t" << hmat(2, 0) << ";\t" |
112 |
< |
<< hmat(0, 1) << "\t" << hmat(1, 1) << "\t" << hmat(2, 1) << ";\t" |
113 |
< |
<< hmat(0, 2) << "\t" << hmat(1, 2) << "\t" << hmat(2, 2) << ";\t"; |
175 |
> |
} |
176 |
|
|
177 |
< |
//write out additional parameters, such as chi and eta |
177 |
> |
DumpWriter::~DumpWriter() { |
178 |
|
|
179 |
< |
os << chi << "\t" << integralOfChiDt << "\t;"; |
179 |
> |
#ifdef IS_MPI |
180 |
|
|
181 |
< |
os << eta(0, 0) << "\t" << eta(1, 0) << "\t" << eta(2, 0) << ";\t" |
182 |
< |
<< eta(0, 1) << "\t" << eta(1, 1) << "\t" << eta(2, 1) << ";\t" |
183 |
< |
<< eta(0, 2) << "\t" << eta(1, 2) << "\t" << eta(2, 2) << ";"; |
184 |
< |
|
185 |
< |
os << std::endl; |
186 |
< |
} |
181 |
> |
if (worldRank == 0) { |
182 |
> |
#endif // is_mpi |
183 |
> |
if (createDumpFile_){ |
184 |
> |
writeClosing(*dumpFile_); |
185 |
> |
delete dumpFile_; |
186 |
> |
} |
187 |
> |
#ifdef IS_MPI |
188 |
|
|
189 |
< |
void DumpWriter::writeFrame(std::ostream& os) { |
127 |
< |
const int BUFFERSIZE = 2000; |
128 |
< |
const int MINIBUFFERSIZE = 100; |
189 |
> |
} |
190 |
|
|
191 |
< |
char tempBuffer[BUFFERSIZE]; |
131 |
< |
char writeLine[BUFFERSIZE]; |
191 |
> |
#endif // is_mpi |
192 |
|
|
193 |
< |
Quat4d q; |
134 |
< |
Vector3d ji; |
135 |
< |
Vector3d pos; |
136 |
< |
Vector3d vel; |
193 |
> |
} |
194 |
|
|
195 |
< |
Molecule* mol; |
139 |
< |
StuntDouble* integrableObject; |
140 |
< |
SimInfo::MoleculeIterator mi; |
141 |
< |
Molecule::IntegrableObjectIterator ii; |
142 |
< |
|
143 |
< |
int nTotObjects; |
144 |
< |
nTotObjects = info_->getNGlobalIntegrableObjects(); |
195 |
> |
void DumpWriter::writeFrameProperties(std::ostream& os, Snapshot* s) { |
196 |
|
|
197 |
< |
#ifndef IS_MPI |
197 |
> |
char buffer[1024]; |
198 |
|
|
199 |
+ |
os << " <FrameData>\n"; |
200 |
|
|
201 |
< |
os << nTotObjects << "\n"; |
150 |
< |
|
151 |
< |
writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot()); |
201 |
> |
RealType currentTime = s->getTime(); |
202 |
|
|
203 |
< |
for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) { |
203 |
> |
if (isinf(currentTime) || isnan(currentTime)) { |
204 |
> |
sprintf( painCave.errMsg, |
205 |
> |
"DumpWriter detected a numerical error writing the time"); |
206 |
> |
painCave.isFatal = 1; |
207 |
> |
simError(); |
208 |
> |
} |
209 |
> |
|
210 |
> |
sprintf(buffer, " Time: %.10g\n", currentTime); |
211 |
> |
os << buffer; |
212 |
|
|
213 |
< |
for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; |
214 |
< |
integrableObject = mol->nextIntegrableObject(ii)) { |
157 |
< |
|
213 |
> |
Mat3x3d hmat; |
214 |
> |
hmat = s->getHmat(); |
215 |
|
|
216 |
< |
pos = integrableObject->getPos(); |
217 |
< |
vel = integrableObject->getVel(); |
218 |
< |
|
219 |
< |
sprintf(tempBuffer, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", |
220 |
< |
integrableObject->getType().c_str(), |
221 |
< |
pos[0], pos[1], pos[2], |
222 |
< |
vel[0], vel[1], vel[2]); |
223 |
< |
|
224 |
< |
strcpy(writeLine, tempBuffer); |
225 |
< |
|
226 |
< |
if (integrableObject->isDirectional()) { |
227 |
< |
q = integrableObject->getQ(); |
228 |
< |
ji = integrableObject->getJ(); |
229 |
< |
|
230 |
< |
sprintf(tempBuffer, "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n", |
231 |
< |
q[0], q[1], q[2], q[3], |
175 |
< |
ji[0], ji[1], ji[2]); |
176 |
< |
strcat(writeLine, tempBuffer); |
177 |
< |
} else { |
178 |
< |
strcat(writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n"); |
179 |
< |
} |
180 |
< |
|
181 |
< |
os << writeLine; |
216 |
> |
for (unsigned int i = 0; i < 3; i++) { |
217 |
> |
for (unsigned int j = 0; j < 3; j++) { |
218 |
> |
if (isinf(hmat(i,j)) || isnan(hmat(i,j))) { |
219 |
> |
sprintf( painCave.errMsg, |
220 |
> |
"DumpWriter detected a numerical error writing the box"); |
221 |
> |
painCave.isFatal = 1; |
222 |
> |
simError(); |
223 |
> |
} |
224 |
> |
} |
225 |
> |
} |
226 |
> |
|
227 |
> |
sprintf(buffer, " Hmat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n", |
228 |
> |
hmat(0, 0), hmat(1, 0), hmat(2, 0), |
229 |
> |
hmat(0, 1), hmat(1, 1), hmat(2, 1), |
230 |
> |
hmat(0, 2), hmat(1, 2), hmat(2, 2)); |
231 |
> |
os << buffer; |
232 |
|
|
233 |
< |
} |
233 |
> |
RealType chi = s->getChi(); |
234 |
> |
RealType integralOfChiDt = s->getIntegralOfChiDt(); |
235 |
> |
if (isinf(chi) || isnan(chi) || |
236 |
> |
isinf(integralOfChiDt) || isnan(integralOfChiDt)) { |
237 |
> |
sprintf( painCave.errMsg, |
238 |
> |
"DumpWriter detected a numerical error writing the thermostat"); |
239 |
> |
painCave.isFatal = 1; |
240 |
> |
simError(); |
241 |
|
} |
242 |
+ |
sprintf(buffer, " Thermostat: %.10g , %.10g\n", chi, integralOfChiDt); |
243 |
+ |
os << buffer; |
244 |
|
|
245 |
< |
os.flush(); |
246 |
< |
#else // is_mpi |
188 |
< |
/********************************************************************* |
189 |
< |
* Documentation? You want DOCUMENTATION? |
190 |
< |
* |
191 |
< |
* Why all the potatoes below? |
192 |
< |
* |
193 |
< |
* To make a long story short, the original version of DumpWriter |
194 |
< |
* worked in the most inefficient way possible. Node 0 would |
195 |
< |
* poke each of the node for an individual atom's formatted data |
196 |
< |
* as node 0 worked its way down the global index. This was particularly |
197 |
< |
* inefficient since the method blocked all processors at every atom |
198 |
< |
* (and did it twice!). |
199 |
< |
* |
200 |
< |
* An intermediate version of DumpWriter could be described from Node |
201 |
< |
* zero's perspective as follows: |
202 |
< |
* |
203 |
< |
* 1) Have 100 of your friends stand in a circle. |
204 |
< |
* 2) When you say go, have all of them start tossing potatoes at |
205 |
< |
* you (one at a time). |
206 |
< |
* 3) Catch the potatoes. |
207 |
< |
* |
208 |
< |
* It was an improvement, but MPI has buffers and caches that could |
209 |
< |
* best be described in this analogy as "potato nets", so there's no |
210 |
< |
* need to block the processors atom-by-atom. |
211 |
< |
* |
212 |
< |
* This new and improved DumpWriter works in an even more efficient |
213 |
< |
* way: |
214 |
< |
* |
215 |
< |
* 1) Have 100 of your friend stand in a circle. |
216 |
< |
* 2) When you say go, have them start tossing 5-pound bags of |
217 |
< |
* potatoes at you. |
218 |
< |
* 3) Once you've caught a friend's bag of potatoes, |
219 |
< |
* toss them a spud to let them know they can toss another bag. |
220 |
< |
* |
221 |
< |
* How's THAT for documentation? |
222 |
< |
* |
223 |
< |
*********************************************************************/ |
224 |
< |
const int masterNode = 0; |
245 |
> |
Mat3x3d eta; |
246 |
> |
eta = s->getEta(); |
247 |
|
|
248 |
< |
int * potatoes; |
249 |
< |
int myPotato; |
250 |
< |
int nProc; |
251 |
< |
int which_node; |
252 |
< |
double atomData[13]; |
253 |
< |
int isDirectional; |
254 |
< |
const char * atomTypeString; |
255 |
< |
char MPIatomTypeString[MINIBUFFERSIZE]; |
256 |
< |
int msgLen; // the length of message actually recieved at master nodes |
257 |
< |
int haveError; |
248 |
> |
for (unsigned int i = 0; i < 3; i++) { |
249 |
> |
for (unsigned int j = 0; j < 3; j++) { |
250 |
> |
if (isinf(eta(i,j)) || isnan(eta(i,j))) { |
251 |
> |
sprintf( painCave.errMsg, |
252 |
> |
"DumpWriter detected a numerical error writing the barostat"); |
253 |
> |
painCave.isFatal = 1; |
254 |
> |
simError(); |
255 |
> |
} |
256 |
> |
} |
257 |
> |
} |
258 |
> |
|
259 |
> |
sprintf(buffer, " Barostat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n", |
260 |
> |
eta(0, 0), eta(1, 0), eta(2, 0), |
261 |
> |
eta(0, 1), eta(1, 1), eta(2, 1), |
262 |
> |
eta(0, 2), eta(1, 2), eta(2, 2)); |
263 |
> |
os << buffer; |
264 |
> |
|
265 |
> |
os << " </FrameData>\n"; |
266 |
> |
} |
267 |
> |
|
268 |
> |
void DumpWriter::writeFrame(std::ostream& os) { |
269 |
> |
|
270 |
> |
#ifdef IS_MPI |
271 |
|
MPI_Status istatus; |
272 |
< |
int nCurObj; |
272 |
> |
#endif |
273 |
> |
|
274 |
> |
Molecule* mol; |
275 |
> |
StuntDouble* integrableObject; |
276 |
> |
SimInfo::MoleculeIterator mi; |
277 |
> |
Molecule::IntegrableObjectIterator ii; |
278 |
> |
|
279 |
> |
#ifndef IS_MPI |
280 |
> |
os << " <Snapshot>\n"; |
281 |
> |
|
282 |
> |
writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot()); |
283 |
> |
|
284 |
> |
os << " <StuntDoubles>\n"; |
285 |
> |
for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) { |
286 |
> |
|
287 |
> |
|
288 |
> |
for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; |
289 |
> |
integrableObject = mol->nextIntegrableObject(ii)) { |
290 |
> |
os << prepareDumpLine(integrableObject); |
291 |
> |
|
292 |
> |
} |
293 |
> |
} |
294 |
> |
os << " </StuntDoubles>\n"; |
295 |
|
|
296 |
< |
// code to find maximum tag value |
240 |
< |
int * tagub; |
241 |
< |
int flag; |
242 |
< |
int MAXTAG; |
243 |
< |
MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag); |
296 |
> |
os << " </Snapshot>\n"; |
297 |
|
|
298 |
< |
if (flag) { |
299 |
< |
MAXTAG = *tagub; |
298 |
> |
os.flush(); |
299 |
> |
#else |
300 |
> |
//every node prepares the dump lines for integrable objects belong to itself |
301 |
> |
std::string buffer; |
302 |
> |
for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) { |
303 |
> |
|
304 |
> |
|
305 |
> |
for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; |
306 |
> |
integrableObject = mol->nextIntegrableObject(ii)) { |
307 |
> |
buffer += prepareDumpLine(integrableObject); |
308 |
> |
} |
309 |
> |
} |
310 |
> |
|
311 |
> |
const int masterNode = 0; |
312 |
> |
int nProc; |
313 |
> |
MPI_Comm_size(MPI_COMM_WORLD, &nProc); |
314 |
> |
if (worldRank == masterNode) { |
315 |
> |
os << " <Snapshot>\n"; |
316 |
> |
writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot()); |
317 |
> |
os << " <StuntDoubles>\n"; |
318 |
> |
|
319 |
> |
os << buffer; |
320 |
> |
|
321 |
> |
for (int i = 1; i < nProc; ++i) { |
322 |
> |
|
323 |
> |
// receive the length of the string buffer that was |
324 |
> |
// prepared by processor i |
325 |
> |
|
326 |
> |
MPI_Bcast(&i, 1, MPI_INT,masterNode,MPI_COMM_WORLD); |
327 |
> |
int recvLength; |
328 |
> |
MPI_Recv(&recvLength, 1, MPI_INT, i, 0, MPI_COMM_WORLD, &istatus); |
329 |
> |
char* recvBuffer = new char[recvLength]; |
330 |
> |
if (recvBuffer == NULL) { |
331 |
> |
} else { |
332 |
> |
MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, &istatus); |
333 |
> |
os << recvBuffer; |
334 |
> |
delete [] recvBuffer; |
335 |
> |
} |
336 |
> |
} |
337 |
> |
os << " </StuntDoubles>\n"; |
338 |
> |
|
339 |
> |
os << " </Snapshot>\n"; |
340 |
> |
os.flush(); |
341 |
|
} else { |
342 |
< |
MAXTAG = 32767; |
342 |
> |
int sendBufferLength = buffer.size() + 1; |
343 |
> |
int myturn = 0; |
344 |
> |
for (int i = 1; i < nProc; ++i){ |
345 |
> |
MPI_Bcast(&myturn,1, MPI_INT,masterNode,MPI_COMM_WORLD); |
346 |
> |
if (myturn == worldRank){ |
347 |
> |
MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD); |
348 |
> |
MPI_Send((void *)buffer.c_str(), sendBufferLength, MPI_CHAR, masterNode, 0, MPI_COMM_WORLD); |
349 |
> |
} |
350 |
> |
} |
351 |
|
} |
352 |
|
|
353 |
< |
if (worldRank == masterNode) { //master node (node 0) is responsible for writing the dump file |
353 |
> |
#endif // is_mpi |
354 |
|
|
355 |
< |
// Node 0 needs a list of the magic potatoes for each processor; |
355 |
> |
} |
356 |
|
|
357 |
< |
MPI_Comm_size(MPI_COMM_WORLD, &nProc); |
358 |
< |
potatoes = new int[nProc]; |
357 |
> |
std::string DumpWriter::prepareDumpLine(StuntDouble* integrableObject) { |
358 |
> |
|
359 |
> |
int index = integrableObject->getGlobalIntegrableObjectIndex(); |
360 |
> |
std::string type("pv"); |
361 |
> |
std::string line; |
362 |
> |
char tempBuffer[4096]; |
363 |
> |
|
364 |
> |
Vector3d pos; |
365 |
> |
Vector3d vel; |
366 |
> |
pos = integrableObject->getPos(); |
367 |
> |
|
368 |
> |
if (isinf(pos[0]) || isnan(pos[0]) || |
369 |
> |
isinf(pos[1]) || isnan(pos[1]) || |
370 |
> |
isinf(pos[2]) || isnan(pos[2]) ) { |
371 |
> |
sprintf( painCave.errMsg, |
372 |
> |
"DumpWriter detected a numerical error writing the position" |
373 |
> |
" for object %d", index); |
374 |
> |
painCave.isFatal = 1; |
375 |
> |
simError(); |
376 |
> |
} |
377 |
> |
|
378 |
> |
vel = integrableObject->getVel(); |
379 |
> |
|
380 |
> |
if (isinf(vel[0]) || isnan(vel[0]) || |
381 |
> |
isinf(vel[1]) || isnan(vel[1]) || |
382 |
> |
isinf(vel[2]) || isnan(vel[2]) ) { |
383 |
> |
sprintf( painCave.errMsg, |
384 |
> |
"DumpWriter detected a numerical error writing the velocity" |
385 |
> |
" for object %d", index); |
386 |
> |
painCave.isFatal = 1; |
387 |
> |
simError(); |
388 |
> |
} |
389 |
> |
|
390 |
> |
sprintf(tempBuffer, "%18.10g %18.10g %18.10g %13e %13e %13e", |
391 |
> |
pos[0], pos[1], pos[2], |
392 |
> |
vel[0], vel[1], vel[2]); |
393 |
> |
line += tempBuffer; |
394 |
> |
|
395 |
> |
if (integrableObject->isDirectional()) { |
396 |
> |
type += "qj"; |
397 |
> |
Quat4d q; |
398 |
> |
Vector3d ji; |
399 |
> |
q = integrableObject->getQ(); |
400 |
> |
|
401 |
> |
if (isinf(q[0]) || isnan(q[0]) || |
402 |
> |
isinf(q[1]) || isnan(q[1]) || |
403 |
> |
isinf(q[2]) || isnan(q[2]) || |
404 |
> |
isinf(q[3]) || isnan(q[3]) ) { |
405 |
> |
sprintf( painCave.errMsg, |
406 |
> |
"DumpWriter detected a numerical error writing the quaternion" |
407 |
> |
" for object %d", index); |
408 |
> |
painCave.isFatal = 1; |
409 |
> |
simError(); |
410 |
> |
} |
411 |
|
|
412 |
< |
//write out the comment lines |
259 |
< |
for(int i = 0; i < nProc; i++) { |
260 |
< |
potatoes[i] = 0; |
261 |
< |
} |
412 |
> |
ji = integrableObject->getJ(); |
413 |
|
|
414 |
+ |
if (isinf(ji[0]) || isnan(ji[0]) || |
415 |
+ |
isinf(ji[1]) || isnan(ji[1]) || |
416 |
+ |
isinf(ji[2]) || isnan(ji[2]) ) { |
417 |
+ |
sprintf( painCave.errMsg, |
418 |
+ |
"DumpWriter detected a numerical error writing the angular" |
419 |
+ |
" momentum for object %d", index); |
420 |
+ |
painCave.isFatal = 1; |
421 |
+ |
simError(); |
422 |
+ |
} |
423 |
|
|
424 |
< |
os << nTotObjects << "\n"; |
425 |
< |
writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot()); |
424 |
> |
sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e %13e", |
425 |
> |
q[0], q[1], q[2], q[3], |
426 |
> |
ji[0], ji[1], ji[2]); |
427 |
> |
line += tempBuffer; |
428 |
> |
} |
429 |
|
|
430 |
< |
for(int i = 0; i < info_->getNGlobalMolecules(); i++) { |
430 |
> |
if (needForceVector_) { |
431 |
> |
type += "f"; |
432 |
> |
Vector3d frc; |
433 |
|
|
434 |
< |
// Get the Node number which has this atom; |
434 |
> |
frc = integrableObject->getFrc(); |
435 |
|
|
436 |
< |
which_node = info_->getMolToProc(i); |
436 |
> |
if (isinf(frc[0]) || isnan(frc[0]) || |
437 |
> |
isinf(frc[1]) || isnan(frc[1]) || |
438 |
> |
isinf(frc[2]) || isnan(frc[2]) ) { |
439 |
> |
sprintf( painCave.errMsg, |
440 |
> |
"DumpWriter detected a numerical error writing the force" |
441 |
> |
" for object %d", index); |
442 |
> |
painCave.isFatal = 1; |
443 |
> |
simError(); |
444 |
> |
} |
445 |
> |
sprintf(tempBuffer, " %13e %13e %13e", |
446 |
> |
frc[0], frc[1], frc[2]); |
447 |
> |
line += tempBuffer; |
448 |
> |
|
449 |
> |
if (integrableObject->isDirectional()) { |
450 |
> |
type += "t"; |
451 |
> |
Vector3d trq; |
452 |
> |
|
453 |
> |
trq = integrableObject->getTrq(); |
454 |
> |
|
455 |
> |
if (isinf(trq[0]) || isnan(trq[0]) || |
456 |
> |
isinf(trq[1]) || isnan(trq[1]) || |
457 |
> |
isinf(trq[2]) || isnan(trq[2]) ) { |
458 |
> |
sprintf( painCave.errMsg, |
459 |
> |
"DumpWriter detected a numerical error writing the torque" |
460 |
> |
" for object %d", index); |
461 |
> |
painCave.isFatal = 1; |
462 |
> |
simError(); |
463 |
> |
} |
464 |
> |
|
465 |
> |
sprintf(tempBuffer, " %13e %13e %13e", |
466 |
> |
trq[0], trq[1], trq[2]); |
467 |
> |
line += tempBuffer; |
468 |
> |
} |
469 |
> |
} |
470 |
> |
if (needParticlePot_) { |
471 |
> |
type += "u"; |
472 |
> |
RealType particlePot; |
473 |
|
|
474 |
< |
if (which_node != masterNode) { //current molecule is in slave node |
274 |
< |
if (potatoes[which_node] + 1 >= MAXTAG) { |
275 |
< |
// The potato was going to exceed the maximum value, |
276 |
< |
// so wrap this processor potato back to 0: |
474 |
> |
particlePot = integrableObject->getParticlePot(); |
475 |
|
|
476 |
< |
potatoes[which_node] = 0; |
477 |
< |
MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0, |
478 |
< |
MPI_COMM_WORLD); |
479 |
< |
} |
476 |
> |
if (isinf(particlePot) || isnan(particlePot)) { |
477 |
> |
sprintf( painCave.errMsg, |
478 |
> |
"DumpWriter detected a numerical error writing the particle " |
479 |
> |
" potential for object %d", index); |
480 |
> |
painCave.isFatal = 1; |
481 |
> |
simError(); |
482 |
> |
} |
483 |
> |
sprintf(tempBuffer, " %13e", particlePot); |
484 |
> |
line += tempBuffer; |
485 |
> |
} |
486 |
> |
|
487 |
> |
sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str()); |
488 |
> |
return std::string(tempBuffer); |
489 |
> |
} |
490 |
|
|
491 |
< |
myPotato = potatoes[which_node]; |
491 |
> |
void DumpWriter::writeDump() { |
492 |
> |
writeFrame(*dumpFile_); |
493 |
> |
} |
494 |
|
|
495 |
< |
//recieve the number of integrableObject in current molecule |
496 |
< |
MPI_Recv(&nCurObj, 1, MPI_INT, which_node, myPotato, |
497 |
< |
MPI_COMM_WORLD, &istatus); |
498 |
< |
myPotato++; |
495 |
> |
void DumpWriter::writeEor() { |
496 |
> |
std::ostream* eorStream; |
497 |
> |
|
498 |
> |
#ifdef IS_MPI |
499 |
> |
if (worldRank == 0) { |
500 |
> |
#endif // is_mpi |
501 |
|
|
502 |
< |
for(int l = 0; l < nCurObj; l++) { |
291 |
< |
if (potatoes[which_node] + 2 >= MAXTAG) { |
292 |
< |
// The potato was going to exceed the maximum value, |
293 |
< |
// so wrap this processor potato back to 0: |
502 |
> |
eorStream = createOStream(eorFilename_); |
503 |
|
|
504 |
< |
potatoes[which_node] = 0; |
505 |
< |
MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, |
506 |
< |
0, MPI_COMM_WORLD); |
298 |
< |
} |
504 |
> |
#ifdef IS_MPI |
505 |
> |
} |
506 |
> |
#endif // is_mpi |
507 |
|
|
508 |
< |
MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, |
301 |
< |
which_node, myPotato, MPI_COMM_WORLD, |
302 |
< |
&istatus); |
508 |
> |
writeFrame(*eorStream); |
509 |
|
|
510 |
< |
atomTypeString = MPIatomTypeString; |
510 |
> |
#ifdef IS_MPI |
511 |
> |
if (worldRank == 0) { |
512 |
> |
#endif // is_mpi |
513 |
> |
writeClosing(*eorStream); |
514 |
> |
delete eorStream; |
515 |
> |
#ifdef IS_MPI |
516 |
> |
} |
517 |
> |
#endif // is_mpi |
518 |
|
|
519 |
< |
myPotato++; |
519 |
> |
} |
520 |
|
|
308 |
– |
MPI_Recv(atomData, 13, MPI_DOUBLE, which_node, myPotato, |
309 |
– |
MPI_COMM_WORLD, &istatus); |
310 |
– |
myPotato++; |
521 |
|
|
522 |
< |
MPI_Get_count(&istatus, MPI_DOUBLE, &msgLen); |
522 |
> |
void DumpWriter::writeDumpAndEor() { |
523 |
> |
std::vector<std::streambuf*> buffers; |
524 |
> |
std::ostream* eorStream; |
525 |
> |
#ifdef IS_MPI |
526 |
> |
if (worldRank == 0) { |
527 |
> |
#endif // is_mpi |
528 |
|
|
529 |
< |
if (msgLen == 13) |
315 |
< |
isDirectional = 1; |
316 |
< |
else |
317 |
< |
isDirectional = 0; |
529 |
> |
buffers.push_back(dumpFile_->rdbuf()); |
530 |
|
|
531 |
< |
// If we've survived to here, format the line: |
531 |
> |
eorStream = createOStream(eorFilename_); |
532 |
|
|
533 |
< |
if (!isDirectional) { |
322 |
< |
sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", |
323 |
< |
atomTypeString, atomData[0], |
324 |
< |
atomData[1], atomData[2], |
325 |
< |
atomData[3], atomData[4], |
326 |
< |
atomData[5]); |
327 |
< |
|
328 |
< |
strcat(writeLine, |
329 |
< |
"0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n"); |
330 |
< |
} else { |
331 |
< |
sprintf(writeLine, |
332 |
< |
"%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\n", |
333 |
< |
atomTypeString, |
334 |
< |
atomData[0], |
335 |
< |
atomData[1], |
336 |
< |
atomData[2], |
337 |
< |
atomData[3], |
338 |
< |
atomData[4], |
339 |
< |
atomData[5], |
340 |
< |
atomData[6], |
341 |
< |
atomData[7], |
342 |
< |
atomData[8], |
343 |
< |
atomData[9], |
344 |
< |
atomData[10], |
345 |
< |
atomData[11], |
346 |
< |
atomData[12]); |
347 |
< |
} |
348 |
< |
|
349 |
< |
os << writeLine; |
350 |
< |
|
351 |
< |
} // end for(int l =0) |
352 |
< |
|
353 |
< |
potatoes[which_node] = myPotato; |
354 |
< |
} else { //master node has current molecule |
355 |
< |
|
356 |
< |
mol = info_->getMoleculeByGlobalIndex(i); |
357 |
< |
|
358 |
< |
if (mol == NULL) { |
359 |
< |
sprintf(painCave.errMsg, "Molecule not found on node %d!", worldRank); |
360 |
< |
painCave.isFatal = 1; |
361 |
< |
simError(); |
362 |
< |
} |
363 |
< |
|
364 |
< |
for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; |
365 |
< |
integrableObject = mol->nextIntegrableObject(ii)) { |
366 |
< |
|
367 |
< |
atomTypeString = integrableObject->getType().c_str(); |
368 |
< |
|
369 |
< |
pos = integrableObject->getPos(); |
370 |
< |
vel = integrableObject->getVel(); |
371 |
< |
|
372 |
< |
atomData[0] = pos[0]; |
373 |
< |
atomData[1] = pos[1]; |
374 |
< |
atomData[2] = pos[2]; |
375 |
< |
|
376 |
< |
atomData[3] = vel[0]; |
377 |
< |
atomData[4] = vel[1]; |
378 |
< |
atomData[5] = vel[2]; |
379 |
< |
|
380 |
< |
isDirectional = 0; |
381 |
< |
|
382 |
< |
if (integrableObject->isDirectional()) { |
383 |
< |
isDirectional = 1; |
384 |
< |
|
385 |
< |
q = integrableObject->getQ(); |
386 |
< |
ji = integrableObject->getJ(); |
387 |
< |
|
388 |
< |
for(int j = 0; j < 6; j++) { |
389 |
< |
atomData[j] = atomData[j]; |
390 |
< |
} |
391 |
< |
|
392 |
< |
atomData[6] = q[0]; |
393 |
< |
atomData[7] = q[1]; |
394 |
< |
atomData[8] = q[2]; |
395 |
< |
atomData[9] = q[3]; |
396 |
< |
|
397 |
< |
atomData[10] = ji[0]; |
398 |
< |
atomData[11] = ji[1]; |
399 |
< |
atomData[12] = ji[2]; |
400 |
< |
} |
401 |
< |
|
402 |
< |
// If we've survived to here, format the line: |
403 |
< |
|
404 |
< |
if (!isDirectional) { |
405 |
< |
sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", |
406 |
< |
atomTypeString, atomData[0], |
407 |
< |
atomData[1], atomData[2], |
408 |
< |
atomData[3], atomData[4], |
409 |
< |
atomData[5]); |
410 |
< |
|
411 |
< |
strcat(writeLine, |
412 |
< |
"0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n"); |
413 |
< |
} else { |
414 |
< |
sprintf(writeLine, |
415 |
< |
"%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\n", |
416 |
< |
atomTypeString, |
417 |
< |
atomData[0], |
418 |
< |
atomData[1], |
419 |
< |
atomData[2], |
420 |
< |
atomData[3], |
421 |
< |
atomData[4], |
422 |
< |
atomData[5], |
423 |
< |
atomData[6], |
424 |
< |
atomData[7], |
425 |
< |
atomData[8], |
426 |
< |
atomData[9], |
427 |
< |
atomData[10], |
428 |
< |
atomData[11], |
429 |
< |
atomData[12]); |
430 |
< |
} |
431 |
< |
|
432 |
< |
|
433 |
< |
os << writeLine; |
434 |
< |
|
435 |
< |
} //end for(iter = integrableObject.begin()) |
436 |
< |
} |
437 |
< |
} //end for(i = 0; i < mpiSim->getNmol()) |
438 |
< |
|
439 |
< |
os.flush(); |
533 |
> |
buffers.push_back(eorStream->rdbuf()); |
534 |
|
|
535 |
< |
sprintf(checkPointMsg, "Sucessfully took a dump.\n"); |
536 |
< |
MPIcheckPoint(); |
535 |
> |
#ifdef IS_MPI |
536 |
> |
} |
537 |
> |
#endif // is_mpi |
538 |
|
|
539 |
< |
delete [] potatoes; |
540 |
< |
} else { |
539 |
> |
TeeBuf tbuf(buffers.begin(), buffers.end()); |
540 |
> |
std::ostream os(&tbuf); |
541 |
|
|
542 |
< |
// worldRank != 0, so I'm a remote node. |
542 |
> |
writeFrame(os); |
543 |
|
|
544 |
< |
// Set my magic potato to 0: |
544 |
> |
#ifdef IS_MPI |
545 |
> |
if (worldRank == 0) { |
546 |
> |
#endif // is_mpi |
547 |
> |
writeClosing(*eorStream); |
548 |
> |
delete eorStream; |
549 |
> |
#ifdef IS_MPI |
550 |
> |
} |
551 |
> |
#endif // is_mpi |
552 |
> |
|
553 |
> |
} |
554 |
|
|
555 |
< |
myPotato = 0; |
555 |
> |
std::ostream* DumpWriter::createOStream(const std::string& filename) { |
556 |
|
|
557 |
< |
for(int i = 0; i < info_->getNGlobalMolecules(); i++) { |
558 |
< |
|
559 |
< |
// Am I the node which has this integrableObject? |
560 |
< |
int whichNode = info_->getMolToProc(i); |
561 |
< |
if (whichNode == worldRank) { |
562 |
< |
if (myPotato + 1 >= MAXTAG) { |
459 |
< |
|
460 |
< |
// The potato was going to exceed the maximum value, |
461 |
< |
// so wrap this processor potato back to 0 (and block until |
462 |
< |
// node 0 says we can go: |
463 |
< |
|
464 |
< |
MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, |
465 |
< |
&istatus); |
466 |
< |
} |
467 |
< |
|
468 |
< |
mol = info_->getMoleculeByGlobalIndex(i); |
469 |
< |
|
470 |
< |
|
471 |
< |
nCurObj = mol->getNIntegrableObjects(); |
472 |
< |
|
473 |
< |
MPI_Send(&nCurObj, 1, MPI_INT, 0, myPotato, MPI_COMM_WORLD); |
474 |
< |
myPotato++; |
475 |
< |
|
476 |
< |
for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; |
477 |
< |
integrableObject = mol->nextIntegrableObject(ii)) { |
478 |
< |
|
479 |
< |
if (myPotato + 2 >= MAXTAG) { |
480 |
< |
|
481 |
< |
// The potato was going to exceed the maximum value, |
482 |
< |
// so wrap this processor potato back to 0 (and block until |
483 |
< |
// node 0 says we can go: |
484 |
< |
|
485 |
< |
MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, |
486 |
< |
&istatus); |
487 |
< |
} |
488 |
< |
|
489 |
< |
atomTypeString = integrableObject->getType().c_str(); |
490 |
< |
|
491 |
< |
pos = integrableObject->getPos(); |
492 |
< |
vel = integrableObject->getVel(); |
493 |
< |
|
494 |
< |
atomData[0] = pos[0]; |
495 |
< |
atomData[1] = pos[1]; |
496 |
< |
atomData[2] = pos[2]; |
497 |
< |
|
498 |
< |
atomData[3] = vel[0]; |
499 |
< |
atomData[4] = vel[1]; |
500 |
< |
atomData[5] = vel[2]; |
501 |
< |
|
502 |
< |
isDirectional = 0; |
503 |
< |
|
504 |
< |
if (integrableObject->isDirectional()) { |
505 |
< |
isDirectional = 1; |
506 |
< |
|
507 |
< |
q = integrableObject->getQ(); |
508 |
< |
ji = integrableObject->getJ(); |
509 |
< |
|
510 |
< |
atomData[6] = q[0]; |
511 |
< |
atomData[7] = q[1]; |
512 |
< |
atomData[8] = q[2]; |
513 |
< |
atomData[9] = q[3]; |
514 |
< |
|
515 |
< |
atomData[10] = ji[0]; |
516 |
< |
atomData[11] = ji[1]; |
517 |
< |
atomData[12] = ji[2]; |
518 |
< |
} |
519 |
< |
|
520 |
< |
strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE); |
521 |
< |
|
522 |
< |
// null terminate the std::string before sending (just in case): |
523 |
< |
MPIatomTypeString[MINIBUFFERSIZE - 1] = '\0'; |
524 |
< |
|
525 |
< |
MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0, |
526 |
< |
myPotato, MPI_COMM_WORLD); |
527 |
< |
|
528 |
< |
myPotato++; |
529 |
< |
|
530 |
< |
if (isDirectional) { |
531 |
< |
MPI_Send(atomData, 13, MPI_DOUBLE, 0, myPotato, |
532 |
< |
MPI_COMM_WORLD); |
533 |
< |
} else { |
534 |
< |
MPI_Send(atomData, 6, MPI_DOUBLE, 0, myPotato, |
535 |
< |
MPI_COMM_WORLD); |
536 |
< |
} |
537 |
< |
|
538 |
< |
myPotato++; |
539 |
< |
} |
540 |
< |
|
541 |
< |
} |
542 |
< |
|
543 |
< |
} |
544 |
< |
sprintf(checkPointMsg, "Sucessfully took a dump.\n"); |
545 |
< |
MPIcheckPoint(); |
557 |
> |
std::ostream* newOStream; |
558 |
> |
#ifdef HAVE_LIBZ |
559 |
> |
if (needCompression_) { |
560 |
> |
newOStream = new ogzstream(filename.c_str()); |
561 |
> |
} else { |
562 |
> |
newOStream = new std::ofstream(filename.c_str()); |
563 |
|
} |
564 |
+ |
#else |
565 |
+ |
newOStream = new std::ofstream(filename.c_str()); |
566 |
+ |
#endif |
567 |
+ |
//write out MetaData first |
568 |
+ |
(*newOStream) << "<OpenMD version=1>" << std::endl; |
569 |
+ |
(*newOStream) << " <MetaData>" << std::endl; |
570 |
+ |
(*newOStream) << info_->getRawMetaData(); |
571 |
+ |
(*newOStream) << " </MetaData>" << std::endl; |
572 |
+ |
return newOStream; |
573 |
+ |
} |
574 |
|
|
575 |
< |
#endif // is_mpi |
575 |
> |
void DumpWriter::writeClosing(std::ostream& os) { |
576 |
|
|
577 |
< |
} |
577 |
> |
os << "</OpenMD>\n"; |
578 |
> |
os.flush(); |
579 |
> |
} |
580 |
|
|
581 |
< |
}//end namespace oopse |
581 |
> |
}//end namespace OpenMD |