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 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/development/src/io/DumpWriter.cpp (file contents), Revision 1769 by gezelter, Mon Jul 9 14:15:52 2012 UTC

# Line 1 | Line 1
1 < #define _LARGEFILE_SOURCE64
2 < #define _FILE_OFFSET_BITS 64
1 > /*
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. Redistributions of source code must retain the above copyright
10 > *    notice, this list of conditions and the following disclaimer.
11 > *
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.
16 > *
17 > * This software is provided "AS IS," without a warranty of any
18 > * kind. All express or implied conditions, representations and
19 > * warranties, including any implied warranty of merchantability,
20 > * fitness for a particular purpose or non-infringement, are hereby
21 > * excluded.  The University of Notre Dame and its licensors shall not
22 > * be liable for any damages suffered by licensee as a result of
23 > * using, modifying or distributing the software or its
24 > * derivatives. In no event will the University of Notre Dame or its
25 > * licensors be liable for any lost revenue, profit or data, or for
26 > * direct, indirect, special, consequential, incidental or punitive
27 > * damages, however caused and regardless of the theory of liability,
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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41 > */
42 >
43 > #include "io/DumpWriter.hpp"
44 > #include "primitives/Molecule.hpp"
45 > #include "utils/simError.h"
46 > #include "io/basic_teebuf.hpp"
47 > #ifdef HAVE_ZLIB
48 > #include "io/gzstream.hpp"
49 > #endif
50 > #include "io/Globals.hpp"
51  
52 < #include <string.h>
53 < #include <iostream>
54 < #include <fstream>
55 < #include <algorithm>
8 < #include <utility>
52 > #ifdef _MSC_VER
53 > #define isnan(x) _isnan((x))
54 > #define isinf(x) (!_finite(x) && !_isnan(x))
55 > #endif
56  
57   #ifdef IS_MPI
58   #include <mpi.h>
59 < #include "brains/mpiSimulation.hpp"
59 > #endif
60  
61 < namespace dWrite{
62 <  void DieDieDie( void );
16 < }
61 > using namespace std;
62 > namespace OpenMD {
63  
64 < using namespace dWrite;
65 < #endif //is_mpi
64 >  DumpWriter::DumpWriter(SimInfo* info)
65 >    : info_(info), filename_(info->getDumpFileName()), eorFilename_(info->getFinalConfigFileName()){
66  
67 < #include "io/ReadWrite.hpp"
68 < #include "utils/simError.h"
67 >    Globals* simParams = info->getSimParams();
68 >    needCompression_   = simParams->getCompressDumpFile();
69 >    needForceVector_   = simParams->getOutputForceVector();
70 >    needParticlePot_   = simParams->getOutputParticlePotential();
71 >    needFlucQ_         = simParams->getOutputFluctuatingCharges();
72 >    needElectricField_ = simParams->getOutputElectricField();
73  
74 < DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
74 >    if (needParticlePot_ || needFlucQ_ || needElectricField_) {
75 >      doSiteData_ = true;
76 >    } else {
77 >      doSiteData_ = false;
78 >    }
79  
80 <  entry_plug = the_entry_plug;
81 <
80 >    createDumpFile_ = true;
81 > #ifdef HAVE_LIBZ
82 >    if (needCompression_) {
83 >      filename_ += ".gz";
84 >      eorFilename_ += ".gz";
85 >    }
86 > #endif
87 >    
88   #ifdef IS_MPI
89 <  if(worldRank == 0 ){
89 >
90 >    if (worldRank == 0) {
91   #endif // is_mpi
92 +        
93 +      dumpFile_ = createOStream(filename_);
94  
95 <    dumpFile.open(entry_plug->sampleName.c_str(), ios::out | ios::trunc );
95 >      if (!dumpFile_) {
96 >        sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
97 >                filename_.c_str());
98 >        painCave.isFatal = 1;
99 >        simError();
100 >      }
101  
102 <    if( !dumpFile ){
102 > #ifdef IS_MPI
103  
36      sprintf( painCave.errMsg,
37               "Could not open \"%s\" for dump output.\n",
38               entry_plug->sampleName.c_str());
39      painCave.isFatal = 1;
40      simError();
104      }
105  
106 < #ifdef IS_MPI
106 > #endif // is_mpi
107 >
108    }
109  
46  //sort the local atoms by global index
47  sortByGlobalIndex();
48  
49  sprintf( checkPointMsg,
50           "Sucessfully opened output file for dumping.\n");
51  MPIcheckPoint();
52 #endif // is_mpi
53 }
110  
111 < DumpWriter::~DumpWriter( ){
111 >  DumpWriter::DumpWriter(SimInfo* info, const std::string& filename)
112 >    : info_(info), filename_(filename){
113  
114 < #ifdef IS_MPI
115 <  if(worldRank == 0 ){
59 < #endif // is_mpi
114 >    Globals* simParams = info->getSimParams();
115 >    eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor";    
116  
117 <    dumpFile.close();
117 >    needCompression_   = simParams->getCompressDumpFile();
118 >    needForceVector_   = simParams->getOutputForceVector();
119 >    needParticlePot_   = simParams->getOutputParticlePotential();
120 >    needFlucQ_         = simParams->getOutputFluctuatingCharges();
121 >    needElectricField_ = simParams->getOutputElectricField();
122  
123 +    if (needParticlePot_ || needFlucQ_ || needElectricField_) {
124 +      doSiteData_ = true;
125 +    } else {
126 +      doSiteData_ = false;
127 +    }
128 +
129 +    createDumpFile_ = true;
130 + #ifdef HAVE_LIBZ
131 +    if (needCompression_) {
132 +      filename_ += ".gz";
133 +      eorFilename_ += ".gz";
134 +    }
135 + #endif
136 +    
137   #ifdef IS_MPI
138 <  }
138 >
139 >    if (worldRank == 0) {
140   #endif // is_mpi
66 }
141  
142 +      
143 +      dumpFile_ = createOStream(filename_);
144 +
145 +      if (!dumpFile_) {
146 +        sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
147 +                filename_.c_str());
148 +        painCave.isFatal = 1;
149 +        simError();
150 +      }
151 +
152   #ifdef IS_MPI
153  
154 < /**
71 < * A hook function to load balancing
72 < */
154 >    }
155  
156 < void DumpWriter::update(){
75 <  sortByGlobalIndex();          
76 < }
77 <  
78 < /**
79 < * Auxiliary sorting function
80 < */
81 <
82 < bool indexSortingCriterion(const pair<int, int>& p1, const pair<int, int>& p2){
83 <  return p1.second < p2.second;
84 < }
156 > #endif // is_mpi
157  
158 < /**
87 < * Sorting the local index by global index
88 < */
89 <
90 < void DumpWriter::sortByGlobalIndex(){
91 <  Molecule* mols = entry_plug->molecules;  
92 <  indexArray.clear();
158 >  }
159    
160 <  for(int i = 0; i < entry_plug->n_mol;i++)
161 <    indexArray.push_back(make_pair(i, mols[i].getGlobalIndex()));
162 <  
163 <  sort(indexArray.begin(), indexArray.end(), indexSortingCriterion);    
164 < }
160 >  DumpWriter::DumpWriter(SimInfo* info, const std::string& filename, bool writeDumpFile)
161 >    : info_(info), filename_(filename){
162 >    
163 >    Globals* simParams = info->getSimParams();
164 >    eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor";    
165 >    
166 >    needCompression_   = simParams->getCompressDumpFile();
167 >    needForceVector_   = simParams->getOutputForceVector();
168 >    needParticlePot_   = simParams->getOutputParticlePotential();
169 >    needFlucQ_         = simParams->getOutputFluctuatingCharges();
170 >    needElectricField_ = simParams->getOutputElectricField();
171  
172 < #endif
172 >    if (needParticlePot_ || needFlucQ_ || needElectricField_) {
173 >      doSiteData_ = true;
174 >    } else {
175 >      doSiteData_ = false;
176 >    }
177  
178 < void DumpWriter::writeDump(double currentTime){
179 <
180 <  ofstream finalOut;
181 <  vector<ofstream*> fileStreams;
106 <
107 < #ifdef IS_MPI
108 <  if(worldRank == 0 ){
109 < #endif    
110 <    finalOut.open( entry_plug->finalName.c_str(), ios::out | ios::trunc );
111 <    if( !finalOut ){
112 <      sprintf( painCave.errMsg,
113 <               "Could not open \"%s\" for final dump output.\n",
114 <               entry_plug->finalName.c_str() );
115 <      painCave.isFatal = 1;
116 <      simError();
178 > #ifdef HAVE_LIBZ
179 >    if (needCompression_) {
180 >      filename_ += ".gz";
181 >      eorFilename_ += ".gz";
182      }
183 + #endif
184 +    
185   #ifdef IS_MPI
186 <  }
186 >    
187 >    if (worldRank == 0) {
188   #endif // is_mpi
189 +      
190 +      createDumpFile_ = writeDumpFile;
191 +      if (createDumpFile_) {
192 +        dumpFile_ = createOStream(filename_);
193 +      
194 +        if (!dumpFile_) {
195 +          sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
196 +                  filename_.c_str());
197 +          painCave.isFatal = 1;
198 +          simError();
199 +        }
200 +      }
201 + #ifdef IS_MPI
202 +      
203 +    }
204  
205 <  fileStreams.push_back(&finalOut);
206 <  fileStreams.push_back(&dumpFile);
205 >    
206 > #endif // is_mpi
207 >    
208 >  }
209  
210 <  writeFrame(fileStreams, currentTime);
210 >  DumpWriter::~DumpWriter() {
211  
212   #ifdef IS_MPI
128  finalOut.close();
129 #endif
130        
131 }
213  
214 < void DumpWriter::writeFinal(double currentTime){
214 >    if (worldRank == 0) {
215 > #endif // is_mpi
216 >      if (createDumpFile_){
217 >        writeClosing(*dumpFile_);
218 >        delete dumpFile_;
219 >      }
220 > #ifdef IS_MPI
221  
222 <  ofstream finalOut;
136 <  vector<ofstream*> fileStreams;
222 >    }
223  
138 #ifdef IS_MPI
139  if(worldRank == 0 ){
224   #endif // is_mpi
225  
226 <    finalOut.open( entry_plug->finalName.c_str(), ios::out | ios::trunc );
226 >  }
227  
228 <    if( !finalOut ){
228 >  void DumpWriter::writeFrameProperties(std::ostream& os, Snapshot* s) {
229 >
230 >    char buffer[1024];
231 >
232 >    os << "    <FrameData>\n";
233 >
234 >    RealType currentTime = s->getTime();
235 >
236 >    if (isinf(currentTime) || isnan(currentTime)) {      
237        sprintf( painCave.errMsg,
238 <               "Could not open \"%s\" for final dump output.\n",
147 <               entry_plug->finalName.c_str() );
238 >               "DumpWriter detected a numerical error writing the time");      
239        painCave.isFatal = 1;
240        simError();
241      }
242 +    
243 +    sprintf(buffer, "        Time: %.10g\n", currentTime);
244 +    os << buffer;
245  
246 < #ifdef IS_MPI
247 <  }
154 < #endif // is_mpi
155 <  
156 <  fileStreams.push_back(&finalOut);  
157 <  writeFrame(fileStreams, currentTime);
246 >    Mat3x3d hmat;
247 >    hmat = s->getHmat();
248  
249 < #ifdef IS_MPI
250 <  finalOut.close();
251 < #endif
252 <  
253 < }
249 >    for (unsigned int i = 0; i < 3; i++) {
250 >      for (unsigned int j = 0; j < 3; j++) {
251 >        if (isinf(hmat(i,j)) || isnan(hmat(i,j))) {      
252 >          sprintf( painCave.errMsg,
253 >                   "DumpWriter detected a numerical error writing the box");
254 >          painCave.isFatal = 1;
255 >          simError();
256 >        }        
257 >      }
258 >    }
259 >    
260 >    sprintf(buffer, "        Hmat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
261 >            hmat(0, 0), hmat(1, 0), hmat(2, 0),
262 >            hmat(0, 1), hmat(1, 1), hmat(2, 1),
263 >            hmat(0, 2), hmat(1, 2), hmat(2, 2));
264 >    os << buffer;
265  
266 < void DumpWriter::writeFrame( vector<ofstream*>& outFile, double currentTime ){
166 <
167 <  const int BUFFERSIZE = 2000;
168 <  const int MINIBUFFERSIZE = 100;
169 <
170 <  char tempBuffer[BUFFERSIZE];  
171 <  char writeLine[BUFFERSIZE];
172 <
173 <  int i;
174 <  unsigned int k;
266 >    pair<RealType, RealType> thermostat = s->getThermostat();
267  
268 < #ifdef IS_MPI
269 <  
270 <  /*********************************************************************
271 <   * Documentation?  You want DOCUMENTATION?
272 <   *
273 <   * Why all the potatoes below?  
274 <   *
275 <   * To make a long story short, the original version of DumpWriter
276 <   * worked in the most inefficient way possible.  Node 0 would
277 <   * poke each of the node for an individual atom's formatted data
186 <   * as node 0 worked its way down the global index. This was particularly
187 <   * inefficient since the method blocked all processors at every atom
188 <   * (and did it twice!).
189 <   *
190 <   * An intermediate version of DumpWriter could be described from Node
191 <   * zero's perspective as follows:
192 <   *
193 <   *  1) Have 100 of your friends stand in a circle.
194 <   *  2) When you say go, have all of them start tossing potatoes at
195 <   *     you (one at a time).
196 <   *  3) Catch the potatoes.
197 <   *
198 <   * It was an improvement, but MPI has buffers and caches that could
199 <   * best be described in this analogy as "potato nets", so there's no
200 <   * need to block the processors atom-by-atom.
201 <   *
202 <   * This new and improved DumpWriter works in an even more efficient
203 <   * way:
204 <   *
205 <   *  1) Have 100 of your friend stand in a circle.
206 <   *  2) When you say go, have them start tossing 5-pound bags of
207 <   *     potatoes at you.
208 <   *  3) Once you've caught a friend's bag of potatoes,
209 <   *     toss them a spud to let them know they can toss another bag.
210 <   *
211 <   * How's THAT for documentation?
212 <   *
213 <   *********************************************************************/
268 >    if (isinf(thermostat.first)  || isnan(thermostat.first) ||
269 >        isinf(thermostat.second) || isnan(thermostat.second)) {      
270 >      sprintf( painCave.errMsg,
271 >               "DumpWriter detected a numerical error writing the thermostat");
272 >      painCave.isFatal = 1;
273 >      simError();
274 >    }
275 >    sprintf(buffer, "  Thermostat: %.10g , %.10g\n", thermostat.first,
276 >            thermostat.second);
277 >    os << buffer;
278  
279 <  int *potatoes;
280 <  int myPotato;
279 >    Mat3x3d eta;
280 >    eta = s->getBarostat();
281  
282 <  int nProc;
283 <  int j, which_node, done, which_atom, local_index, currentIndex;
284 <  double atomData[13];
285 <  int isDirectional;
286 <  char* atomTypeString;
287 <  char MPIatomTypeString[MINIBUFFERSIZE];
288 <  int nObjects;
289 <  int msgLen; // the length of message actually recieved at master nodes
226 < #endif //is_mpi
227 <
228 <  double q[4], ji[3];
229 <  DirectionalAtom* dAtom;
230 <  double pos[3], vel[3];
231 <  int nTotObjects;
232 <  StuntDouble* sd;
233 <  char* molName;
234 <  vector<StuntDouble*> integrableObjects;
235 <  vector<StuntDouble*>::iterator iter;
236 <  nTotObjects = entry_plug->getTotIntegrableObjects();
237 < #ifndef IS_MPI
238 <  
239 <  for(k = 0; k < outFile.size(); k++){
240 <    *outFile[k] << nTotObjects << "\n";
241 <
242 <    *outFile[k] << currentTime << ";\t"
243 <               << entry_plug->Hmat[0][0] << "\t"
244 <                     << entry_plug->Hmat[1][0] << "\t"
245 <                     << entry_plug->Hmat[2][0] << ";\t"
246 <              
247 <               << entry_plug->Hmat[0][1] << "\t"
248 <                     << entry_plug->Hmat[1][1] << "\t"
249 <                     << entry_plug->Hmat[2][1] << ";\t"
250 <
251 <                     << entry_plug->Hmat[0][2] << "\t"
252 <                     << entry_plug->Hmat[1][2] << "\t"
253 <                     << entry_plug->Hmat[2][2] << ";";
254 <
255 <    //write out additional parameters, such as chi and eta
256 <    *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
257 <  }
258 <  
259 <  for( i=0; i< entry_plug->n_mol; i++ ){
260 <
261 <    integrableObjects = entry_plug->molecules[i].getIntegrableObjects();
262 <    molName = (entry_plug->compStamps[entry_plug->molecules[i].getStampID()])->getID();
263 <    
264 <    for( iter = integrableObjects.begin();iter !=  integrableObjects.end(); ++iter){
265 <      sd = *iter;
266 <      sd->getPos(pos);
267 <      sd->getVel(vel);
268 <
269 <      sprintf( tempBuffer,
270 <             "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
271 <             sd->getType(),
272 <             pos[0],
273 <             pos[1],
274 <             pos[2],
275 <             vel[0],
276 <             vel[1],
277 <             vel[2]);
278 <      strcpy( writeLine, tempBuffer );
279 <
280 <      if( sd->isDirectional() ){
281 <
282 <        sd->getQ( q );
283 <        sd->getJ( ji );
284 <
285 <        sprintf( tempBuffer,
286 <               "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
287 <               q[0],
288 <               q[1],
289 <               q[2],
290 <               q[3],
291 <                 ji[0],
292 <                 ji[1],
293 <                 ji[2]);
294 <        strcat( writeLine, tempBuffer );
282 >    for (unsigned int i = 0; i < 3; i++) {
283 >      for (unsigned int j = 0; j < 3; j++) {
284 >        if (isinf(eta(i,j)) || isnan(eta(i,j))) {      
285 >          sprintf( painCave.errMsg,
286 >                   "DumpWriter detected a numerical error writing the barostat");
287 >          painCave.isFatal = 1;
288 >          simError();
289 >        }        
290        }
296      else
297        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
298    
299      for(k = 0; k < outFile.size(); k++)
300        *outFile[k] << writeLine;      
291      }
292  
293 < }
293 >    sprintf(buffer, "    Barostat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
294 >            eta(0, 0), eta(1, 0), eta(2, 0),
295 >            eta(0, 1), eta(1, 1), eta(2, 1),
296 >            eta(0, 2), eta(1, 2), eta(2, 2));
297 >    os << buffer;
298  
299 < #else // is_mpi
299 >    os << "    </FrameData>\n";
300 >  }
301  
302 <  /* code to find maximum tag value */
308 <  
309 <  int *tagub, flag, MAXTAG;
310 <  MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
311 <  if (flag) {
312 <    MAXTAG = *tagub;
313 <  } else {
314 <    MAXTAG = 32767;
315 <  }  
302 >  void DumpWriter::writeFrame(std::ostream& os) {
303  
304 <  int haveError;
304 > #ifdef IS_MPI
305 >    MPI_Status istatus;
306 > #endif
307  
308 <  MPI_Status istatus;
309 <  int nCurObj;
310 <  int *MolToProcMap = mpiSim->getMolToProcMap();
308 >    Molecule* mol;
309 >    StuntDouble* sd;
310 >    SimInfo::MoleculeIterator mi;
311 >    Molecule::IntegrableObjectIterator ii;
312 >    RigidBody::AtomIterator ai;
313 >    Atom* atom;
314  
315 <  // write out header and node 0's coordinates
315 > #ifndef IS_MPI
316 >    os << "  <Snapshot>\n";
317 >
318 >    writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
319  
320 <  if( worldRank == 0 ){
320 >    os << "    <StuntDoubles>\n";
321 >    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
322  
327    // Node 0 needs a list of the magic potatoes for each processor;
328
329    nProc = mpiSim->getNProcessors();
330    potatoes = new int[nProc];
331
332    //write out the comment lines
333    for (i = 0; i < nProc; i++)
334      potatoes[i] = 0;
335    
336      for(k = 0; k < outFile.size(); k++){
337        *outFile[k] << nTotObjects << "\n";
338
339        *outFile[k] << currentTime << ";\t"
340                         << entry_plug->Hmat[0][0] << "\t"
341                         << entry_plug->Hmat[1][0] << "\t"
342                         << entry_plug->Hmat[2][0] << ";\t"
343
344                         << entry_plug->Hmat[0][1] << "\t"
345                         << entry_plug->Hmat[1][1] << "\t"
346                         << entry_plug->Hmat[2][1] << ";\t"
347
348                         << entry_plug->Hmat[0][2] << "\t"
349                         << entry_plug->Hmat[1][2] << "\t"
350                         << entry_plug->Hmat[2][2] << ";";
351  
352        *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
353    }
354
355    currentIndex = 0;
356
357    for (i = 0 ; i < mpiSim->getNMolGlobal(); i++ ) {
323        
324 <      // Get the Node number which has this atom;
325 <      
326 <      which_node = MolToProcMap[i];
362 <      
363 <      if (which_node != 0) {
364 <        
365 <        if (potatoes[which_node] + 1 >= MAXTAG) {
366 <          // The potato was going to exceed the maximum value,
367 <          // so wrap this processor potato back to 0:        
368 <
369 <          potatoes[which_node] = 0;          
370 <          MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0, MPI_COMM_WORLD);
324 >      for (sd = mol->beginIntegrableObject(ii); sd != NULL;  
325 >           sd = mol->nextIntegrableObject(ii)) {        
326 >          os << prepareDumpLine(sd);
327            
328 <        }
328 >      }
329 >    }    
330 >    os << "    </StuntDoubles>\n";
331  
332 <        myPotato = potatoes[which_node];        
332 >    if (doSiteData_) {
333 >      os << "    <SiteData>\n";
334 >      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
335 >              
336 >        for (sd = mol->beginIntegrableObject(ii); sd != NULL;  
337 >           sd = mol->nextIntegrableObject(ii)) {        
338  
339 <        //recieve the number of integrableObject in current molecule
340 <        MPI_Recv(&nCurObj, 1, MPI_INT, which_node,
341 <                 myPotato, MPI_COMM_WORLD, &istatus);
379 <        myPotato++;
380 <        
381 <        for(int l = 0; l < nCurObj; l++){
339 >          int ioIndex = sd->getGlobalIntegrableObjectIndex();
340 >          // do one for the IO itself
341 >          os << prepareSiteLine(sd, ioIndex, 0);
342  
343 <          if (potatoes[which_node] + 2 >= MAXTAG) {
384 <            // The potato was going to exceed the maximum value,
385 <            // so wrap this processor potato back to 0:        
386 <
387 <            potatoes[which_node] = 0;          
388 <            MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0, MPI_COMM_WORLD);
343 >          if (sd->isRigidBody()) {
344              
345 +            RigidBody* rb = static_cast<RigidBody*>(sd);
346 +            int siteIndex = 0;
347 +            for (atom = rb->beginAtom(ai); atom != NULL;  
348 +                 atom = rb->nextAtom(ai)) {                                            
349 +              os << prepareSiteLine(atom, ioIndex, siteIndex);
350 +              siteIndex++;
351 +            }
352            }
353 +        }
354 +      }    
355 +      os << "    </SiteData>\n";
356 +    }
357 +    os << "  </Snapshot>\n";
358  
359 <          MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
360 <          myPotato, MPI_COMM_WORLD, &istatus);
359 >    os.flush();
360 > #else
361 >    //every node prepares the dump lines for integrable objects belong to itself
362 >    std::string buffer;
363 >    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
364  
395          atomTypeString = MPIatomTypeString;
365  
366 <          myPotato++;
366 >      for (sd = mol->beginIntegrableObject(ii); sd != NULL;
367 >           sd = mol->nextIntegrableObject(ii)) {        
368 >          buffer += prepareDumpLine(sd);
369 >      }
370 >    }
371 >    
372 >    const int masterNode = 0;
373 >    int nProc;
374 >    MPI_Comm_size(MPI_COMM_WORLD, &nProc);
375 >    if (worldRank == masterNode) {      
376 >      os << "  <Snapshot>\n";  
377 >      writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
378 >      os << "    <StuntDoubles>\n";
379 >        
380 >      os << buffer;
381  
382 <          MPI_Recv(atomData, 13, MPI_DOUBLE, which_node, myPotato, MPI_COMM_WORLD, &istatus);
400 <          myPotato++;
382 >      for (int i = 1; i < nProc; ++i) {
383  
384 <          MPI_Get_count(&istatus, MPI_DOUBLE, &msgLen);
384 >        // receive the length of the string buffer that was
385 >        // prepared by processor i
386  
387 <          if(msgLen  == 13)
388 <            isDirectional = 1;
389 <          else
390 <            isDirectional = 0;
391 <          
392 <          // If we've survived to here, format the line:
393 <            
394 <          if (!isDirectional) {
395 <        
396 <            sprintf( writeLine,
397 <                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
398 <                 atomTypeString,
399 <                 atomData[0],
400 <                 atomData[1],
401 <                 atomData[2],
402 <                 atomData[3],
403 <                 atomData[4],
404 <                 atomData[5]);
405 <        
406 <           strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
407 <        
408 <          }
409 <          else {
410 <        
411 <                sprintf( writeLine,
412 <                         "%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",
430 <                         atomTypeString,
431 <                         atomData[0],
432 <                         atomData[1],
433 <                         atomData[2],
434 <                         atomData[3],
435 <                         atomData[4],
436 <                         atomData[5],
437 <                         atomData[6],
438 <                         atomData[7],
439 <                         atomData[8],
440 <                         atomData[9],
441 <                         atomData[10],
442 <                         atomData[11],
443 <                         atomData[12]);
444 <            
445 <          }
446 <          
447 <          for(k = 0; k < outFile.size(); k++)
448 <            *outFile[k] << writeLine;            
387 >        MPI_Bcast(&i, 1, MPI_INT,masterNode,MPI_COMM_WORLD);
388 >        int recvLength;
389 >        MPI_Recv(&recvLength, 1, MPI_INT, i, 0, MPI_COMM_WORLD, &istatus);
390 >        char* recvBuffer = new char[recvLength];
391 >        if (recvBuffer == NULL) {
392 >        } else {
393 >          MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, &istatus);
394 >          os << recvBuffer;
395 >          delete [] recvBuffer;
396 >        }
397 >      }
398 >      os << "    </StuntDoubles>\n";
399 >      
400 >      os << "  </Snapshot>\n";
401 >      os.flush();
402 >    } else {
403 >      int sendBufferLength = buffer.size() + 1;
404 >      int myturn = 0;
405 >      for (int i = 1; i < nProc; ++i){
406 >        MPI_Bcast(&myturn,1, MPI_INT,masterNode,MPI_COMM_WORLD);
407 >        if (myturn == worldRank){
408 >          MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD);
409 >          MPI_Send((void *)buffer.c_str(), sendBufferLength, MPI_CHAR, masterNode, 0, MPI_COMM_WORLD);
410 >        }
411 >      }
412 >    }
413  
414 <        }// end for(int l =0)
451 <        potatoes[which_node] = myPotato;
414 > #endif // is_mpi
415  
416 <      }
454 <      else {
455 <        
456 <        haveError = 0;
457 <        
458 <            local_index = indexArray[currentIndex].first;        
416 >  }
417  
418 <        integrableObjects = (entry_plug->molecules[local_index]).getIntegrableObjects();
418 >  std::string DumpWriter::prepareDumpLine(StuntDouble* sd) {
419 >        
420 >    int index = sd->getGlobalIntegrableObjectIndex();
421 >    std::string type("pv");
422 >    std::string line;
423 >    char tempBuffer[4096];
424  
425 <        for(iter= integrableObjects.begin(); iter != integrableObjects.end(); ++iter){    
426 <                sd = *iter;
427 <            atomTypeString = sd->getType();
465 <            
466 <            sd->getPos(pos);
467 <            sd->getVel(vel);          
468 <          
469 <            atomData[0] = pos[0];
470 <            atomData[1] = pos[1];
471 <            atomData[2] = pos[2];
425 >    Vector3d pos;
426 >    Vector3d vel;
427 >    pos = sd->getPos();
428  
429 <            atomData[3] = vel[0];
430 <            atomData[4] = vel[1];
431 <            atomData[5] = vel[2];
432 <              
433 <            isDirectional = 0;
429 >    if (isinf(pos[0]) || isnan(pos[0]) ||
430 >        isinf(pos[1]) || isnan(pos[1]) ||
431 >        isinf(pos[2]) || isnan(pos[2]) ) {      
432 >      sprintf( painCave.errMsg,
433 >               "DumpWriter detected a numerical error writing the position"
434 >               " for object %d", index);      
435 >      painCave.isFatal = 1;
436 >      simError();
437 >    }
438  
439 <            if( sd->isDirectional() ){
439 >    vel = sd->getVel();        
440  
441 <              isDirectional = 1;
442 <                
443 <              sd->getQ( q );
444 <              sd->getJ( ji );
441 >    if (isinf(vel[0]) || isnan(vel[0]) ||
442 >        isinf(vel[1]) || isnan(vel[1]) ||
443 >        isinf(vel[2]) || isnan(vel[2]) ) {      
444 >      sprintf( painCave.errMsg,
445 >               "DumpWriter detected a numerical error writing the velocity"
446 >               " for object %d", index);      
447 >      painCave.isFatal = 1;
448 >      simError();
449 >    }
450  
451 <              for (int j = 0; j < 6 ; j++)
452 <                atomData[j] = atomData[j];            
453 <              
454 <              atomData[6] = q[0];
455 <              atomData[7] = q[1];
456 <              atomData[8] = q[2];
457 <              atomData[9] = q[3];
458 <              
459 <              atomData[10] = ji[0];
460 <              atomData[11] = ji[1];
461 <              atomData[12] = ji[2];
462 <            }
463 <            
464 <            // If we've survived to here, format the line:
465 <            
466 <            if (!isDirectional) {
467 <        
468 <              sprintf( writeLine,
469 <                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
470 <                 atomTypeString,
506 <                 atomData[0],
507 <                 atomData[1],
508 <                 atomData[2],
509 <                 atomData[3],
510 <                 atomData[4],
511 <                 atomData[5]);
512 <        
513 <             strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
514 <        
515 <            }
516 <            else {
517 <        
518 <                sprintf( writeLine,
519 <                         "%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",
520 <                         atomTypeString,
521 <                         atomData[0],
522 <                         atomData[1],
523 <                         atomData[2],
524 <                         atomData[3],
525 <                         atomData[4],
526 <                         atomData[5],
527 <                         atomData[6],
528 <                         atomData[7],
529 <                         atomData[8],
530 <                         atomData[9],
531 <                         atomData[10],
532 <                         atomData[11],
533 <                         atomData[12]);
534 <              
535 <            }
536 <            
537 <            for(k = 0; k < outFile.size(); k++)
538 <              *outFile[k] << writeLine;
539 <            
540 <            
541 <        }//end for(iter = integrableObject.begin())
542 <        
543 <      currentIndex++;
451 >    sprintf(tempBuffer, "%18.10g %18.10g %18.10g %13e %13e %13e",
452 >            pos[0], pos[1], pos[2],
453 >            vel[0], vel[1], vel[2]);                    
454 >    line += tempBuffer;
455 >
456 >    if (sd->isDirectional()) {
457 >      type += "qj";
458 >      Quat4d q;
459 >      Vector3d ji;
460 >      q = sd->getQ();
461 >
462 >      if (isinf(q[0]) || isnan(q[0]) ||
463 >          isinf(q[1]) || isnan(q[1]) ||
464 >          isinf(q[2]) || isnan(q[2]) ||
465 >          isinf(q[3]) || isnan(q[3]) ) {      
466 >        sprintf( painCave.errMsg,
467 >                 "DumpWriter detected a numerical error writing the quaternion"
468 >                 " for object %d", index);      
469 >        painCave.isFatal = 1;
470 >        simError();
471        }
472  
473 <    }//end for(i = 0; i < mpiSim->getNmol())
547 <    
548 <    for(k = 0; k < outFile.size(); k++)
549 <      outFile[k]->flush();
550 <    
551 <    sprintf( checkPointMsg,
552 <             "Sucessfully took a dump.\n");
553 <    
554 <    MPIcheckPoint();        
555 <    
556 <    delete[] potatoes;
557 <    
558 <  } else {
473 >      ji = sd->getJ();
474  
475 <    // worldRank != 0, so I'm a remote node.  
475 >      if (isinf(ji[0]) || isnan(ji[0]) ||
476 >          isinf(ji[1]) || isnan(ji[1]) ||
477 >          isinf(ji[2]) || isnan(ji[2]) ) {      
478 >        sprintf( painCave.errMsg,
479 >                 "DumpWriter detected a numerical error writing the angular"
480 >                 " momentum for object %d", index);      
481 >        painCave.isFatal = 1;
482 >        simError();
483 >      }
484  
485 <    // Set my magic potato to 0:
485 >      sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e %13e",
486 >              q[0], q[1], q[2], q[3],
487 >              ji[0], ji[1], ji[2]);
488 >      line += tempBuffer;
489 >    }
490  
491 <    myPotato = 0;
492 <    currentIndex = 0;
493 <    
494 <    for (i = 0 ; i < mpiSim->getNMolGlobal(); i++ ) {
491 >    if (needForceVector_) {
492 >      type += "f";
493 >      Vector3d frc = sd->getFrc();
494 >      if (isinf(frc[0]) || isnan(frc[0]) ||
495 >          isinf(frc[1]) || isnan(frc[1]) ||
496 >          isinf(frc[2]) || isnan(frc[2]) ) {      
497 >        sprintf( painCave.errMsg,
498 >                 "DumpWriter detected a numerical error writing the force"
499 >                 " for object %d", index);      
500 >        painCave.isFatal = 1;
501 >        simError();
502 >      }
503 >      sprintf(tempBuffer, " %13e %13e %13e",
504 >              frc[0], frc[1], frc[2]);
505 >      line += tempBuffer;
506        
507 <      // Am I the node which has this integrableObject?
508 <      
509 <      if (MolToProcMap[i] == worldRank) {
507 >      if (sd->isDirectional()) {
508 >        type += "t";
509 >        Vector3d trq = sd->getTrq();        
510 >        if (isinf(trq[0]) || isnan(trq[0]) ||
511 >            isinf(trq[1]) || isnan(trq[1]) ||
512 >            isinf(trq[2]) || isnan(trq[2]) ) {      
513 >          sprintf( painCave.errMsg,
514 >                   "DumpWriter detected a numerical error writing the torque"
515 >                   " for object %d", index);      
516 >          painCave.isFatal = 1;
517 >          simError();
518 >        }        
519 >        sprintf(tempBuffer, " %13e %13e %13e",
520 >                trq[0], trq[1], trq[2]);
521 >        line += tempBuffer;
522 >      }      
523 >    }
524  
525 +    sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str());
526 +    return std::string(tempBuffer);
527 +  }
528  
529 <        if (myPotato + 1 >= MAXTAG) {
530 <          
576 <          // The potato was going to exceed the maximum value,
577 <          // so wrap this processor potato back to 0 (and block until
578 <          // node 0 says we can go:
579 <          
580 <          MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
581 <          
582 <        }
529 >  std::string DumpWriter::prepareSiteLine(StuntDouble* sd, int ioIndex, int siteIndex) {
530 >        
531  
532 <          local_index = indexArray[currentIndex].first;        
533 <          integrableObjects = entry_plug->molecules[local_index].getIntegrableObjects();
534 <          
535 <          nCurObj = integrableObjects.size();
588 <                      
589 <          MPI_Send(&nCurObj, 1, MPI_INT, 0,
590 <                             myPotato, MPI_COMM_WORLD);
591 <          myPotato++;
532 >    std::string id;
533 >    std::string type;
534 >    std::string line;
535 >    char tempBuffer[4096];
536  
537 <          for( iter = integrableObjects.begin(); iter  != integrableObjects.end(); iter++){
538 <
539 <            if (myPotato + 2 >= MAXTAG) {
540 <          
541 <              // The potato was going to exceed the maximum value,
542 <              // so wrap this processor potato back to 0 (and block until
543 <              // node 0 says we can go:
600 <          
601 <              MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
537 >    if (sd->isRigidBody()) {
538 >      sprintf(tempBuffer, "%10d           ", ioIndex);
539 >      id = std::string(tempBuffer);
540 >    } else {
541 >      sprintf(tempBuffer, "%10d %10d", ioIndex, siteIndex);
542 >      id = std::string(tempBuffer);
543 >    }
544                
545 <            }
546 <            
547 <            sd = *iter;
548 <            
549 <            atomTypeString = sd->getType();
545 >    if (needFlucQ_) {
546 >      type += "cw";
547 >      RealType fqPos = sd->getFlucQPos();
548 >      if (isinf(fqPos) || isnan(fqPos) ) {      
549 >        sprintf( painCave.errMsg,
550 >                 "DumpWriter detected a numerical error writing the"
551 >                 " fluctuating charge for object %s", id.c_str());      
552 >        painCave.isFatal = 1;
553 >        simError();
554 >      }
555 >      sprintf(tempBuffer, " %13e ", fqPos);
556 >      line += tempBuffer;
557 >    
558 >      RealType fqVel = sd->getFlucQVel();
559 >      if (isinf(fqVel) || isnan(fqVel) ) {      
560 >        sprintf( painCave.errMsg,
561 >                 "DumpWriter detected a numerical error writing the"
562 >                 " fluctuating charge velocity for object %s", id.c_str());      
563 >        painCave.isFatal = 1;
564 >        simError();
565 >      }
566 >      sprintf(tempBuffer, " %13e ", fqVel);
567 >      line += tempBuffer;
568  
569 <            sd->getPos(pos);
570 <            sd->getVel(vel);
569 >      if (needForceVector_) {
570 >        type += "g";
571 >        RealType fqFrc = sd->getFlucQFrc();        
572 >        if (isinf(fqFrc) || isnan(fqFrc) ) {      
573 >          sprintf( painCave.errMsg,
574 >                   "DumpWriter detected a numerical error writing the"
575 >                   " fluctuating charge force for object %s", id.c_str());      
576 >          painCave.isFatal = 1;
577 >          simError();
578 >        }
579 >        sprintf(tempBuffer, " %13e ", fqFrc);        
580 >        line += tempBuffer;
581 >      }
582 >    }
583  
584 <            atomData[0] = pos[0];
585 <            atomData[1] = pos[1];
586 <            atomData[2] = pos[2];
584 >    if (needElectricField_) {
585 >      type += "e";
586 >      Vector3d eField= sd->getElectricField();
587 >      if (isinf(eField[0]) || isnan(eField[0]) ||
588 >          isinf(eField[1]) || isnan(eField[1]) ||
589 >          isinf(eField[2]) || isnan(eField[2]) ) {      
590 >        sprintf( painCave.errMsg,
591 >                 "DumpWriter detected a numerical error writing the electric"
592 >                 " field for object %s", id.c_str());      
593 >        painCave.isFatal = 1;
594 >        simError();
595 >      }
596 >      sprintf(tempBuffer, " %13e %13e %13e",
597 >              eField[0], eField[1], eField[2]);
598 >      line += tempBuffer;
599 >    }
600  
616            atomData[3] = vel[0];
617            atomData[4] = vel[1];
618            atomData[5] = vel[2];
619              
620            isDirectional = 0;
601  
602 <            if( sd->isDirectional() ){
602 >    if (needParticlePot_) {
603 >      type += "u";
604 >      RealType particlePot = sd->getParticlePot();
605 >      if (isinf(particlePot) || isnan(particlePot)) {      
606 >        sprintf( painCave.errMsg,
607 >                 "DumpWriter detected a numerical error writing the particle "
608 >                 " potential for object %s", id.c_str());      
609 >        painCave.isFatal = 1;
610 >        simError();
611 >      }
612 >      sprintf(tempBuffer, " %13e", particlePot);
613 >      line += tempBuffer;
614 >    }
615 >    
616  
617 <                isDirectional = 1;
618 <                
619 <                sd->getQ( q );
627 <                sd->getJ( ji );
628 <                
629 <                
630 <                atomData[6] = q[0];
631 <                atomData[7] = q[1];
632 <                atomData[8] = q[2];
633 <                atomData[9] = q[3];
634 <      
635 <                atomData[10] = ji[0];
636 <                atomData[11] = ji[1];
637 <                atomData[12] = ji[2];
638 <              }
617 >    sprintf(tempBuffer, "%s %7s %s\n", id.c_str(), type.c_str(), line.c_str());
618 >    return std::string(tempBuffer);
619 >  }
620  
621 <            
622 <            strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
621 >  void DumpWriter::writeDump() {
622 >    writeFrame(*dumpFile_);
623 >  }
624  
625 <            // null terminate the string before sending (just in case):
626 <            MPIatomTypeString[MINIBUFFERSIZE-1] = '\0';
625 >  void DumpWriter::writeEor() {
626 >    std::ostream* eorStream;
627 >    
628 > #ifdef IS_MPI
629 >    if (worldRank == 0) {
630 > #endif // is_mpi
631  
632 <            MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
647 <                             myPotato, MPI_COMM_WORLD);
648 <            
649 <            myPotato++;
650 <            
651 <            if (isDirectional) {
632 >      eorStream = createOStream(eorFilename_);
633  
634 <              MPI_Send(atomData, 13, MPI_DOUBLE, 0,
635 <                       myPotato, MPI_COMM_WORLD);
636 <              
656 <            } else {
634 > #ifdef IS_MPI
635 >    }
636 > #endif // is_mpi    
637  
638 <              MPI_Send(atomData, 6, MPI_DOUBLE, 0,
659 <                       myPotato, MPI_COMM_WORLD);
660 <            }
638 >    writeFrame(*eorStream);
639  
640 <            myPotato++;  
640 > #ifdef IS_MPI
641 >    if (worldRank == 0) {
642 > #endif // is_mpi
643 >      writeClosing(*eorStream);
644 >      delete eorStream;
645 > #ifdef IS_MPI
646 >    }
647 > #endif // is_mpi  
648  
649 <          }
649 >  }
650  
666          currentIndex++;    
667          
668        }
669      
670      }
651  
652 <    sprintf( checkPointMsg,
653 <             "Sucessfully took a dump.\n");
654 <    MPIcheckPoint();                
655 <    
652 >  void DumpWriter::writeDumpAndEor() {
653 >    std::vector<std::streambuf*> buffers;
654 >    std::ostream* eorStream;
655 > #ifdef IS_MPI
656 >    if (worldRank == 0) {
657 > #endif // is_mpi
658 >
659 >      buffers.push_back(dumpFile_->rdbuf());
660 >
661 >      eorStream = createOStream(eorFilename_);
662 >
663 >      buffers.push_back(eorStream->rdbuf());
664 >        
665 > #ifdef IS_MPI
666      }
667 + #endif // is_mpi    
668  
669 +    TeeBuf tbuf(buffers.begin(), buffers.end());
670 +    std::ostream os(&tbuf);
671  
672 <  
680 < #endif // is_mpi
681 < }
672 >    writeFrame(os);
673  
674   #ifdef IS_MPI
675 +    if (worldRank == 0) {
676 + #endif // is_mpi
677 +      writeClosing(*eorStream);
678 +      delete eorStream;
679 + #ifdef IS_MPI
680 +    }
681 + #endif // is_mpi  
682 +    
683 +  }
684  
685 < // a couple of functions to let us escape the write loop
685 >  std::ostream* DumpWriter::createOStream(const std::string& filename) {
686  
687 < void dWrite::DieDieDie( void ){
687 >    std::ostream* newOStream;
688 > #ifdef HAVE_ZLIB
689 >    if (needCompression_) {
690 >      newOStream = new ogzstream(filename.c_str());
691 >    } else {
692 >      newOStream = new std::ofstream(filename.c_str());
693 >    }
694 > #else
695 >    newOStream = new std::ofstream(filename.c_str());
696 > #endif
697 >    //write out MetaData first
698 >    (*newOStream) << "<OpenMD version=2>" << std::endl;
699 >    (*newOStream) << "  <MetaData>" << std::endl;
700 >    (*newOStream) << info_->getRawMetaData();
701 >    (*newOStream) << "  </MetaData>" << std::endl;
702 >    return newOStream;
703 >  }
704  
705 <  MPI_Finalize();
690 <  exit (0);
691 < }
705 >  void DumpWriter::writeClosing(std::ostream& os) {
706  
707 < #endif //is_mpi
707 >    os << "</OpenMD>\n";
708 >    os.flush();
709 >  }
710 >
711 > }//end namespace OpenMD

Comparing:
trunk/src/io/DumpWriter.cpp (property svn:keywords), Revision 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/development/src/io/DumpWriter.cpp (property svn:keywords), Revision 1769 by gezelter, Mon Jul 9 14:15:52 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines