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

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

Diff Legend

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