ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/io/DumpWriter.cpp
(Generate patch)

Comparing trunk/src/io/DumpWriter.cpp (file contents):
Revision 726 by chrisfen, Fri Nov 11 15:22:11 2005 UTC vs.
Revision 2020 by gezelter, Mon Sep 22 19:18:35 2014 UTC

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

Comparing trunk/src/io/DumpWriter.cpp (property svn:keywords):
Revision 726 by chrisfen, Fri Nov 11 15:22:11 2005 UTC vs.
Revision 2020 by gezelter, Mon Sep 22 19:18:35 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines