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 1025 by gezelter, Wed Aug 30 20:33:44 2006 UTC vs.
branches/development/src/io/DumpWriter.cpp (file contents), Revision 1711 by gezelter, Sat May 19 02:58:35 2012 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]  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"
# Line 46 | Line 47
47   #include "io/gzstream.hpp"
48   #include "io/Globals.hpp"
49  
50 +
51   #ifdef IS_MPI
52   #include <mpi.h>
53   #endif //is_mpi
54  
55 < namespace oopse {
55 > using namespace std;
56 > namespace OpenMD {
57  
58    DumpWriter::DumpWriter(SimInfo* info)
59      : info_(info), filename_(info->getDumpFileName()), eorFilename_(info->getFinalConfigFileName()){
# Line 58 | Line 61 | namespace oopse {
61      Globals* simParams = info->getSimParams();
62      needCompression_ = simParams->getCompressDumpFile();
63      needForceVector_ = simParams->getOutputForceVector();
64 +    needParticlePot_ = simParams->getOutputParticlePotential();
65 +    cerr << "DW npp = " << needParticlePot_ << "\n";
66      createDumpFile_ = true;
67   #ifdef HAVE_LIBZ
68      if (needCompression_) {
# Line 136 | Line 141 | namespace oopse {
141      
142      needCompression_ = simParams->getCompressDumpFile();
143      needForceVector_ = simParams->getOutputForceVector();
144 +    needParticlePot_ = simParams->getOutputParticlePotential();
145      
146   #ifdef HAVE_LIBZ
147      if (needCompression_) {
# Line 194 | Line 200 | namespace oopse {
200      os << "    <FrameData>\n";
201  
202      RealType currentTime = s->getTime();
203 +
204 +    if (isinf(currentTime) || isnan(currentTime)) {      
205 +      sprintf( painCave.errMsg,
206 +               "DumpWriter detected a numerical error writing the time");      
207 +      painCave.isFatal = 1;
208 +      simError();
209 +    }
210 +    
211      sprintf(buffer, "        Time: %.10g\n", currentTime);
212      os << buffer;
213  
214      Mat3x3d hmat;
215      hmat = s->getHmat();
216 +
217 +    for (unsigned int i = 0; i < 3; i++) {
218 +      for (unsigned int j = 0; j < 3; j++) {
219 +        if (isinf(hmat(i,j)) || isnan(hmat(i,j))) {      
220 +          sprintf( painCave.errMsg,
221 +                   "DumpWriter detected a numerical error writing the box");
222 +          painCave.isFatal = 1;
223 +          simError();
224 +        }        
225 +      }
226 +    }
227 +    
228      sprintf(buffer, "        Hmat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
229              hmat(0, 0), hmat(1, 0), hmat(2, 0),
230              hmat(0, 1), hmat(1, 1), hmat(2, 1),
# Line 207 | Line 233 | namespace oopse {
233  
234      RealType chi = s->getChi();
235      RealType integralOfChiDt = s->getIntegralOfChiDt();
236 +    if (isinf(chi) || isnan(chi) ||
237 +        isinf(integralOfChiDt) || isnan(integralOfChiDt)) {      
238 +      sprintf( painCave.errMsg,
239 +               "DumpWriter detected a numerical error writing the thermostat");
240 +      painCave.isFatal = 1;
241 +      simError();
242 +    }
243      sprintf(buffer, "  Thermostat: %.10g , %.10g\n", chi, integralOfChiDt);
244      os << buffer;
245  
246      Mat3x3d eta;
247      eta = s->getEta();
248 +
249 +    for (unsigned int i = 0; i < 3; i++) {
250 +      for (unsigned int j = 0; j < 3; j++) {
251 +        if (isinf(eta(i,j)) || isnan(eta(i,j))) {      
252 +          sprintf( painCave.errMsg,
253 +                   "DumpWriter detected a numerical error writing the barostat");
254 +          painCave.isFatal = 1;
255 +          simError();
256 +        }        
257 +      }
258 +    }
259 +
260      sprintf(buffer, "    Barostat: {{ %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }, { %.10g, %.10g, %.10g }}\n",
261              eta(0, 0), eta(1, 0), eta(2, 0),
262              eta(0, 1), eta(1, 1), eta(2, 1),
# Line 240 | Line 285 | namespace oopse {
285      os << "    <StuntDoubles>\n";
286      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
287  
288 <      for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
288 >      
289 >      for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;  
290             integrableObject = mol->nextIntegrableObject(ii)) {  
291 <        os << prepareDumpLine(integrableObject);
292 <
291 >          os << prepareDumpLine(integrableObject);
292 >          
293        }
294      }    
295      os << "    </StuntDoubles>\n";
296 <
296 >    
297      os << "  </Snapshot>\n";
298  
299      os.flush();
# Line 255 | Line 301 | namespace oopse {
301      //every node prepares the dump lines for integrable objects belong to itself
302      std::string buffer;
303      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
304 <      
304 >
305 >
306        for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
307             integrableObject = mol->nextIntegrableObject(ii)) {  
308 <        buffer += prepareDumpLine(integrableObject);
308 >          buffer += prepareDumpLine(integrableObject);
309        }
310      }
311      
312      const int masterNode = 0;
313 <
313 >    int nProc;
314 >    MPI_Comm_size(MPI_COMM_WORLD, &nProc);
315      if (worldRank == masterNode) {      
316        os << "  <Snapshot>\n";  
317        writeFrameProperties(os, info_->getSnapshotManager()->getCurrentSnapshot());
# Line 271 | Line 319 | namespace oopse {
319          
320        os << buffer;
321  
274      int nProc;
275      MPI_Comm_size(MPI_COMM_WORLD, &nProc);
322        for (int i = 1; i < nProc; ++i) {
323  
324          // receive the length of the string buffer that was
325          // prepared by processor i
326  
327 +        MPI_Bcast(&i, 1, MPI_INT,masterNode,MPI_COMM_WORLD);
328          int recvLength;
329          MPI_Recv(&recvLength, 1, MPI_INT, i, 0, MPI_COMM_WORLD, &istatus);
330          char* recvBuffer = new char[recvLength];
# Line 285 | Line 332 | namespace oopse {
332          } else {
333            MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, &istatus);
334            os << recvBuffer;
335 <          delete recvBuffer;
335 >          delete [] recvBuffer;
336          }
337        }
338        os << "    </StuntDoubles>\n";
# Line 294 | Line 341 | namespace oopse {
341        os.flush();
342      } else {
343        int sendBufferLength = buffer.size() + 1;
344 <      MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD);
345 <      MPI_Send((void *)buffer.c_str(), sendBufferLength, MPI_CHAR, masterNode, 0, MPI_COMM_WORLD);
344 >      int myturn = 0;
345 >      for (int i = 1; i < nProc; ++i){
346 >        MPI_Bcast(&myturn,1, MPI_INT,masterNode,MPI_COMM_WORLD);
347 >        if (myturn == worldRank){
348 >          MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD);
349 >          MPI_Send((void *)buffer.c_str(), sendBufferLength, MPI_CHAR, masterNode, 0, MPI_COMM_WORLD);
350 >        }
351 >      }
352      }
353  
354   #endif // is_mpi
# Line 312 | Line 365 | namespace oopse {
365      Vector3d pos;
366      Vector3d vel;
367      pos = integrableObject->getPos();
368 +
369 +    if (isinf(pos[0]) || isnan(pos[0]) ||
370 +        isinf(pos[1]) || isnan(pos[1]) ||
371 +        isinf(pos[2]) || isnan(pos[2]) ) {      
372 +      sprintf( painCave.errMsg,
373 +               "DumpWriter detected a numerical error writing the position"
374 +               " for object %d", index);      
375 +      painCave.isFatal = 1;
376 +      simError();
377 +    }
378 +
379      vel = integrableObject->getVel();          
380 +
381 +    if (isinf(vel[0]) || isnan(vel[0]) ||
382 +        isinf(vel[1]) || isnan(vel[1]) ||
383 +        isinf(vel[2]) || isnan(vel[2]) ) {      
384 +      sprintf( painCave.errMsg,
385 +               "DumpWriter detected a numerical error writing the velocity"
386 +               " for object %d", index);      
387 +      painCave.isFatal = 1;
388 +      simError();
389 +    }
390 +
391      sprintf(tempBuffer, "%18.10g %18.10g %18.10g %13e %13e %13e",
392              pos[0], pos[1], pos[2],
393              vel[0], vel[1], vel[2]);                    
# Line 323 | Line 398 | namespace oopse {
398        Quat4d q;
399        Vector3d ji;
400        q = integrableObject->getQ();
401 +
402 +      if (isinf(q[0]) || isnan(q[0]) ||
403 +          isinf(q[1]) || isnan(q[1]) ||
404 +          isinf(q[2]) || isnan(q[2]) ||
405 +          isinf(q[3]) || isnan(q[3]) ) {      
406 +        sprintf( painCave.errMsg,
407 +                 "DumpWriter detected a numerical error writing the quaternion"
408 +                 " for object %d", index);      
409 +        painCave.isFatal = 1;
410 +        simError();
411 +      }
412 +
413        ji = integrableObject->getJ();
414 +
415 +      if (isinf(ji[0]) || isnan(ji[0]) ||
416 +          isinf(ji[1]) || isnan(ji[1]) ||
417 +          isinf(ji[2]) || isnan(ji[2]) ) {      
418 +        sprintf( painCave.errMsg,
419 +                 "DumpWriter detected a numerical error writing the angular"
420 +                 " momentum for object %d", index);      
421 +        painCave.isFatal = 1;
422 +        simError();
423 +      }
424 +
425        sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e %13e",
426                q[0], q[1], q[2], q[3],
427                ji[0], ji[1], ji[2]);
# Line 331 | Line 429 | namespace oopse {
429      }
430  
431      if (needForceVector_) {
432 <      type += "ft";
432 >      type += "f";
433        Vector3d frc;
434 <      Vector3d trq;
434 >
435        frc = integrableObject->getFrc();
436 <      trq = integrableObject->getTrq();
437 <              
438 <      sprintf(tempBuffer, " %13e %13e %13e %13e %13e %13e",
439 <              frc[0], frc[1], frc[2],
440 <              trq[0], trq[1], trq[2]);
436 >
437 >      if (isinf(frc[0]) || isnan(frc[0]) ||
438 >          isinf(frc[1]) || isnan(frc[1]) ||
439 >          isinf(frc[2]) || isnan(frc[2]) ) {      
440 >        sprintf( painCave.errMsg,
441 >                 "DumpWriter detected a numerical error writing the force"
442 >                 " for object %d", index);      
443 >        painCave.isFatal = 1;
444 >        simError();
445 >      }
446 >      sprintf(tempBuffer, " %13e %13e %13e",
447 >              frc[0], frc[1], frc[2]);
448        line += tempBuffer;
449 +      
450 +      if (integrableObject->isDirectional()) {
451 +        type += "t";
452 +        Vector3d trq;
453 +        
454 +        trq = integrableObject->getTrq();
455 +        
456 +        if (isinf(trq[0]) || isnan(trq[0]) ||
457 +            isinf(trq[1]) || isnan(trq[1]) ||
458 +            isinf(trq[2]) || isnan(trq[2]) ) {      
459 +          sprintf( painCave.errMsg,
460 +                   "DumpWriter detected a numerical error writing the torque"
461 +                   " for object %d", index);      
462 +          painCave.isFatal = 1;
463 +          simError();
464 +        }
465 +        
466 +        sprintf(tempBuffer, " %13e %13e %13e",
467 +                trq[0], trq[1], trq[2]);
468 +        line += tempBuffer;
469 +      }      
470      }
471 <        
471 >    if (needParticlePot_) {
472 >      type += "u";
473 >      RealType particlePot;
474 >
475 >      particlePot = integrableObject->getParticlePot();
476 >
477 >      if (isinf(particlePot) || isnan(particlePot)) {      
478 >        sprintf( painCave.errMsg,
479 >                 "DumpWriter detected a numerical error writing the particle "
480 >                 " potential for object %d", index);      
481 >        painCave.isFatal = 1;
482 >        simError();
483 >      }
484 >      sprintf(tempBuffer, " %13e", particlePot);
485 >      line += tempBuffer;
486 >    }
487 >    
488      sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str());
489      return std::string(tempBuffer);
490    }
# Line 424 | Line 566 | namespace oopse {
566      newOStream = new std::ofstream(filename.c_str());
567   #endif
568      //write out MetaData first
569 <    (*newOStream) << "<OOPSE version=4>" << std::endl;
569 >    (*newOStream) << "<OpenMD version=1>" << std::endl;
570      (*newOStream) << "  <MetaData>" << std::endl;
571      (*newOStream) << info_->getRawMetaData();
572      (*newOStream) << "  </MetaData>" << std::endl;
# Line 433 | Line 575 | namespace oopse {
575  
576    void DumpWriter::writeClosing(std::ostream& os) {
577  
578 <    os << "</OOPSE>\n";
578 >    os << "</OpenMD>\n";
579      os.flush();
580    }
581  
582 < }//end namespace oopse
582 > }//end namespace OpenMD

Comparing:
trunk/src/io/DumpWriter.cpp (property svn:keywords), Revision 1025 by gezelter, Wed Aug 30 20:33:44 2006 UTC vs.
branches/development/src/io/DumpWriter.cpp (property svn:keywords), Revision 1711 by gezelter, Sat May 19 02:58:35 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines