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 619 by tim, Wed Sep 21 20:59:31 2005 UTC vs.
branches/development/src/io/DumpWriter.cpp (file contents), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 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 >    needParticlePot_ = simParams->getOutputParticlePotential();
64 >    createDumpFile_ = true;
65   #ifdef HAVE_LIBZ
66      if (needCompression_) {
67 <        filename_ += ".gz";
68 <        eorFilename_ += ".gz";
67 >      filename_ += ".gz";
68 >      eorFilename_ += ".gz";
69      }
70   #endif
71      
72   #ifdef IS_MPI
73  
74 <      if (worldRank == 0) {
74 >    if (worldRank == 0) {
75   #endif // is_mpi
76 +        
77 +      dumpFile_ = createOStream(filename_);
78  
79 +      if (!dumpFile_) {
80 +        sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
81 +                filename_.c_str());
82 +        painCave.isFatal = 1;
83 +        simError();
84 +      }
85  
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        }
82
86   #ifdef IS_MPI
87  
88 <      }
88 >    }
89  
87      sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n");
88      MPIcheckPoint();
89
90   #endif // is_mpi
91  
92 <    }
92 >  }
93  
94  
95    DumpWriter::DumpWriter(SimInfo* info, const std::string& filename)
# Line 99 | Line 99 | namespace oopse {
99      eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor";    
100  
101      needCompression_ = simParams->getCompressDumpFile();
102 <
102 >    needForceVector_ = simParams->getOutputForceVector();
103 >    createDumpFile_ = true;
104   #ifdef HAVE_LIBZ
105      if (needCompression_) {
106 <        filename_ += ".gz";
107 <        eorFilename_ += ".gz";
106 >      filename_ += ".gz";
107 >      eorFilename_ += ".gz";
108      }
109   #endif
110      
111   #ifdef IS_MPI
112  
113 <      if (worldRank == 0) {
113 >    if (worldRank == 0) {
114   #endif // is_mpi
115  
116 +      
117 +      dumpFile_ = createOStream(filename_);
118  
119 <        dumpFile_ = createOStream(filename_);
119 >      if (!dumpFile_) {
120 >        sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
121 >                filename_.c_str());
122 >        painCave.isFatal = 1;
123 >        simError();
124 >      }
125  
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
126   #ifdef IS_MPI
127  
128 <      }
128 >    }
129  
129      sprintf(checkPointMsg, "Sucessfully opened output file for dumping.\n");
130      MPIcheckPoint();
131
130   #endif // is_mpi
131  
132 +  }
133 +  
134 +  DumpWriter::DumpWriter(SimInfo* info, const std::string& filename, bool writeDumpFile)
135 +    : info_(info), filename_(filename){
136 +    
137 +    Globals* simParams = info->getSimParams();
138 +    eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor";    
139 +    
140 +    needCompression_ = simParams->getCompressDumpFile();
141 +    needForceVector_ = simParams->getOutputForceVector();
142 +    needParticlePot_ = simParams->getOutputParticlePotential();
143 +    
144 + #ifdef HAVE_LIBZ
145 +    if (needCompression_) {
146 +      filename_ += ".gz";
147 +      eorFilename_ += ".gz";
148      }
149 + #endif
150 +    
151 + #ifdef IS_MPI
152 +    
153 +    if (worldRank == 0) {
154 + #endif // is_mpi
155 +      
156 +      createDumpFile_ = writeDumpFile;
157 +      if (createDumpFile_) {
158 +        dumpFile_ = createOStream(filename_);
159 +      
160 +        if (!dumpFile_) {
161 +          sprintf(painCave.errMsg, "Could not open \"%s\" for dump output.\n",
162 +                  filename_.c_str());
163 +          painCave.isFatal = 1;
164 +          simError();
165 +        }
166 +      }
167 + #ifdef IS_MPI
168 +      
169 +    }
170  
171 +    
172 + #endif // is_mpi
173 +    
174 +  }
175 +
176    DumpWriter::~DumpWriter() {
177  
178   #ifdef IS_MPI
179  
180      if (worldRank == 0) {
181   #endif // is_mpi
182 <
183 <      delete dumpFile_;
184 <
182 >      if (createDumpFile_){
183 >        writeClosing(*dumpFile_);
184 >        delete dumpFile_;
185 >      }
186   #ifdef IS_MPI
187  
188      }
# Line 150 | Line 191 | namespace oopse {
191  
192    }
193  
194 <  void DumpWriter::writeCommentLine(std::ostream& os, Snapshot* s) {
194 >  void DumpWriter::writeFrameProperties(std::ostream& os, Snapshot* s) {
195  
196 <    double currentTime;
197 <    Mat3x3d hmat;
198 <    double chi;
199 <    double integralOfChiDt;
200 <    Mat3x3d eta;
196 >    char buffer[1024];
197 >
198 >    os << "    <FrameData>\n";
199 >
200 >    RealType currentTime = s->getTime();
201 >
202 >    if (isinf(currentTime) || isnan(currentTime)) {      
203 >      sprintf( painCave.errMsg,
204 >               "DumpWriter detected a numerical error writing the time");      
205 >      painCave.isFatal = 1;
206 >      simError();
207 >    }
208      
209 <    currentTime = s->getTime();
209 >    sprintf(buffer, "        Time: %.10g\n", currentTime);
210 >    os << buffer;
211 >
212 >    Mat3x3d hmat;
213      hmat = s->getHmat();
214 <    chi = s->getChi();
215 <    integralOfChiDt = s->getIntegralOfChiDt();
216 <    eta = s->getEta();
214 >
215 >    for (unsigned int i = 0; i < 3; i++) {
216 >      for (unsigned int j = 0; j < 3; j++) {
217 >        if (isinf(hmat(i,j)) || isnan(hmat(i,j))) {      
218 >          sprintf( painCave.errMsg,
219 >                   "DumpWriter detected a numerical error writing the box");
220 >          painCave.isFatal = 1;
221 >          simError();
222 >        }        
223 >      }
224 >    }
225      
226 <    os << currentTime << ";\t"
227 <       << hmat(0, 0) << "\t" << hmat(1, 0) << "\t" << hmat(2, 0) << ";\t"
228 <       << hmat(0, 1) << "\t" << hmat(1, 1) << "\t" << hmat(2, 1) << ";\t"
229 <       << hmat(0, 2) << "\t" << hmat(1, 2) << "\t" << hmat(2, 2) << ";\t";
226 >    sprintf(buffer, "        Hmat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
227 >            hmat(0, 0), hmat(1, 0), hmat(2, 0),
228 >            hmat(0, 1), hmat(1, 1), hmat(2, 1),
229 >            hmat(0, 2), hmat(1, 2), hmat(2, 2));
230 >    os << buffer;
231  
232 <    //write out additional parameters, such as chi and eta
232 >    RealType chi = s->getChi();
233 >    RealType integralOfChiDt = s->getIntegralOfChiDt();
234 >    if (isinf(chi) || isnan(chi) ||
235 >        isinf(integralOfChiDt) || isnan(integralOfChiDt)) {      
236 >      sprintf( painCave.errMsg,
237 >               "DumpWriter detected a numerical error writing the thermostat");
238 >      painCave.isFatal = 1;
239 >      simError();
240 >    }
241 >    sprintf(buffer, "  Thermostat: %.10g , %.10g\n", chi, integralOfChiDt);
242 >    os << buffer;
243  
244 <    os << chi << "\t" << integralOfChiDt << "\t;";
244 >    Mat3x3d eta;
245 >    eta = s->getEta();
246  
247 <    os << eta(0, 0) << "\t" << eta(1, 0) << "\t" << eta(2, 0) << ";\t"
248 <       << eta(0, 1) << "\t" << eta(1, 1) << "\t" << eta(2, 1) << ";\t"
249 <       << eta(0, 2) << "\t" << eta(1, 2) << "\t" << eta(2, 2) << ";";
250 <        
251 <    os << "\n";
247 >    for (unsigned int i = 0; i < 3; i++) {
248 >      for (unsigned int j = 0; j < 3; j++) {
249 >        if (isinf(eta(i,j)) || isnan(eta(i,j))) {      
250 >          sprintf( painCave.errMsg,
251 >                   "DumpWriter detected a numerical error writing the barostat");
252 >          painCave.isFatal = 1;
253 >          simError();
254 >        }        
255 >      }
256 >    }
257 >
258 >    sprintf(buffer, "    Barostat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
259 >            eta(0, 0), eta(1, 0), eta(2, 0),
260 >            eta(0, 1), eta(1, 1), eta(2, 1),
261 >            eta(0, 2), eta(1, 2), eta(2, 2));
262 >    os << buffer;
263 >
264 >    os << "    </FrameData>\n";
265    }
266  
267    void DumpWriter::writeFrame(std::ostream& os) {
184    const int BUFFERSIZE = 2000;
185    const int MINIBUFFERSIZE = 100;
268  
269 <    char tempBuffer[BUFFERSIZE];
270 <    char writeLine[BUFFERSIZE];
269 > #ifdef IS_MPI
270 >    MPI_Status istatus;
271 > #endif
272  
190    Quat4d q;
191    Vector3d ji;
192    Vector3d pos;
193    Vector3d vel;
194
273      Molecule* mol;
274      StuntDouble* integrableObject;
275      SimInfo::MoleculeIterator mi;
276      Molecule::IntegrableObjectIterator ii;
199  
200    int nTotObjects;    
201    nTotObjects = info_->getNGlobalIntegrableObjects();
277  
278   #ifndef IS_MPI
279 +    os << "  <Snapshot>\n";
280 +
281 +    writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
282  
283 +    os << "    <StuntDoubles>\n";
284 +    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
285  
286 <    os << nTotObjects << "\n";
287 <        
288 <    writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot());
286 >      
287 >      for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;  
288 >           integrableObject = mol->nextIntegrableObject(ii)) {  
289 >          os << prepareDumpLine(integrableObject);
290 >          
291 >      }
292 >    }    
293 >    os << "    </StuntDoubles>\n";
294 >    
295 >    os << "  </Snapshot>\n";
296  
297 +    os.flush();
298 + #else
299 +    //every node prepares the dump lines for integrable objects belong to itself
300 +    std::string buffer;
301      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
302  
303 +
304        for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
305 <           integrableObject = mol->nextIntegrableObject(ii)) {
306 <                
305 >           integrableObject = mol->nextIntegrableObject(ii)) {  
306 >          buffer += prepareDumpLine(integrableObject);
307 >      }
308 >    }
309 >    
310 >    const int masterNode = 0;
311 >    int nProc;
312 >    MPI_Comm_size(MPI_COMM_WORLD, &nProc);
313 >    if (worldRank == masterNode) {      
314 >      os << "  <Snapshot>\n";  
315 >      writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
316 >      os << "    <StuntDoubles>\n";
317 >        
318 >      os << buffer;
319  
320 <        pos = integrableObject->getPos();
217 <        vel = integrableObject->getVel();
320 >      for (int i = 1; i < nProc; ++i) {
321  
322 <        sprintf(tempBuffer, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
323 <                integrableObject->getType().c_str(),
221 <                pos[0], pos[1], pos[2],
222 <                vel[0], vel[1], vel[2]);
322 >        // receive the length of the string buffer that was
323 >        // prepared by processor i
324  
325 <        strcpy(writeLine, tempBuffer);
325 >        MPI_Bcast(&i, 1, MPI_INT,masterNode,MPI_COMM_WORLD);
326 >        int recvLength;
327 >        MPI_Recv(&recvLength, 1, MPI_INT, i, 0, MPI_COMM_WORLD, &istatus);
328 >        char* recvBuffer = new char[recvLength];
329 >        if (recvBuffer == NULL) {
330 >        } else {
331 >          MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, &istatus);
332 >          os << recvBuffer;
333 >          delete [] recvBuffer;
334 >        }
335 >      }
336 >      os << "    </StuntDoubles>\n";
337 >      
338 >      os << "  </Snapshot>\n";
339 >      os.flush();
340 >    } else {
341 >      int sendBufferLength = buffer.size() + 1;
342 >      int myturn = 0;
343 >      for (int i = 1; i < nProc; ++i){
344 >        MPI_Bcast(&myturn,1, MPI_INT,masterNode,MPI_COMM_WORLD);
345 >        if (myturn == worldRank){
346 >          MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD);
347 >          MPI_Send((void *)buffer.c_str(), sendBufferLength, MPI_CHAR, masterNode, 0, MPI_COMM_WORLD);
348 >        }
349 >      }
350 >    }
351  
352 <        if (integrableObject->isDirectional()) {
227 <          q = integrableObject->getQ();
228 <          ji = integrableObject->getJ();
352 > #endif // is_mpi
353  
354 <          sprintf(tempBuffer, "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
231 <                  q[0], q[1], q[2], q[3],
232 <                  ji[0], ji[1], ji[2]);
233 <          strcat(writeLine, tempBuffer);
234 <        } else {
235 <          strcat(writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n");
236 <        }
354 >  }
355  
356 <        os << writeLine;
356 >  std::string DumpWriter::prepareDumpLine(StuntDouble* integrableObject) {
357 >        
358 >    int index = integrableObject->getGlobalIntegrableObjectIndex();
359 >    std::string type("pv");
360 >    std::string line;
361 >    char tempBuffer[4096];
362  
363 <      }
363 >    Vector3d pos;
364 >    Vector3d vel;
365 >    pos = integrableObject->getPos();
366 >
367 >    if (isinf(pos[0]) || isnan(pos[0]) ||
368 >        isinf(pos[1]) || isnan(pos[1]) ||
369 >        isinf(pos[2]) || isnan(pos[2]) ) {      
370 >      sprintf( painCave.errMsg,
371 >               "DumpWriter detected a numerical error writing the position"
372 >               " for object %d", index);      
373 >      painCave.isFatal = 1;
374 >      simError();
375      }
376  
377 <    os.flush();
244 < #else // is_mpi
245 <    /*********************************************************************
246 <     * Documentation?  You want DOCUMENTATION?
247 <     *
248 <     * Why all the potatoes below?  
249 <     *
250 <     * To make a long story short, the original version of DumpWriter
251 <     * worked in the most inefficient way possible.  Node 0 would
252 <     * poke each of the node for an individual atom's formatted data
253 <     * as node 0 worked its way down the global index. This was particularly
254 <     * inefficient since the method blocked all processors at every atom
255 <     * (and did it twice!).
256 <     *
257 <     * An intermediate version of DumpWriter could be described from Node
258 <     * zero's perspective as follows:
259 <     *
260 <     *  1) Have 100 of your friends stand in a circle.
261 <     *  2) When you say go, have all of them start tossing potatoes at
262 <     *     you (one at a time).
263 <     *  3) Catch the potatoes.
264 <     *
265 <     * It was an improvement, but MPI has buffers and caches that could
266 <     * best be described in this analogy as "potato nets", so there's no
267 <     * need to block the processors atom-by-atom.
268 <     *
269 <     * This new and improved DumpWriter works in an even more efficient
270 <     * way:
271 <     *
272 <     *  1) Have 100 of your friend stand in a circle.
273 <     *  2) When you say go, have them start tossing 5-pound bags of
274 <     *     potatoes at you.
275 <     *  3) Once you've caught a friend's bag of potatoes,
276 <     *     toss them a spud to let them know they can toss another bag.
277 <     *
278 <     * How's THAT for documentation?
279 <     *
280 <     *********************************************************************/
281 <    const int masterNode = 0;
377 >    vel = integrableObject->getVel();          
378  
379 <    int * potatoes;
380 <    int myPotato;
381 <    int nProc;
382 <    int which_node;
383 <    double atomData[13];
384 <    int isDirectional;
385 <    char MPIatomTypeString[MINIBUFFERSIZE];
386 <    int msgLen; // the length of message actually recieved at master nodes
387 <    int haveError;
292 <    MPI_Status istatus;
293 <    int nCurObj;
294 <    
295 <    // code to find maximum tag value
296 <    int * tagub;
297 <    int flag;
298 <    int MAXTAG;
299 <    MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
379 >    if (isinf(vel[0]) || isnan(vel[0]) ||
380 >        isinf(vel[1]) || isnan(vel[1]) ||
381 >        isinf(vel[2]) || isnan(vel[2]) ) {      
382 >      sprintf( painCave.errMsg,
383 >               "DumpWriter detected a numerical error writing the velocity"
384 >               " for object %d", index);      
385 >      painCave.isFatal = 1;
386 >      simError();
387 >    }
388  
389 <    if (flag) {
390 <      MAXTAG = *tagub;
391 <    } else {
392 <      MAXTAG = 32767;
305 <    }
389 >    sprintf(tempBuffer, "%18.10g %18.10g %18.10g %13e %13e %13e",
390 >            pos[0], pos[1], pos[2],
391 >            vel[0], vel[1], vel[2]);                    
392 >    line += tempBuffer;
393  
394 <    if (worldRank == masterNode) { //master node (node 0) is responsible for writing the dump file
394 >    if (integrableObject->isDirectional()) {
395 >      type += "qj";
396 >      Quat4d q;
397 >      Vector3d ji;
398 >      q = integrableObject->getQ();
399  
400 <      // Node 0 needs a list of the magic potatoes for each processor;
400 >      if (isinf(q[0]) || isnan(q[0]) ||
401 >          isinf(q[1]) || isnan(q[1]) ||
402 >          isinf(q[2]) || isnan(q[2]) ||
403 >          isinf(q[3]) || isnan(q[3]) ) {      
404 >        sprintf( painCave.errMsg,
405 >                 "DumpWriter detected a numerical error writing the quaternion"
406 >                 " for object %d", index);      
407 >        painCave.isFatal = 1;
408 >        simError();
409 >      }
410  
411 <      MPI_Comm_size(MPI_COMM_WORLD, &nProc);
312 <      potatoes = new int[nProc];
411 >      ji = integrableObject->getJ();
412  
413 <      //write out the comment lines
414 <      for(int i = 0; i < nProc; i++) {
415 <        potatoes[i] = 0;
413 >      if (isinf(ji[0]) || isnan(ji[0]) ||
414 >          isinf(ji[1]) || isnan(ji[1]) ||
415 >          isinf(ji[2]) || isnan(ji[2]) ) {      
416 >        sprintf( painCave.errMsg,
417 >                 "DumpWriter detected a numerical error writing the angular"
418 >                 " momentum for object %d", index);      
419 >        painCave.isFatal = 1;
420 >        simError();
421        }
422  
423 +      sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e %13e",
424 +              q[0], q[1], q[2], q[3],
425 +              ji[0], ji[1], ji[2]);
426 +      line += tempBuffer;
427 +    }
428  
429 <      os << nTotObjects << "\n";
430 <      writeCommentLine(os, info_->getSnapshotManager()->getCurrentSnapshot());
429 >    if (needForceVector_) {
430 >      type += "f";
431 >      Vector3d frc;
432  
433 <      for(int i = 0; i < info_->getNGlobalMolecules(); i++) {
433 >      frc = integrableObject->getFrc();
434  
435 <        // Get the Node number which has this atom;
435 >      if (isinf(frc[0]) || isnan(frc[0]) ||
436 >          isinf(frc[1]) || isnan(frc[1]) ||
437 >          isinf(frc[2]) || isnan(frc[2]) ) {      
438 >        sprintf( painCave.errMsg,
439 >                 "DumpWriter detected a numerical error writing the force"
440 >                 " for object %d", index);      
441 >        painCave.isFatal = 1;
442 >        simError();
443 >      }
444 >      sprintf(tempBuffer, " %13e %13e %13e",
445 >              frc[0], frc[1], frc[2]);
446 >      line += tempBuffer;
447 >      
448 >      if (integrableObject->isDirectional()) {
449 >        type += "t";
450 >        Vector3d trq;
451 >        
452 >        trq = integrableObject->getTrq();
453 >        
454 >        if (isinf(trq[0]) || isnan(trq[0]) ||
455 >            isinf(trq[1]) || isnan(trq[1]) ||
456 >            isinf(trq[2]) || isnan(trq[2]) ) {      
457 >          sprintf( painCave.errMsg,
458 >                   "DumpWriter detected a numerical error writing the torque"
459 >                   " for object %d", index);      
460 >          painCave.isFatal = 1;
461 >          simError();
462 >        }
463 >        
464 >        sprintf(tempBuffer, " %13e %13e %13e",
465 >                trq[0], trq[1], trq[2]);
466 >        line += tempBuffer;
467 >      }      
468 >    }
469 >    if (needParticlePot_) {
470 >      type += "u";
471 >      RealType particlePot;
472  
473 <        which_node = info_->getMolToProc(i);
473 >      particlePot = integrableObject->getParticlePot();
474  
475 <        if (which_node != masterNode) { //current molecule is in slave node
476 <          if (potatoes[which_node] + 1 >= MAXTAG) {
477 <            // The potato was going to exceed the maximum value,
478 <            // so wrap this processor potato back to 0:        
479 <
480 <            potatoes[which_node] = 0;
335 <            MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0,
336 <                     MPI_COMM_WORLD);
337 <          }
338 <
339 <          myPotato = potatoes[which_node];
340 <
341 <          //recieve the number of integrableObject in current molecule
342 <          MPI_Recv(&nCurObj, 1, MPI_INT, which_node, myPotato,
343 <                   MPI_COMM_WORLD, &istatus);
344 <          myPotato++;
345 <
346 <          for(int l = 0; l < nCurObj; l++) {
347 <            if (potatoes[which_node] + 2 >= MAXTAG) {
348 <              // The potato was going to exceed the maximum value,
349 <              // so wrap this processor potato back to 0:        
350 <
351 <              potatoes[which_node] = 0;
352 <              MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node,
353 <                       0, MPI_COMM_WORLD);
354 <            }
355 <
356 <            MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR,
357 <                     which_node, myPotato, MPI_COMM_WORLD,
358 <                     &istatus);
359 <
360 <            myPotato++;
361 <
362 <            MPI_Recv(atomData, 13, MPI_DOUBLE, which_node, myPotato,
363 <                     MPI_COMM_WORLD, &istatus);
364 <            myPotato++;
365 <
366 <            MPI_Get_count(&istatus, MPI_DOUBLE, &msgLen);
367 <
368 <            if (msgLen == 13)
369 <              isDirectional = 1;
370 <            else
371 <              isDirectional = 0;
372 <
373 <            // If we've survived to here, format the line:
374 <
375 <            if (!isDirectional) {
376 <              sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
377 <                      MPIatomTypeString, atomData[0],
378 <                      atomData[1], atomData[2],
379 <                      atomData[3], atomData[4],
380 <                      atomData[5]);
381 <
382 <              strcat(writeLine,
383 <                     "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n");
384 <            } else {
385 <              sprintf(writeLine,
386 <                      "%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",
387 <                      MPIatomTypeString,
388 <                      atomData[0],
389 <                      atomData[1],
390 <                      atomData[2],
391 <                      atomData[3],
392 <                      atomData[4],
393 <                      atomData[5],
394 <                      atomData[6],
395 <                      atomData[7],
396 <                      atomData[8],
397 <                      atomData[9],
398 <                      atomData[10],
399 <                      atomData[11],
400 <                      atomData[12]);
401 <            }
402 <
403 <            os << writeLine;
404 <
405 <          } // end for(int l =0)
406 <
407 <          potatoes[which_node] = myPotato;
408 <        } else { //master node has current molecule
409 <
410 <          mol = info_->getMoleculeByGlobalIndex(i);
411 <
412 <          if (mol == NULL) {
413 <            sprintf(painCave.errMsg, "Molecule not found on node %d!", worldRank);
414 <            painCave.isFatal = 1;
415 <            simError();
416 <          }
417 <                
418 <          for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
419 <               integrableObject = mol->nextIntegrableObject(ii)) {      
420 <
421 <            pos = integrableObject->getPos();
422 <            vel = integrableObject->getVel();
423 <
424 <            atomData[0] = pos[0];
425 <            atomData[1] = pos[1];
426 <            atomData[2] = pos[2];
427 <
428 <            atomData[3] = vel[0];
429 <            atomData[4] = vel[1];
430 <            atomData[5] = vel[2];
431 <
432 <            isDirectional = 0;
433 <
434 <            if (integrableObject->isDirectional()) {
435 <              isDirectional = 1;
436 <
437 <              q = integrableObject->getQ();
438 <              ji = integrableObject->getJ();
439 <
440 <              for(int j = 0; j < 6; j++) {
441 <                atomData[j] = atomData[j];
442 <              }
443 <
444 <              atomData[6] = q[0];
445 <              atomData[7] = q[1];
446 <              atomData[8] = q[2];
447 <              atomData[9] = q[3];
448 <
449 <              atomData[10] = ji[0];
450 <              atomData[11] = ji[1];
451 <              atomData[12] = ji[2];
452 <            }
453 <
454 <            // If we've survived to here, format the line:
455 <
456 <            if (!isDirectional) {
457 <              sprintf(writeLine, "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
458 <                      integrableObject->getType().c_str(), atomData[0],
459 <                      atomData[1], atomData[2],
460 <                      atomData[3], atomData[4],
461 <                      atomData[5]);
462 <
463 <              strcat(writeLine,
464 <                     "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n");
465 <            } else {
466 <              sprintf(writeLine,
467 <                      "%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",
468 <                      integrableObject->getType().c_str(),
469 <                      atomData[0],
470 <                      atomData[1],
471 <                      atomData[2],
472 <                      atomData[3],
473 <                      atomData[4],
474 <                      atomData[5],
475 <                      atomData[6],
476 <                      atomData[7],
477 <                      atomData[8],
478 <                      atomData[9],
479 <                      atomData[10],
480 <                      atomData[11],
481 <                      atomData[12]);
482 <            }
483 <
484 <
485 <            os << writeLine;
486 <
487 <          } //end for(iter = integrableObject.begin())
488 <        }
489 <      } //end for(i = 0; i < mpiSim->getNmol())
490 <
491 <      os.flush();
492 <        
493 <      sprintf(checkPointMsg, "Sucessfully took a dump.\n");
494 <      MPIcheckPoint();
495 <
496 <      delete [] potatoes;
497 <    } else {
498 <
499 <      // worldRank != 0, so I'm a remote node.  
500 <
501 <      // Set my magic potato to 0:
502 <
503 <      myPotato = 0;
504 <
505 <      for(int i = 0; i < info_->getNGlobalMolecules(); i++) {
506 <
507 <        // Am I the node which has this integrableObject?
508 <        int whichNode = info_->getMolToProc(i);
509 <        if (whichNode == worldRank) {
510 <          if (myPotato + 1 >= MAXTAG) {
511 <
512 <            // The potato was going to exceed the maximum value,
513 <            // so wrap this processor potato back to 0 (and block until
514 <            // node 0 says we can go:
515 <
516 <            MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD,
517 <                     &istatus);
518 <          }
519 <
520 <          mol = info_->getMoleculeByGlobalIndex(i);
521 <
522 <                
523 <          nCurObj = mol->getNIntegrableObjects();
524 <
525 <          MPI_Send(&nCurObj, 1, MPI_INT, 0, myPotato, MPI_COMM_WORLD);
526 <          myPotato++;
527 <
528 <          for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
529 <               integrableObject = mol->nextIntegrableObject(ii)) {
530 <
531 <            if (myPotato + 2 >= MAXTAG) {
532 <
533 <              // The potato was going to exceed the maximum value,
534 <              // so wrap this processor potato back to 0 (and block until
535 <              // node 0 says we can go:
536 <
537 <              MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD,
538 <                       &istatus);
539 <            }
540 <
541 <            pos = integrableObject->getPos();
542 <            vel = integrableObject->getVel();
543 <
544 <            atomData[0] = pos[0];
545 <            atomData[1] = pos[1];
546 <            atomData[2] = pos[2];
547 <
548 <            atomData[3] = vel[0];
549 <            atomData[4] = vel[1];
550 <            atomData[5] = vel[2];
551 <
552 <            isDirectional = 0;
553 <
554 <            if (integrableObject->isDirectional()) {
555 <              isDirectional = 1;
556 <
557 <              q = integrableObject->getQ();
558 <              ji = integrableObject->getJ();
559 <
560 <              atomData[6] = q[0];
561 <              atomData[7] = q[1];
562 <              atomData[8] = q[2];
563 <              atomData[9] = q[3];
564 <
565 <              atomData[10] = ji[0];
566 <              atomData[11] = ji[1];
567 <              atomData[12] = ji[2];
568 <            }
569 <
570 <            strncpy(MPIatomTypeString, integrableObject->getType().c_str(), MINIBUFFERSIZE);
571 <
572 <            // null terminate the  std::string before sending (just in case):
573 <            MPIatomTypeString[MINIBUFFERSIZE - 1] = '\0';
574 <
575 <            MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
576 <                     myPotato, MPI_COMM_WORLD);
577 <
578 <            myPotato++;
579 <
580 <            if (isDirectional) {
581 <              MPI_Send(atomData, 13, MPI_DOUBLE, 0, myPotato,
582 <                       MPI_COMM_WORLD);
583 <            } else {
584 <              MPI_Send(atomData, 6, MPI_DOUBLE, 0, myPotato,
585 <                       MPI_COMM_WORLD);
586 <            }
587 <
588 <            myPotato++;
589 <          }
590 <                    
591 <        }
592 <            
475 >      if (isinf(particlePot) || isnan(particlePot)) {      
476 >        sprintf( painCave.errMsg,
477 >                 "DumpWriter detected a numerical error writing the particle "
478 >                 " potential for object %d", index);      
479 >        painCave.isFatal = 1;
480 >        simError();
481        }
482 <      sprintf(checkPointMsg, "Sucessfully took a dump.\n");
483 <      MPIcheckPoint();
482 >      sprintf(tempBuffer, " %13e", particlePot);
483 >      line += tempBuffer;
484      }
485 <
486 < #endif // is_mpi
487 <
485 >    
486 >    sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str());
487 >    return std::string(tempBuffer);
488    }
489  
490    void DumpWriter::writeDump() {
# Line 621 | Line 509 | namespace oopse {
509   #ifdef IS_MPI
510      if (worldRank == 0) {
511   #endif // is_mpi
512 <    delete eorStream;
513 <
512 >      writeClosing(*eorStream);
513 >      delete eorStream;
514   #ifdef IS_MPI
515      }
516   #endif // is_mpi  
# Line 655 | Line 543 | namespace oopse {
543   #ifdef IS_MPI
544      if (worldRank == 0) {
545   #endif // is_mpi
546 <    delete eorStream;
547 <
546 >      writeClosing(*eorStream);
547 >      delete eorStream;
548   #ifdef IS_MPI
549      }
550   #endif // is_mpi  
551      
552    }
553  
554 < std::ostream* DumpWriter::createOStream(const std::string& filename) {
554 >  std::ostream* DumpWriter::createOStream(const std::string& filename) {
555  
556      std::ostream* newOStream;
557   #ifdef HAVE_LIBZ
558      if (needCompression_) {
559 <        newOStream = new ogzstream(filename.c_str());
559 >      newOStream = new ogzstream(filename.c_str());
560      } else {
561 <        newOStream = new std::ofstream(filename.c_str());
561 >      newOStream = new std::ofstream(filename.c_str());
562      }
563   #else
564      newOStream = new std::ofstream(filename.c_str());
565   #endif
566 +    //write out MetaData first
567 +    (*newOStream) << "<OpenMD version=1>" << std::endl;
568 +    (*newOStream) << "  <MetaData>" << std::endl;
569 +    (*newOStream) << info_->getRawMetaData();
570 +    (*newOStream) << "  </MetaData>" << std::endl;
571      return newOStream;
572 < }
572 >  }
573  
574 < }//end namespace oopse
574 >  void DumpWriter::writeClosing(std::ostream& os) {
575 >
576 >    os << "</OpenMD>\n";
577 >    os.flush();
578 >  }
579 >
580 > }//end namespace OpenMD

Comparing:
trunk/src/io/DumpWriter.cpp (property svn:keywords), Revision 619 by tim, Wed Sep 21 20:59:31 2005 UTC vs.
branches/development/src/io/DumpWriter.cpp (property svn:keywords), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines