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 965 by tim, Fri May 19 20:45:55 2006 UTC vs.
Revision 1025 by gezelter, Wed Aug 30 20:33:44 2006 UTC

# Line 61 | Line 61 | namespace oopse {
61      createDumpFile_ = true;
62   #ifdef HAVE_LIBZ
63      if (needCompression_) {
64 <        filename_ += ".gz";
65 <        eorFilename_ += ".gz";
64 >      filename_ += ".gz";
65 >      eorFilename_ += ".gz";
66      }
67   #endif
68      
69   #ifdef IS_MPI
70  
71 <      if (worldRank == 0) {
71 >    if (worldRank == 0) {
72   #endif // is_mpi
73 –
73          
74 <        dumpFile_ = createOStream(filename_);
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 <        }
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  
83   #ifdef IS_MPI
84  
85 <      }
85 >    }
86  
88 –      sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n");
89 –      MPIcheckPoint();
90 –
87   #endif // is_mpi
88  
89 <    }
89 >  }
90  
91  
92    DumpWriter::DumpWriter(SimInfo* info, const std::string& filename)
# Line 104 | Line 100 | namespace oopse {
100      createDumpFile_ = true;
101   #ifdef HAVE_LIBZ
102      if (needCompression_) {
103 <        filename_ += ".gz";
104 <        eorFilename_ += ".gz";
103 >      filename_ += ".gz";
104 >      eorFilename_ += ".gz";
105      }
106   #endif
107      
108   #ifdef IS_MPI
109  
110 <      if (worldRank == 0) {
110 >    if (worldRank == 0) {
111   #endif // is_mpi
112  
113        
114 <        dumpFile_ = createOStream(filename_);
114 >      dumpFile_ = createOStream(filename_);
115  
116 <        if (!dumpFile_) {
117 <          sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
118 <                  filename_.c_str());
119 <          painCave.isFatal = 1;
120 <          simError();
121 <        }
116 >      if (!dumpFile_) {
117 >        sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
118 >                filename_.c_str());
119 >        painCave.isFatal = 1;
120 >        simError();
121 >      }
122  
123   #ifdef IS_MPI
124  
125 <      }
125 >    }
126  
131 –      sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n");
132 –      MPIcheckPoint();
133 –
127   #endif // is_mpi
128  
129 <    }
129 >  }
130    
131    DumpWriter::DumpWriter(SimInfo* info, const std::string& filename, bool writeDumpFile)
132 <  : info_(info), filename_(filename){
132 >    : info_(info), filename_(filename){
133      
134      Globals* simParams = info->getSimParams();
135      eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor";    
# Line 170 | Line 163 | namespace oopse {
163   #ifdef IS_MPI
164        
165      }
166 +
167      
174 –    sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n");
175 –    MPIcheckPoint();
176 –    
168   #endif // is_mpi
169      
170    }
180 –  
181 –  
182 –  
183 –  
184 –  
171  
172    DumpWriter::~DumpWriter() {
173  
# Line 190 | Line 176 | namespace oopse {
176      if (worldRank == 0) {
177   #endif // is_mpi
178        if (createDumpFile_){
179 +        writeClosing(*dumpFile_);
180          delete dumpFile_;
181        }
182   #ifdef IS_MPI
# Line 200 | Line 187 | namespace oopse {
187  
188    }
189  
190 <  void DumpWriter::writeCommentLine(std::ostream& os, Snapshot* s) {
190 >  void DumpWriter::writeFrameProperties(std::ostream& os, Snapshot* s) {
191  
192 <    RealType currentTime;
192 >    char buffer[1024];
193 >
194 >    os << "    <FrameData>\n";
195 >
196 >    RealType currentTime = s->getTime();
197 >    sprintf(buffer, "        Time: %.10g\n", currentTime);
198 >    os << buffer;
199 >
200      Mat3x3d hmat;
207 –    RealType chi;
208 –    RealType integralOfChiDt;
209 –    Mat3x3d eta;
210 –    
211 –    currentTime = s->getTime();
201      hmat = s->getHmat();
202 <    chi = s->getChi();
203 <    integralOfChiDt = s->getIntegralOfChiDt();
204 <    eta = s->getEta();
205 <    
206 <    os << currentTime << ";\t"
218 <       << hmat(0, 0) << "\t" << hmat(1, 0) << "\t" << hmat(2, 0) << ";\t"
219 <       << hmat(0, 1) << "\t" << hmat(1, 1) << "\t" << hmat(2, 1) << ";\t"
220 <       << hmat(0, 2) << "\t" << hmat(1, 2) << "\t" << hmat(2, 2) << ";\t";
202 >    sprintf(buffer, "        Hmat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
203 >            hmat(0, 0), hmat(1, 0), hmat(2, 0),
204 >            hmat(0, 1), hmat(1, 1), hmat(2, 1),
205 >            hmat(0, 2), hmat(1, 2), hmat(2, 2));
206 >    os << buffer;
207  
208 <    //write out additional parameters, such as chi and eta
209 <
210 <    os << chi << "\t" << integralOfChiDt << ";\t";
208 >    RealType chi = s->getChi();
209 >    RealType integralOfChiDt = s->getIntegralOfChiDt();
210 >    sprintf(buffer, "  Thermostat: %.10g , %.10g\n", chi, integralOfChiDt);
211 >    os << buffer;
212  
213 <    os << eta(0, 0) << "\t" << eta(1, 0) << "\t" << eta(2, 0) << ";\t"
214 <       << eta(0, 1) << "\t" << eta(1, 1) << "\t" << eta(2, 1) << ";\t"
215 <       << eta(0, 2) << "\t" << eta(1, 2) << "\t" << eta(2, 2) << ";";
216 <        
217 <    os << "\n";
213 >    Mat3x3d eta;
214 >    eta = s->getEta();
215 >    sprintf(buffer, "    Barostat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
216 >            eta(0, 0), eta(1, 0), eta(2, 0),
217 >            eta(0, 1), eta(1, 1), eta(2, 1),
218 >            eta(0, 2), eta(1, 2), eta(2, 2));
219 >    os << buffer;
220 >
221 >    os << "    </FrameData>\n";
222    }
223  
224    void DumpWriter::writeFrame(std::ostream& os) {
234 –    const int BUFFERSIZE = 2000;
235 –    const int MINIBUFFERSIZE = 100;
225  
226 <    char tempBuffer[BUFFERSIZE];
227 <    char writeLine[BUFFERSIZE];
226 > #ifdef IS_MPI
227 >    MPI_Status istatus;
228 > #endif
229  
240 –    Quat4d q;
241 –    Vector3d ji;
242 –    Vector3d pos;
243 –    Vector3d vel;
244 –    Vector3d frc;
245 –    Vector3d trq;
246 –
230      Molecule* mol;
231      StuntDouble* integrableObject;
232      SimInfo::MoleculeIterator mi;
233      Molecule::IntegrableObjectIterator ii;
251 –  
252 –    int nTotObjects;    
253 –    nTotObjects = info_->getNGlobalIntegrableObjects();
234  
235   #ifndef IS_MPI
236 +    os << "  <Snapshot>\n";
237 +
238 +    writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
239  
240 <
258 <    os << nTotObjects << "\n";
259 <        
260 <    writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot());
261 <
240 >    os << "    <StuntDoubles>\n";
241      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
242  
243        for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
244 <           integrableObject = mol->nextIntegrableObject(ii)) {
245 <                
244 >           integrableObject = mol->nextIntegrableObject(ii)) {  
245 >        os << prepareDumpLine(integrableObject);
246  
247 <        pos = integrableObject->getPos();
248 <        vel = integrableObject->getVel();
247 >      }
248 >    }    
249 >    os << "    </StuntDoubles>\n";
250  
251 <        sprintf(tempBuffer, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
272 <                integrableObject->getType().c_str(),
273 <                pos[0], pos[1], pos[2],
274 <                vel[0], vel[1], vel[2]);
251 >    os << "  </Snapshot>\n";
252  
253 <        strcpy(writeLine, tempBuffer);
254 <
255 <        if (integrableObject->isDirectional()) {
256 <          q = integrableObject->getQ();
257 <          ji = integrableObject->getJ();
258 <
259 <          sprintf(tempBuffer, "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
260 <                  q[0], q[1], q[2], q[3],
261 <                  ji[0], ji[1], ji[2]);
285 <          strcat(writeLine, tempBuffer);
286 <        } else {
287 <          strcat(writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0");
288 <        }
289 <
290 <        if (needForceVector_) {
291 <          frc = integrableObject->getFrc();
292 <          trq = integrableObject->getTrq();
293 <          
294 <          sprintf(tempBuffer, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
295 <                  frc[0], frc[1], frc[2],
296 <                  trq[0], trq[1], trq[2]);
297 <          strcat(writeLine, tempBuffer);
298 <        }
299 <        
300 <        strcat(writeLine, "\n");
301 <        os << writeLine;
302 <
253 >    os.flush();
254 > #else
255 >    //every node prepares the dump lines for integrable objects belong to itself
256 >    std::string buffer;
257 >    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
258 >      
259 >      for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
260 >           integrableObject = mol->nextIntegrableObject(ii)) {  
261 >        buffer += prepareDumpLine(integrableObject);
262        }
263      }
264 <
306 <    os.flush();
307 < #else // is_mpi
308 <    /*********************************************************************
309 <     * Documentation?  You want DOCUMENTATION?
310 <     *
311 <     * Why all the potatoes below?  
312 <     *
313 <     * To make a long story short, the original version of DumpWriter
314 <     * worked in the most inefficient way possible.  Node 0 would
315 <     * poke each of the node for an individual atom's formatted data
316 <     * as node 0 worked its way down the global index. This was particularly
317 <     * inefficient since the method blocked all processors at every atom
318 <     * (and did it twice!).
319 <     *
320 <     * An intermediate version of DumpWriter could be described from Node
321 <     * zero's perspective as follows:
322 <     *
323 <     *  1) Have 100 of your friends stand in a circle.
324 <     *  2) When you say go, have all of them start tossing potatoes at
325 <     *     you (one at a time).
326 <     *  3) Catch the potatoes.
327 <     *
328 <     * It was an improvement, but MPI has buffers and caches that could
329 <     * best be described in this analogy as "potato nets", so there's no
330 <     * need to block the processors atom-by-atom.
331 <     *
332 <     * This new and improved DumpWriter works in an even more efficient
333 <     * way:
334 <     *
335 <     *  1) Have 100 of your friend stand in a circle.
336 <     *  2) When you say go, have them start tossing 5-pound bags of
337 <     *     potatoes at you.
338 <     *  3) Once you've caught a friend's bag of potatoes,
339 <     *     toss them a spud to let them know they can toss another bag.
340 <     *
341 <     * How's THAT for documentation?
342 <     *
343 <     *********************************************************************/
264 >    
265      const int masterNode = 0;
266  
267 <    int * potatoes;
268 <    int myPotato;
269 <    int nProc;
270 <    int which_node;
271 <    RealType atomData[19];
272 <    int isDirectional;
352 <    char MPIatomTypeString[MINIBUFFERSIZE];
353 <    int msgLen; // the length of message actually recieved at master nodes
354 <    int haveError;
355 <    MPI_Status istatus;
356 <    int nCurObj;
357 <    
358 <    // code to find maximum tag value
359 <    int * tagub;
360 <    int flag;
361 <    int MAXTAG;
362 <    MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
267 >    if (worldRank == masterNode) {      
268 >      os << "  <Snapshot>\n";  
269 >      writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
270 >      os << "    <StuntDoubles>\n";
271 >        
272 >      os << buffer;
273  
274 <    if (flag) {
365 <      MAXTAG = *tagub;
366 <    } else {
367 <      MAXTAG = 32767;
368 <    }
369 <
370 <    if (worldRank == masterNode) { //master node (node 0) is responsible for writing the dump file
371 <
372 <      // Node 0 needs a list of the magic potatoes for each processor;
373 <
274 >      int nProc;
275        MPI_Comm_size(MPI_COMM_WORLD, &nProc);
276 <      potatoes = new int[nProc];
276 >      for (int i = 1; i < nProc; ++i) {
277  
278 <      //write out the comment lines
279 <      for(int i = 0; i < nProc; i++) {
379 <        potatoes[i] = 0;
380 <      }
278 >        // receive the length of the string buffer that was
279 >        // prepared by processor i
280  
281 +        int recvLength;
282 +        MPI_Recv(&recvLength, 1, MPI_INT, i, 0, MPI_COMM_WORLD, &istatus);
283 +        char* recvBuffer = new char[recvLength];
284 +        if (recvBuffer == NULL) {
285 +        } else {
286 +          MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, &istatus);
287 +          os << recvBuffer;
288 +          delete recvBuffer;
289 +        }
290 +      }
291 +      os << "    </StuntDoubles>\n";
292 +      
293 +      os << "  </Snapshot>\n";
294 +      os.flush();
295 +    } else {
296 +      int sendBufferLength = buffer.size() + 1;
297 +      MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD);
298 +      MPI_Send((void *)buffer.c_str(), sendBufferLength, MPI_CHAR, masterNode, 0, MPI_COMM_WORLD);
299 +    }
300  
301 <      os << nTotObjects << "\n";
384 <      writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot());
301 > #endif // is_mpi
302  
303 <      for(int i = 0; i < info_->getNGlobalMolecules(); i++) {
303 >  }
304  
305 <        // Get the Node number which has this atom;
305 >  std::string DumpWriter::prepareDumpLine(StuntDouble* integrableObject) {
306 >        
307 >    int index = integrableObject->getGlobalIntegrableObjectIndex();
308 >    std::string type("pv");
309 >    std::string line;
310 >    char tempBuffer[4096];
311  
312 <        which_node = info_->getMolToProc(i);
312 >    Vector3d pos;
313 >    Vector3d vel;
314 >    pos = integrableObject->getPos();
315 >    vel = integrableObject->getVel();          
316 >    sprintf(tempBuffer, "%18.10g %18.10g %18.10g %13e %13e %13e",
317 >            pos[0], pos[1], pos[2],
318 >            vel[0], vel[1], vel[2]);                    
319 >    line += tempBuffer;
320  
321 <        if (which_node != masterNode) { //current molecule is in slave node
322 <          if (potatoes[which_node] + 1 >= MAXTAG) {
323 <            // The potato was going to exceed the maximum value,
324 <            // so wrap this processor potato back to 0:        
325 <
326 <            potatoes[which_node] = 0;
327 <            MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0,
328 <                     MPI_COMM_WORLD);
329 <          }
330 <
402 <          myPotato = potatoes[which_node];
403 <
404 <          //recieve the number of integrableObject in current molecule
405 <          MPI_Recv(&nCurObj, 1, MPI_INT, which_node, myPotato,
406 <                   MPI_COMM_WORLD, &istatus);
407 <          myPotato++;
408 <
409 <          for(int l = 0; l < nCurObj; l++) {
410 <            if (potatoes[which_node] + 2 >= MAXTAG) {
411 <              // The potato was going to exceed the maximum value,
412 <              // so wrap this processor potato back to 0:        
413 <
414 <              potatoes[which_node] = 0;
415 <              MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node,
416 <                       0, MPI_COMM_WORLD);
417 <            }
418 <
419 <            MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR,
420 <                     which_node, myPotato, MPI_COMM_WORLD,
421 <                     &istatus);
422 <
423 <            myPotato++;
424 <
425 <            MPI_Recv(atomData, 19, MPI_REALTYPE, which_node, myPotato,
426 <                     MPI_COMM_WORLD, &istatus);
427 <            myPotato++;
428 <
429 <            MPI_Get_count(&istatus, MPI_REALTYPE, &msgLen);
430 <
431 <            if (msgLen == 13 || msgLen == 19)
432 <              isDirectional = 1;
433 <            else
434 <              isDirectional = 0;
435 <
436 <            // If we've survived to here, format the line:
437 <
438 <            if (!isDirectional) {
439 <              sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
440 <                      MPIatomTypeString, atomData[0],
441 <                      atomData[1], atomData[2],
442 <                      atomData[3], atomData[4],
443 <                      atomData[5]);
444 <
445 <              strcat(writeLine,
446 <                     "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0");
447 <            } else {
448 <              sprintf(writeLine,
449 <                      "%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",
450 <                      MPIatomTypeString,
451 <                      atomData[0],
452 <                      atomData[1],
453 <                      atomData[2],
454 <                      atomData[3],
455 <                      atomData[4],
456 <                      atomData[5],
457 <                      atomData[6],
458 <                      atomData[7],
459 <                      atomData[8],
460 <                      atomData[9],
461 <                      atomData[10],
462 <                      atomData[11],
463 <                      atomData[12]);
464 <            }
465 <            
466 <            if (needForceVector_) {
467 <              if (!isDirectional) {
468 <                sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
469 <                        atomData[6],
470 <                        atomData[7],
471 <                        atomData[8],
472 <                        atomData[9],
473 <                        atomData[10],
474 <                        atomData[11]);
475 <              } else {
476 <                sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
477 <                        atomData[13],
478 <                        atomData[14],
479 <                        atomData[15],
480 <                        atomData[16],
481 <                        atomData[17],
482 <                        atomData[18]);
483 <              }
484 <            }
485 <
486 <            sprintf(writeLine, "\n");
487 <            os << writeLine;
488 <
489 <          } // end for(int l =0)
490 <
491 <          potatoes[which_node] = myPotato;
492 <        } else { //master node has current molecule
493 <
494 <          mol = info_->getMoleculeByGlobalIndex(i);
495 <
496 <          if (mol == NULL) {
497 <            sprintf(painCave.errMsg, "Molecule not found on node %d!", worldRank);
498 <            painCave.isFatal = 1;
499 <            simError();
500 <          }
501 <                
502 <          for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
503 <               integrableObject = mol->nextIntegrableObject(ii)) {      
504 <
505 <            pos = integrableObject->getPos();
506 <            vel = integrableObject->getVel();
507 <
508 <            atomData[0] = pos[0];
509 <            atomData[1] = pos[1];
510 <            atomData[2] = pos[2];
511 <
512 <            atomData[3] = vel[0];
513 <            atomData[4] = vel[1];
514 <            atomData[5] = vel[2];
515 <
516 <            isDirectional = 0;
517 <
518 <            if (integrableObject->isDirectional()) {
519 <              isDirectional = 1;
520 <
521 <              q = integrableObject->getQ();
522 <              ji = integrableObject->getJ();
523 <
524 <              for(int j = 0; j < 6; j++) {
525 <                atomData[j] = atomData[j];
526 <              }
527 <
528 <              atomData[6] = q[0];
529 <              atomData[7] = q[1];
530 <              atomData[8] = q[2];
531 <              atomData[9] = q[3];
532 <
533 <              atomData[10] = ji[0];
534 <              atomData[11] = ji[1];
535 <              atomData[12] = ji[2];
536 <            }
537 <
538 <            if (needForceVector_) {
539 <              frc = integrableObject->getFrc();
540 <              trq = integrableObject->getTrq();
541 <
542 <              if (!isDirectional) {
543 <                atomData[6] = frc[0];
544 <                atomData[7] = frc[1];
545 <                atomData[8] = frc[2];
546 <                atomData[9] = trq[0];
547 <                atomData[10] = trq[1];
548 <                atomData[11] = trq[2];
549 <              } else {
550 <                atomData[13] = frc[0];
551 <                atomData[14] = frc[1];
552 <                atomData[15] = frc[2];
553 <                atomData[16] = trq[0];
554 <                atomData[17] = trq[1];
555 <                atomData[18] = trq[2];
556 <              }
557 <            }
558 <
559 <            // If we've survived to here, format the line:
560 <
561 <            if (!isDirectional) {
562 <              sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
563 <                      integrableObject->getType().c_str(), atomData[0],
564 <                      atomData[1], atomData[2],
565 <                      atomData[3], atomData[4],
566 <                      atomData[5]);
567 <
568 <              strcat(writeLine,
569 <                     "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0");
570 <            } else {
571 <              sprintf(writeLine,
572 <                      "%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",
573 <                      integrableObject->getType().c_str(),
574 <                      atomData[0],
575 <                      atomData[1],
576 <                      atomData[2],
577 <                      atomData[3],
578 <                      atomData[4],
579 <                      atomData[5],
580 <                      atomData[6],
581 <                      atomData[7],
582 <                      atomData[8],
583 <                      atomData[9],
584 <                      atomData[10],
585 <                      atomData[11],
586 <                      atomData[12]);
587 <            }
588 <
589 <            if (needForceVector_) {
590 <              if (!isDirectional) {
591 <              sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
592 <                      atomData[6],
593 <                      atomData[7],
594 <                      atomData[8],
595 <                      atomData[9],
596 <                      atomData[10],
597 <                      atomData[11]);
598 <              } else {
599 <                sprintf(writeLine, "\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf",
600 <                        atomData[13],
601 <                        atomData[14],
602 <                        atomData[15],
603 <                        atomData[16],
604 <                        atomData[17],
605 <                        atomData[18]);
606 <              }
607 <            }
608 <
609 <            os << writeLine << "\n";
610 <
611 <          } //end for(iter = integrableObject.begin())
612 <        }
613 <      } //end for(i = 0; i < mpiSim->getNmol())
614 <
615 <      os.flush();
616 <        
617 <      sprintf(checkPointMsg, "Sucessfully took a dump.\n");
618 <      MPIcheckPoint();
619 <
620 <      delete [] potatoes;
621 <    } else {
622 <
623 <      // worldRank != 0, so I'm a remote node.  
624 <
625 <      // Set my magic potato to 0:
626 <
627 <      myPotato = 0;
628 <
629 <      for(int i = 0; i < info_->getNGlobalMolecules(); i++) {
630 <
631 <        // Am I the node which has this integrableObject?
632 <        int whichNode = info_->getMolToProc(i);
633 <        if (whichNode == worldRank) {
634 <          if (myPotato + 1 >= MAXTAG) {
635 <
636 <            // The potato was going to exceed the maximum value,
637 <            // so wrap this processor potato back to 0 (and block until
638 <            // node 0 says we can go:
639 <
640 <            MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD,
641 <                     &istatus);
642 <          }
643 <
644 <          mol = info_->getMoleculeByGlobalIndex(i);
645 <
646 <                
647 <          nCurObj = mol->getNIntegrableObjects();
648 <
649 <          MPI_Send(&nCurObj, 1, MPI_INT, 0, myPotato, MPI_COMM_WORLD);
650 <          myPotato++;
651 <
652 <          for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
653 <               integrableObject = mol->nextIntegrableObject(ii)) {
654 <
655 <            if (myPotato + 2 >= MAXTAG) {
656 <
657 <              // The potato was going to exceed the maximum value,
658 <              // so wrap this processor potato back to 0 (and block until
659 <              // node 0 says we can go:
660 <
661 <              MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD,
662 <                       &istatus);
663 <            }
664 <
665 <            pos = integrableObject->getPos();
666 <            vel = integrableObject->getVel();
667 <
668 <            atomData[0] = pos[0];
669 <            atomData[1] = pos[1];
670 <            atomData[2] = pos[2];
671 <
672 <            atomData[3] = vel[0];
673 <            atomData[4] = vel[1];
674 <            atomData[5] = vel[2];
675 <
676 <            isDirectional = 0;
677 <
678 <            if (integrableObject->isDirectional()) {
679 <              isDirectional = 1;
680 <
681 <              q = integrableObject->getQ();
682 <              ji = integrableObject->getJ();
683 <
684 <              atomData[6] = q[0];
685 <              atomData[7] = q[1];
686 <              atomData[8] = q[2];
687 <              atomData[9] = q[3];
688 <
689 <              atomData[10] = ji[0];
690 <              atomData[11] = ji[1];
691 <              atomData[12] = ji[2];
692 <            }
693 <
694 <            if (needForceVector_) {
695 <              frc = integrableObject->getFrc();
696 <              trq = integrableObject->getTrq();
697 <              
698 <              if (!isDirectional) {
699 <                atomData[6] = frc[0];
700 <                atomData[7] = frc[1];
701 <                atomData[8] = frc[2];
702 <                
703 <                atomData[9] = trq[0];
704 <                atomData[10] = trq[1];
705 <                atomData[11] = trq[2];
706 <              } else {
707 <                atomData[13] = frc[0];
708 <                atomData[14] = frc[1];
709 <                atomData[15] = frc[2];
710 <                
711 <                atomData[16] = trq[0];
712 <                atomData[17] = trq[1];
713 <                atomData[18] = trq[2];
714 <              }
715 <            }
716 <
717 <            strncpy(MPIatomTypeString, integrableObject->getType().c_str(), MINIBUFFERSIZE);
718 <
719 <            // null terminate the  std::string before sending (just in case):
720 <            MPIatomTypeString[MINIBUFFERSIZE - 1] = '\0';
721 <
722 <            MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
723 <                     myPotato, MPI_COMM_WORLD);
724 <
725 <            myPotato++;
726 <
727 <            if (isDirectional && needForceVector_) {
728 <              MPI_Send(atomData, 19, MPI_REALTYPE, 0, myPotato,
729 <                       MPI_COMM_WORLD);
730 <            } else if (isDirectional) {
731 <              MPI_Send(atomData, 13, MPI_REALTYPE, 0, myPotato,
732 <                       MPI_COMM_WORLD);
733 <            } else if (needForceVector_) {
734 <              MPI_Send(atomData, 12, MPI_REALTYPE, 0, myPotato,
735 <                       MPI_COMM_WORLD);
736 <            } else {
737 <              MPI_Send(atomData, 6, MPI_REALTYPE, 0, myPotato,
738 <                       MPI_COMM_WORLD);
739 <            }
740 <
741 <            myPotato++;
742 <          }
743 <                    
744 <        }
745 <            
746 <      }
747 <      sprintf(checkPointMsg, "Sucessfully took a dump.\n");
748 <      MPIcheckPoint();
321 >    if (integrableObject->isDirectional()) {
322 >      type += "qj";
323 >      Quat4d q;
324 >      Vector3d ji;
325 >      q = integrableObject->getQ();
326 >      ji = integrableObject->getJ();
327 >      sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e %13e",
328 >              q[0], q[1], q[2], q[3],
329 >              ji[0], ji[1], ji[2]);
330 >      line += tempBuffer;
331      }
332  
333 < #endif // is_mpi
334 <
333 >    if (needForceVector_) {
334 >      type += "ft";
335 >      Vector3d frc;
336 >      Vector3d trq;
337 >      frc = integrableObject->getFrc();
338 >      trq = integrableObject->getTrq();
339 >              
340 >      sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e",
341 >              frc[0], frc[1], frc[2],
342 >              trq[0], trq[1], trq[2]);
343 >      line += tempBuffer;
344 >    }
345 >        
346 >    sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str());
347 >    return std::string(tempBuffer);
348    }
349  
350    void DumpWriter::writeDump() {
# Line 774 | Line 369 | namespace oopse {
369   #ifdef IS_MPI
370      if (worldRank == 0) {
371   #endif // is_mpi
372 <    delete eorStream;
373 <
372 >      writeClosing(*eorStream);
373 >      delete eorStream;
374   #ifdef IS_MPI
375      }
376   #endif // is_mpi  
# Line 808 | Line 403 | namespace oopse {
403   #ifdef IS_MPI
404      if (worldRank == 0) {
405   #endif // is_mpi
406 <    delete eorStream;
407 <
406 >      writeClosing(*eorStream);
407 >      delete eorStream;
408   #ifdef IS_MPI
409      }
410   #endif // is_mpi  
411      
412    }
413  
414 < std::ostream* DumpWriter::createOStream(const std::string& filename) {
414 >  std::ostream* DumpWriter::createOStream(const std::string& filename) {
415  
416      std::ostream* newOStream;
417   #ifdef HAVE_LIBZ
418      if (needCompression_) {
419 <        newOStream = new ogzstream(filename.c_str());
419 >      newOStream = new ogzstream(filename.c_str());
420      } else {
421 <        newOStream = new std::ofstream(filename.c_str());
421 >      newOStream = new std::ofstream(filename.c_str());
422      }
423   #else
424      newOStream = new std::ofstream(filename.c_str());
425   #endif
426 +    //write out MetaData first
427 +    (*newOStream) << "<OOPSE version=4>" << std::endl;
428 +    (*newOStream) << "  <MetaData>" << std::endl;
429 +    (*newOStream) << info_->getRawMetaData();
430 +    (*newOStream) << "  </MetaData>" << std::endl;
431      return newOStream;
432 < }
432 >  }
433  
434 +  void DumpWriter::writeClosing(std::ostream& os) {
435 +
436 +    os << "</OOPSE>\n";
437 +    os.flush();
438 +  }
439 +
440   }//end namespace oopse

Diff Legend

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