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

Comparing branches/development/src/io/DumpWriter.cpp (file contents):
Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC vs.
Revision 1878 by gezelter, Thu Jun 13 14:26:09 2013 UTC

# Line 310 | Line 310 | namespace OpenMD {
310      SimInfo::MoleculeIterator mi;
311      Molecule::IntegrableObjectIterator ii;
312      RigidBody::AtomIterator ai;
313 –    Atom* atom;
313  
314   #ifndef IS_MPI
315      os << "  <Snapshot>\n";
# Line 318 | Line 317 | namespace OpenMD {
317      writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
318  
319      os << "    <StuntDoubles>\n";
320 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
321 <
320 >    for (mol = info_->beginMolecule(mi); mol != NULL;
321 >         mol = info_->nextMolecule(mi)) {
322        
323        for (sd = mol->beginIntegrableObject(ii); sd != NULL;  
324             sd = mol->nextIntegrableObject(ii)) {        
# Line 345 | Line 344 | namespace OpenMD {
344              
345              RigidBody* rb = static_cast<RigidBody*>(sd);
346              int siteIndex = 0;
347 <            for (atom = rb->beginAtom(ai); atom != NULL;  
347 >            for (Atom* atom = rb->beginAtom(ai); atom != NULL;  
348                   atom = rb->nextAtom(ai)) {                                            
349                os << prepareSiteLine(atom, ioIndex, siteIndex);
350                siteIndex++;
# Line 420 | Line 419 | namespace OpenMD {
419            // send our buffer:
420            MPI::COMM_WORLD.Send((void *)buffer.c_str(), sendBufferLength,
421                                 MPI::CHAR, masterNode, 0);
422 +
423          }
424        }
425      }
# Line 447 | Line 447 | namespace OpenMD {
447              
448              RigidBody* rb = static_cast<RigidBody*>(sd);
449              int siteIndex = 0;
450 <            for (atom = rb->beginAtom(ai); atom != NULL;  
450 >            for (Atom* atom = rb->beginAtom(ai); atom != NULL;  
451                   atom = rb->nextAtom(ai)) {                                            
452                buffer += prepareSiteLine(atom, ioIndex, siteIndex);
453                siteIndex++;
# Line 728 | Line 728 | namespace OpenMD {
728   #endif // is_mpi
729        
730        eorStream = createOStream(eorFilename_);
731 <      writeFrame(*eorStream);
732 <      
731 >
732   #ifdef IS_MPI
733      }
734 + #endif
735 +    
736 +    writeFrame(*eorStream);
737 +      
738 + #ifdef IS_MPI
739      if (worldRank == 0) {
740 < #endif // is_mpi
741 <
740 > #endif
741 >      
742        writeClosing(*eorStream);
743        delete eorStream;
744 <
744 >      
745   #ifdef IS_MPI
746      }
747   #endif // is_mpi  

Diff Legend

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