| 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 | < |  | 
| 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 |  |  | 
| 74 | – | dumpFile_ = createOStream(filename_); | 
| 75 | – |  | 
| 76 | – | if (!dumpFile_) { | 
| 77 | – | sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n", | 
| 78 | – | filename_.c_str()); | 
| 79 | – | painCave.isFatal = 1; | 
| 80 | – | simError(); | 
| 81 | – | } | 
| 82 | – |  | 
| 85 |  | #ifdef IS_MPI | 
| 86 |  |  | 
| 87 | < | } | 
| 87 | > | } | 
| 88 |  |  | 
| 87 | – | sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n"); | 
| 88 | – | MPIcheckPoint(); | 
| 89 | – |  | 
| 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 | < |  | 
| 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 |  |  | 
| 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 | – |  | 
| 125 |  | #ifdef IS_MPI | 
| 126 |  |  | 
| 127 | < | } | 
| 127 | > | } | 
| 128 |  |  | 
| 129 | – | sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n"); | 
| 130 | – | MPIcheckPoint(); | 
| 131 | – |  | 
| 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) { | 
| 184 | – | const int BUFFERSIZE = 2000; | 
| 185 | – | const int MINIBUFFERSIZE = 100; | 
| 266 |  |  | 
| 267 | < | char tempBuffer[BUFFERSIZE]; | 
| 268 | < | char writeLine[BUFFERSIZE]; | 
| 267 | > | #ifdef IS_MPI | 
| 268 | > | MPI_Status istatus; | 
| 269 | > | #endif | 
| 270 |  |  | 
| 190 | – | Quat4d q; | 
| 191 | – | Vector3d ji; | 
| 192 | – | Vector3d pos; | 
| 193 | – | Vector3d vel; | 
| 194 | – |  | 
| 271 |  | Molecule* mol; | 
| 272 |  | StuntDouble* integrableObject; | 
| 273 |  | SimInfo::MoleculeIterator mi; | 
| 274 |  | Molecule::IntegrableObjectIterator ii; | 
| 199 | – |  | 
| 200 | – | int nTotObjects; | 
| 201 | – | 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 | > | int nProc; | 
| 310 | > | MPI_Comm_size(MPI_COMM_WORLD, &nProc); | 
| 311 | > | if (worldRank == masterNode) { | 
| 312 | > | os << "  <Snapshot>\n"; | 
| 313 | > | writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot()); | 
| 314 | > | os << "    <StuntDoubles>\n"; | 
| 315 | > |  | 
| 316 | > | os << buffer; | 
| 317 |  |  | 
| 318 | < | pos = integrableObject->getPos(); | 
| 319 | < | vel = integrableObject->getVel(); | 
| 318 | > |  | 
| 319 | > | for (int i = 1; i < nProc; ++i) { | 
| 320 |  |  | 
| 321 | < | sprintf(tempBuffer, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", | 
| 322 | < | integrableObject->getType().c_str(), | 
| 323 | < | pos[0], pos[1], pos[2], | 
| 324 | < | vel[0], vel[1], vel[2]); | 
| 321 | > | // receive the length of the string buffer that was | 
| 322 | > | // prepared by processor i | 
| 323 | > |  | 
| 324 | > | MPI_Bcast(&i, 1, MPI_INT,masterNode,MPI_COMM_WORLD); | 
| 325 | > | int recvLength; | 
| 326 | > | MPI_Recv(&recvLength, 1, MPI_INT, i, 0, MPI_COMM_WORLD, &istatus); | 
| 327 | > | char* recvBuffer = new char[recvLength]; | 
| 328 | > | if (recvBuffer == NULL) { | 
| 329 | > | } else { | 
| 330 | > | MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, &istatus); | 
| 331 | > | os << recvBuffer; | 
| 332 | > | delete [] recvBuffer; | 
| 333 | > | } | 
| 334 | > | } | 
| 335 | > | os << "    </StuntDoubles>\n"; | 
| 336 | > |  | 
| 337 | > | os << "  </Snapshot>\n"; | 
| 338 | > | os.flush(); | 
| 339 | > | } else { | 
| 340 | > | int sendBufferLength = buffer.size() + 1; | 
| 341 | > | int myturn = 0; | 
| 342 | > | for (int i = 1; i < nProc; ++i){ | 
| 343 | > | MPI_Bcast(&myturn,1, MPI_INT,masterNode,MPI_COMM_WORLD); | 
| 344 | > | if (myturn == worldRank){ | 
| 345 | > | MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD); | 
| 346 | > | MPI_Send((void *)buffer.c_str(), sendBufferLength, MPI_CHAR, masterNode, 0, MPI_COMM_WORLD); | 
| 347 | > | } | 
| 348 | > | } | 
| 349 | > | } | 
| 350 |  |  | 
| 351 | < | strcpy(writeLine, tempBuffer); | 
| 351 | > | #endif // is_mpi | 
| 352 |  |  | 
| 353 | < | if (integrableObject->isDirectional()) { | 
| 227 | < | q = integrableObject->getQ(); | 
| 228 | < | ji = integrableObject->getJ(); | 
| 353 | > | } | 
| 354 |  |  | 
| 355 | < | sprintf(tempBuffer, "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n", | 
| 356 | < | q[0], q[1], q[2], q[3], | 
| 357 | < | ji[0], ji[1], ji[2]); | 
| 358 | < | strcat(writeLine, tempBuffer); | 
| 359 | < | } else { | 
| 360 | < | strcat(writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n"); | 
| 236 | < | } | 
| 355 | > | std::string DumpWriter::prepareDumpLine(StuntDouble* integrableObject) { | 
| 356 | > |  | 
| 357 | > | int index = integrableObject->getGlobalIntegrableObjectIndex(); | 
| 358 | > | std::string type("pv"); | 
| 359 | > | std::string line; | 
| 360 | > | char tempBuffer[4096]; | 
| 361 |  |  | 
| 362 | < | os << writeLine; | 
| 362 | > | Vector3d pos; | 
| 363 | > | Vector3d vel; | 
| 364 | > | pos = integrableObject->getPos(); | 
| 365 |  |  | 
| 366 | < | } | 
| 366 | > | if (isinf(pos[0]) || isnan(pos[0]) || | 
| 367 | > | isinf(pos[1]) || isnan(pos[1]) || | 
| 368 | > | isinf(pos[2]) || isnan(pos[2]) ) { | 
| 369 | > | sprintf( painCave.errMsg, | 
| 370 | > | "DumpWriter detected a numerical error writing the position" | 
| 371 | > | " for object %d", index); | 
| 372 | > | painCave.isFatal = 1; | 
| 373 | > | simError(); | 
| 374 |  | } | 
| 375 |  |  | 
| 376 | < | os.flush(); | 
| 244 | < | #else // is_mpi | 
| 245 | < | /********************************************************************* | 
| 246 | < | * Documentation?  You want DOCUMENTATION? | 
| 247 | < | * | 
| 248 | < | * Why all the potatoes below? | 
| 249 | < | * | 
| 250 | < | * To make a long story short, the original version of DumpWriter | 
| 251 | < | * worked in the most inefficient way possible.  Node 0 would | 
| 252 | < | * poke each of the node for an individual atom's formatted data | 
| 253 | < | * as node 0 worked its way down the global index. This was particularly | 
| 254 | < | * inefficient since the method blocked all processors at every atom | 
| 255 | < | * (and did it twice!). | 
| 256 | < | * | 
| 257 | < | * An intermediate version of DumpWriter could be described from Node | 
| 258 | < | * zero's perspective as follows: | 
| 259 | < | * | 
| 260 | < | *  1) Have 100 of your friends stand in a circle. | 
| 261 | < | *  2) When you say go, have all of them start tossing potatoes at | 
| 262 | < | *     you (one at a time). | 
| 263 | < | *  3) Catch the potatoes. | 
| 264 | < | * | 
| 265 | < | * It was an improvement, but MPI has buffers and caches that could | 
| 266 | < | * best be described in this analogy as "potato nets", so there's no | 
| 267 | < | * need to block the processors atom-by-atom. | 
| 268 | < | * | 
| 269 | < | * This new and improved DumpWriter works in an even more efficient | 
| 270 | < | * way: | 
| 271 | < | * | 
| 272 | < | *  1) Have 100 of your friend stand in a circle. | 
| 273 | < | *  2) When you say go, have them start tossing 5-pound bags of | 
| 274 | < | *     potatoes at you. | 
| 275 | < | *  3) Once you've caught a friend's bag of potatoes, | 
| 276 | < | *     toss them a spud to let them know they can toss another bag. | 
| 277 | < | * | 
| 278 | < | * How's THAT for documentation? | 
| 279 | < | * | 
| 280 | < | *********************************************************************/ | 
| 281 | < | const int masterNode = 0; | 
| 376 | > | vel = integrableObject->getVel(); | 
| 377 |  |  | 
| 378 | < | int * potatoes; | 
| 379 | < | int myPotato; | 
| 380 | < | int nProc; | 
| 381 | < | int which_node; | 
| 382 | < | double atomData[13]; | 
| 383 | < | int isDirectional; | 
| 384 | < | char MPIatomTypeString[MINIBUFFERSIZE]; | 
| 385 | < | int msgLen; // the length of message actually recieved at master nodes | 
| 291 | < | int haveError; | 
| 292 | < | MPI_Status istatus; | 
| 293 | < | int nCurObj; | 
| 294 | < |  | 
| 295 | < | // code to find maximum tag value | 
| 296 | < | int * tagub; | 
| 297 | < | int flag; | 
| 298 | < | int MAXTAG; | 
| 299 | < | MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag); | 
| 300 | < |  | 
| 301 | < | if (flag) { | 
| 302 | < | MAXTAG = *tagub; | 
| 303 | < | } else { | 
| 304 | < | MAXTAG = 32767; | 
| 378 | > | if (isinf(vel[0]) || isnan(vel[0]) || | 
| 379 | > | isinf(vel[1]) || isnan(vel[1]) || | 
| 380 | > | isinf(vel[2]) || isnan(vel[2]) ) { | 
| 381 | > | sprintf( painCave.errMsg, | 
| 382 | > | "DumpWriter detected a numerical error writing the velocity" | 
| 383 | > | " for object %d", index); | 
| 384 | > | painCave.isFatal = 1; | 
| 385 | > | simError(); | 
| 386 |  | } | 
| 387 |  |  | 
| 388 | < | if (worldRank == masterNode) { //master node (node 0) is responsible for writing the dump file | 
| 388 | > | sprintf(tempBuffer, "%18.10g %18.10g %18.10g %13e %13e %13e", | 
| 389 | > | pos[0], pos[1], pos[2], | 
| 390 | > | vel[0], vel[1], vel[2]); | 
| 391 | > | line += tempBuffer; | 
| 392 |  |  | 
| 393 | < | // Node 0 needs a list of the magic potatoes for each processor; | 
| 393 | > | if (integrableObject->isDirectional()) { | 
| 394 | > | type += "qj"; | 
| 395 | > | Quat4d q; | 
| 396 | > | Vector3d ji; | 
| 397 | > | q = integrableObject->getQ(); | 
| 398 |  |  | 
| 399 | < | MPI_Comm_size(MPI_COMM_WORLD, &nProc); | 
| 400 | < | potatoes = new int[nProc]; | 
| 401 | < |  | 
| 402 | < | //write out the comment lines | 
| 403 | < | for(int i = 0; i < nProc; i++) { | 
| 404 | < | potatoes[i] = 0; | 
| 399 | > | if (isinf(q[0]) || isnan(q[0]) || | 
| 400 | > | isinf(q[1]) || isnan(q[1]) || | 
| 401 | > | isinf(q[2]) || isnan(q[2]) || | 
| 402 | > | isinf(q[3]) || isnan(q[3]) ) { | 
| 403 | > | sprintf( painCave.errMsg, | 
| 404 | > | "DumpWriter detected a numerical error writing the quaternion" | 
| 405 | > | " for object %d", index); | 
| 406 | > | painCave.isFatal = 1; | 
| 407 | > | simError(); | 
| 408 |  | } | 
| 409 |  |  | 
| 410 | + | ji = integrableObject->getJ(); | 
| 411 |  |  | 
| 412 | < | os << nTotObjects << "\n"; | 
| 413 | < | writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot()); | 
| 412 | > | if (isinf(ji[0]) || isnan(ji[0]) || | 
| 413 | > | isinf(ji[1]) || isnan(ji[1]) || | 
| 414 | > | isinf(ji[2]) || isnan(ji[2]) ) { | 
| 415 | > | sprintf( painCave.errMsg, | 
| 416 | > | "DumpWriter detected a numerical error writing the angular" | 
| 417 | > | " momentum for object %d", index); | 
| 418 | > | painCave.isFatal = 1; | 
| 419 | > | simError(); | 
| 420 | > | } | 
| 421 |  |  | 
| 422 | < | for(int i = 0; i < info_->getNGlobalMolecules(); i++) { | 
| 422 | > | sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e %13e", | 
| 423 | > | q[0], q[1], q[2], q[3], | 
| 424 | > | ji[0], ji[1], ji[2]); | 
| 425 | > | line += tempBuffer; | 
| 426 | > | } | 
| 427 |  |  | 
| 428 | < | // Get the Node number which has this atom; | 
| 428 | > | if (needForceVector_) { | 
| 429 | > | type += "f"; | 
| 430 | > | Vector3d frc; | 
| 431 |  |  | 
| 432 | < | which_node = info_->getMolToProc(i); | 
| 432 | > | frc = integrableObject->getFrc(); | 
| 433 |  |  | 
| 434 | < | if (which_node != masterNode) { //current molecule is in slave node | 
| 435 | < | if (potatoes[which_node] + 1 >= MAXTAG) { | 
| 436 | < | // The potato was going to exceed the maximum value, | 
| 437 | < | // so wrap this processor potato back to 0: | 
| 438 | < |  | 
| 439 | < | potatoes[which_node] = 0; | 
| 440 | < | MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0, | 
| 441 | < | MPI_COMM_WORLD); | 
| 337 | < | } | 
| 338 | < |  | 
| 339 | < | myPotato = potatoes[which_node]; | 
| 340 | < |  | 
| 341 | < | //recieve the number of integrableObject in current molecule | 
| 342 | < | MPI_Recv(&nCurObj, 1, MPI_INT, which_node, myPotato, | 
| 343 | < | MPI_COMM_WORLD, &istatus); | 
| 344 | < | myPotato++; | 
| 345 | < |  | 
| 346 | < | for(int l = 0; l < nCurObj; l++) { | 
| 347 | < | if (potatoes[which_node] + 2 >= MAXTAG) { | 
| 348 | < | // The potato was going to exceed the maximum value, | 
| 349 | < | // so wrap this processor potato back to 0: | 
| 350 | < |  | 
| 351 | < | potatoes[which_node] = 0; | 
| 352 | < | MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, | 
| 353 | < | 0, MPI_COMM_WORLD); | 
| 354 | < | } | 
| 355 | < |  | 
| 356 | < | MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, | 
| 357 | < | which_node, myPotato, MPI_COMM_WORLD, | 
| 358 | < | &istatus); | 
| 359 | < |  | 
| 360 | < | myPotato++; | 
| 361 | < |  | 
| 362 | < | MPI_Recv(atomData, 13, MPI_DOUBLE, which_node, myPotato, | 
| 363 | < | MPI_COMM_WORLD, &istatus); | 
| 364 | < | myPotato++; | 
| 365 | < |  | 
| 366 | < | MPI_Get_count(&istatus, MPI_DOUBLE, &msgLen); | 
| 367 | < |  | 
| 368 | < | if (msgLen == 13) | 
| 369 | < | isDirectional = 1; | 
| 370 | < | else | 
| 371 | < | isDirectional = 0; | 
| 372 | < |  | 
| 373 | < | // If we've survived to here, format the line: | 
| 374 | < |  | 
| 375 | < | if (!isDirectional) { | 
| 376 | < | sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", | 
| 377 | < | MPIatomTypeString, atomData[0], | 
| 378 | < | atomData[1], atomData[2], | 
| 379 | < | atomData[3], atomData[4], | 
| 380 | < | atomData[5]); | 
| 381 | < |  | 
| 382 | < | strcat(writeLine, | 
| 383 | < | "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n"); | 
| 384 | < | } else { | 
| 385 | < | sprintf(writeLine, | 
| 386 | < | "%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", | 
| 387 | < | MPIatomTypeString, | 
| 388 | < | atomData[0], | 
| 389 | < | atomData[1], | 
| 390 | < | atomData[2], | 
| 391 | < | atomData[3], | 
| 392 | < | atomData[4], | 
| 393 | < | atomData[5], | 
| 394 | < | atomData[6], | 
| 395 | < | atomData[7], | 
| 396 | < | atomData[8], | 
| 397 | < | atomData[9], | 
| 398 | < | atomData[10], | 
| 399 | < | atomData[11], | 
| 400 | < | atomData[12]); | 
| 401 | < | } | 
| 402 | < |  | 
| 403 | < | os << writeLine; | 
| 404 | < |  | 
| 405 | < | } // end for(int l =0) | 
| 406 | < |  | 
| 407 | < | potatoes[which_node] = myPotato; | 
| 408 | < | } else { //master node has current molecule | 
| 409 | < |  | 
| 410 | < | mol = info_->getMoleculeByGlobalIndex(i); | 
| 411 | < |  | 
| 412 | < | if (mol == NULL) { | 
| 413 | < | sprintf(painCave.errMsg, "Molecule not found on node %d!", worldRank); | 
| 414 | < | painCave.isFatal = 1; | 
| 415 | < | simError(); | 
| 416 | < | } | 
| 417 | < |  | 
| 418 | < | for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; | 
| 419 | < | integrableObject = mol->nextIntegrableObject(ii)) { | 
| 420 | < |  | 
| 421 | < | pos = integrableObject->getPos(); | 
| 422 | < | vel = integrableObject->getVel(); | 
| 423 | < |  | 
| 424 | < | atomData[0] = pos[0]; | 
| 425 | < | atomData[1] = pos[1]; | 
| 426 | < | atomData[2] = pos[2]; | 
| 427 | < |  | 
| 428 | < | atomData[3] = vel[0]; | 
| 429 | < | atomData[4] = vel[1]; | 
| 430 | < | atomData[5] = vel[2]; | 
| 431 | < |  | 
| 432 | < | isDirectional = 0; | 
| 433 | < |  | 
| 434 | < | if (integrableObject->isDirectional()) { | 
| 435 | < | isDirectional = 1; | 
| 436 | < |  | 
| 437 | < | q = integrableObject->getQ(); | 
| 438 | < | ji = integrableObject->getJ(); | 
| 439 | < |  | 
| 440 | < | for(int j = 0; j < 6; j++) { | 
| 441 | < | atomData[j] = atomData[j]; | 
| 442 | < | } | 
| 443 | < |  | 
| 444 | < | atomData[6] = q[0]; | 
| 445 | < | atomData[7] = q[1]; | 
| 446 | < | atomData[8] = q[2]; | 
| 447 | < | atomData[9] = q[3]; | 
| 448 | < |  | 
| 449 | < | atomData[10] = ji[0]; | 
| 450 | < | atomData[11] = ji[1]; | 
| 451 | < | atomData[12] = ji[2]; | 
| 452 | < | } | 
| 453 | < |  | 
| 454 | < | // If we've survived to here, format the line: | 
| 455 | < |  | 
| 456 | < | if (!isDirectional) { | 
| 457 | < | sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", | 
| 458 | < | integrableObject->getType().c_str(), atomData[0], | 
| 459 | < | atomData[1], atomData[2], | 
| 460 | < | atomData[3], atomData[4], | 
| 461 | < | atomData[5]); | 
| 462 | < |  | 
| 463 | < | strcat(writeLine, | 
| 464 | < | "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n"); | 
| 465 | < | } else { | 
| 466 | < | sprintf(writeLine, | 
| 467 | < | "%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", | 
| 468 | < | integrableObject->getType().c_str(), | 
| 469 | < | atomData[0], | 
| 470 | < | atomData[1], | 
| 471 | < | atomData[2], | 
| 472 | < | atomData[3], | 
| 473 | < | atomData[4], | 
| 474 | < | atomData[5], | 
| 475 | < | atomData[6], | 
| 476 | < | atomData[7], | 
| 477 | < | atomData[8], | 
| 478 | < | atomData[9], | 
| 479 | < | atomData[10], | 
| 480 | < | atomData[11], | 
| 481 | < | atomData[12]); | 
| 482 | < | } | 
| 483 | < |  | 
| 484 | < |  | 
| 485 | < | os << writeLine; | 
| 486 | < |  | 
| 487 | < | } //end for(iter = integrableObject.begin()) | 
| 488 | < | } | 
| 489 | < | } //end for(i = 0; i < mpiSim->getNmol()) | 
| 490 | < |  | 
| 491 | < | os.flush(); | 
| 492 | < |  | 
| 493 | < | sprintf(checkPointMsg, "Sucessfully took a dump.\n"); | 
| 494 | < | MPIcheckPoint(); | 
| 495 | < |  | 
| 496 | < | delete [] potatoes; | 
| 497 | < | } else { | 
| 498 | < |  | 
| 499 | < | // worldRank != 0, so I'm a remote node. | 
| 500 | < |  | 
| 501 | < | // Set my magic potato to 0: | 
| 502 | < |  | 
| 503 | < | myPotato = 0; | 
| 504 | < |  | 
| 505 | < | for(int i = 0; i < info_->getNGlobalMolecules(); i++) { | 
| 506 | < |  | 
| 507 | < | // Am I the node which has this integrableObject? | 
| 508 | < | int whichNode = info_->getMolToProc(i); | 
| 509 | < | if (whichNode == worldRank) { | 
| 510 | < | if (myPotato + 1 >= MAXTAG) { | 
| 511 | < |  | 
| 512 | < | // The potato was going to exceed the maximum value, | 
| 513 | < | // so wrap this processor potato back to 0 (and block until | 
| 514 | < | // node 0 says we can go: | 
| 515 | < |  | 
| 516 | < | MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, | 
| 517 | < | &istatus); | 
| 518 | < | } | 
| 519 | < |  | 
| 520 | < | mol = info_->getMoleculeByGlobalIndex(i); | 
| 521 | < |  | 
| 522 | < |  | 
| 523 | < | nCurObj = mol->getNIntegrableObjects(); | 
| 524 | < |  | 
| 525 | < | MPI_Send(&nCurObj, 1, MPI_INT, 0, myPotato, MPI_COMM_WORLD); | 
| 526 | < | myPotato++; | 
| 527 | < |  | 
| 528 | < | for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; | 
| 529 | < | integrableObject = mol->nextIntegrableObject(ii)) { | 
| 530 | < |  | 
| 531 | < | if (myPotato + 2 >= MAXTAG) { | 
| 532 | < |  | 
| 533 | < | // The potato was going to exceed the maximum value, | 
| 534 | < | // so wrap this processor potato back to 0 (and block until | 
| 535 | < | // node 0 says we can go: | 
| 536 | < |  | 
| 537 | < | MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, | 
| 538 | < | &istatus); | 
| 539 | < | } | 
| 540 | < |  | 
| 541 | < | pos = integrableObject->getPos(); | 
| 542 | < | vel = integrableObject->getVel(); | 
| 543 | < |  | 
| 544 | < | atomData[0] = pos[0]; | 
| 545 | < | atomData[1] = pos[1]; | 
| 546 | < | atomData[2] = pos[2]; | 
| 547 | < |  | 
| 548 | < | atomData[3] = vel[0]; | 
| 549 | < | atomData[4] = vel[1]; | 
| 550 | < | atomData[5] = vel[2]; | 
| 551 | < |  | 
| 552 | < | isDirectional = 0; | 
| 553 | < |  | 
| 554 | < | if (integrableObject->isDirectional()) { | 
| 555 | < | isDirectional = 1; | 
| 556 | < |  | 
| 557 | < | q = integrableObject->getQ(); | 
| 558 | < | ji = integrableObject->getJ(); | 
| 559 | < |  | 
| 560 | < | atomData[6] = q[0]; | 
| 561 | < | atomData[7] = q[1]; | 
| 562 | < | atomData[8] = q[2]; | 
| 563 | < | atomData[9] = q[3]; | 
| 564 | < |  | 
| 565 | < | atomData[10] = ji[0]; | 
| 566 | < | atomData[11] = ji[1]; | 
| 567 | < | atomData[12] = ji[2]; | 
| 568 | < | } | 
| 569 | < |  | 
| 570 | < | strncpy(MPIatomTypeString, integrableObject->getType().c_str(), MINIBUFFERSIZE); | 
| 571 | < |  | 
| 572 | < | // null terminate the  std::string before sending (just in case): | 
| 573 | < | MPIatomTypeString[MINIBUFFERSIZE - 1] = '\0'; | 
| 574 | < |  | 
| 575 | < | MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0, | 
| 576 | < | myPotato, MPI_COMM_WORLD); | 
| 577 | < |  | 
| 578 | < | myPotato++; | 
| 579 | < |  | 
| 580 | < | if (isDirectional) { | 
| 581 | < | MPI_Send(atomData, 13, MPI_DOUBLE, 0, myPotato, | 
| 582 | < | MPI_COMM_WORLD); | 
| 583 | < | } else { | 
| 584 | < | MPI_Send(atomData, 6, MPI_DOUBLE, 0, myPotato, | 
| 585 | < | MPI_COMM_WORLD); | 
| 586 | < | } | 
| 587 | < |  | 
| 588 | < | myPotato++; | 
| 589 | < | } | 
| 590 | < |  | 
| 591 | < | } | 
| 592 | < |  | 
| 434 | > | if (isinf(frc[0]) || isnan(frc[0]) || | 
| 435 | > | isinf(frc[1]) || isnan(frc[1]) || | 
| 436 | > | isinf(frc[2]) || isnan(frc[2]) ) { | 
| 437 | > | sprintf( painCave.errMsg, | 
| 438 | > | "DumpWriter detected a numerical error writing the force" | 
| 439 | > | " for object %d", index); | 
| 440 | > | painCave.isFatal = 1; | 
| 441 | > | simError(); | 
| 442 |  | } | 
| 443 | < | sprintf(checkPointMsg, "Sucessfully took a dump.\n"); | 
| 444 | < | MPIcheckPoint(); | 
| 443 | > | sprintf(tempBuffer, " %13e %13e %13e", | 
| 444 | > | frc[0], frc[1], frc[2]); | 
| 445 | > | line += tempBuffer; | 
| 446 | > |  | 
| 447 | > | if (integrableObject->isDirectional()) { | 
| 448 | > | type += "t"; | 
| 449 | > | Vector3d trq; | 
| 450 | > |  | 
| 451 | > | trq = integrableObject->getTrq(); | 
| 452 | > |  | 
| 453 | > | if (isinf(trq[0]) || isnan(trq[0]) || | 
| 454 | > | isinf(trq[1]) || isnan(trq[1]) || | 
| 455 | > | isinf(trq[2]) || isnan(trq[2]) ) { | 
| 456 | > | sprintf( painCave.errMsg, | 
| 457 | > | "DumpWriter detected a numerical error writing the torque" | 
| 458 | > | " for object %d", index); | 
| 459 | > | painCave.isFatal = 1; | 
| 460 | > | simError(); | 
| 461 | > | } | 
| 462 | > |  | 
| 463 | > | sprintf(tempBuffer, " %13e %13e %13e", | 
| 464 | > | trq[0], trq[1], trq[2]); | 
| 465 | > | line += tempBuffer; | 
| 466 | > | } | 
| 467 |  | } | 
| 468 | < |  | 
| 469 | < | #endif // is_mpi | 
| 470 | < |  | 
| 468 | > |  | 
| 469 | > | sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str()); | 
| 470 | > | return std::string(tempBuffer); | 
| 471 |  | } | 
| 472 |  |  | 
| 473 |  | void DumpWriter::writeDump() { | 
| 492 |  | #ifdef IS_MPI | 
| 493 |  | if (worldRank == 0) { | 
| 494 |  | #endif // is_mpi | 
| 495 | < | delete eorStream; | 
| 496 | < |  | 
| 495 | > | writeClosing(*eorStream); | 
| 496 | > | delete eorStream; | 
| 497 |  | #ifdef IS_MPI | 
| 498 |  | } | 
| 499 |  | #endif // is_mpi | 
| 526 |  | #ifdef IS_MPI | 
| 527 |  | if (worldRank == 0) { | 
| 528 |  | #endif // is_mpi | 
| 529 | < | delete eorStream; | 
| 530 | < |  | 
| 529 | > | writeClosing(*eorStream); | 
| 530 | > | delete eorStream; | 
| 531 |  | #ifdef IS_MPI | 
| 532 |  | } | 
| 533 |  | #endif // is_mpi | 
| 534 |  |  | 
| 535 |  | } | 
| 536 |  |  | 
| 537 | < | std::ostream* DumpWriter::createOStream(const std::string& filename) { | 
| 537 | > | std::ostream* DumpWriter::createOStream(const std::string& filename) { | 
| 538 |  |  | 
| 539 |  | std::ostream* newOStream; | 
| 540 |  | #ifdef HAVE_LIBZ | 
| 541 |  | if (needCompression_) { | 
| 542 | < | newOStream = new ogzstream(filename.c_str()); | 
| 542 | > | newOStream = new ogzstream(filename.c_str()); | 
| 543 |  | } else { | 
| 544 | < | newOStream = new std::ofstream(filename.c_str()); | 
| 544 | > | newOStream = new std::ofstream(filename.c_str()); | 
| 545 |  | } | 
| 546 |  | #else | 
| 547 |  | newOStream = new std::ofstream(filename.c_str()); | 
| 548 |  | #endif | 
| 549 | + | //write out MetaData first | 
| 550 | + | (*newOStream) << "<OpenMD version=1>" << std::endl; | 
| 551 | + | (*newOStream) << "  <MetaData>" << std::endl; | 
| 552 | + | (*newOStream) << info_->getRawMetaData(); | 
| 553 | + | (*newOStream) << "  </MetaData>" << std::endl; | 
| 554 |  | return newOStream; | 
| 555 | < | } | 
| 555 | > | } | 
| 556 |  |  | 
| 557 | < | }//end namespace oopse | 
| 557 | > | void DumpWriter::writeClosing(std::ostream& os) { | 
| 558 | > |  | 
| 559 | > | os << "</OpenMD>\n"; | 
| 560 | > | os.flush(); | 
| 561 | > | } | 
| 562 | > |  | 
| 563 | > | }//end namespace OpenMD |