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

Comparing branches/development/src/io/DumpWriter.cpp (file contents):
Revision 1714 by gezelter, Sat May 19 18:12:46 2012 UTC vs.
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 44 | Line 44
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 + #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 < #endif //is_mpi
59 > #endif
60  
61   using namespace std;
62   namespace OpenMD {
# Line 65 | Line 71 | namespace OpenMD {
71      needFlucQ_         = simParams->getOutputFluctuatingCharges();
72      needElectricField_ = simParams->getOutputElectricField();
73  
74 +    if (needParticlePot_ || needFlucQ_ || needElectricField_) {
75 +      doSiteData_ = true;
76 +    } else {
77 +      doSiteData_ = false;
78 +    }
79 +
80      createDumpFile_ = true;
81   #ifdef HAVE_LIBZ
82      if (needCompression_) {
# Line 108 | Line 120 | namespace OpenMD {
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_) {
# Line 151 | Line 169 | namespace OpenMD {
169      needFlucQ_         = simParams->getOutputFluctuatingCharges();
170      needElectricField_ = simParams->getOutputElectricField();
171  
172 +    if (needParticlePot_ || needFlucQ_ || needElectricField_) {
173 +      doSiteData_ = true;
174 +    } else {
175 +      doSiteData_ = false;
176 +    }
177 +
178   #ifdef HAVE_LIBZ
179      if (needCompression_) {
180        filename_ += ".gz";
# Line 239 | Line 263 | namespace OpenMD {
263              hmat(0, 2), hmat(1, 2), hmat(2, 2));
264      os << buffer;
265  
266 <    RealType chi = s->getChi();
267 <    RealType integralOfChiDt = s->getIntegralOfChiDt();
268 <    if (isinf(chi) || isnan(chi) ||
269 <        isinf(integralOfChiDt) || isnan(integralOfChiDt)) {      
266 >    pair<RealType, RealType> thermostat = s->getThermostat();
267 >
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", chi, integralOfChiDt);
275 >    sprintf(buffer, "  Thermostat: %.10g , %.10g\n", thermostat.first,
276 >            thermostat.second);
277      os << buffer;
278  
279      Mat3x3d eta;
280 <    eta = s->getEta();
280 >    eta = s->getBarostat();
281  
282      for (unsigned int i = 0; i < 3; i++) {
283        for (unsigned int j = 0; j < 3; j++) {
# Line 284 | Line 309 | namespace OpenMD {
309      StuntDouble* integrableObject;
310      SimInfo::MoleculeIterator mi;
311      Molecule::IntegrableObjectIterator ii;
312 +    RigidBody::AtomIterator ai;
313 +    Atom* atom;
314  
315   #ifndef IS_MPI
316      os << "  <Snapshot>\n";
# Line 301 | Line 328 | namespace OpenMD {
328        }
329      }    
330      os << "    </StuntDoubles>\n";
331 <    
331 >
332 >    if (doSiteData_) {
333 >      os << "    <SiteData>\n";
334 >      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
335 >              
336 >        for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;  
337 >           integrableObject = mol->nextIntegrableObject(ii)) {  
338 >
339 >          int ioIndex = integrableObject->getGlobalIntegrableObjectIndex();
340 >          // do one for the IO itself
341 >          os << prepareSiteLine(integrableObject, ioIndex, 0);
342 >
343 >          if (integrableObject->isRigidBody()) {
344 >            
345 >            RigidBody* rb = static_cast<RigidBody*>(integrableObject);
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      os.flush();
# Line 470 | Line 522 | namespace OpenMD {
522        }      
523      }
524  
525 <    if (needParticlePot_) {
526 <      type += "u";
527 <      RealType particlePot = integrableObject->getParticlePot();
528 <      if (isinf(particlePot) || isnan(particlePot)) {      
529 <        sprintf( painCave.errMsg,
530 <                 "DumpWriter detected a numerical error writing the particle "
531 <                 " potential for object %d", index);      
532 <        painCave.isFatal = 1;
533 <        simError();
534 <      }
535 <      sprintf(tempBuffer, " %13e", particlePot);
536 <      line += tempBuffer;
525 >    sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str());
526 >    return std::string(tempBuffer);
527 >  }
528 >
529 >  std::string DumpWriter::prepareSiteLine(StuntDouble* integrableObject, int ioIndex, int siteIndex) {
530 >        
531 >
532 >    std::string id;
533 >    std::string type;
534 >    std::string line;
535 >    char tempBuffer[4096];
536 >
537 >    if (integrableObject->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 <    
544 >              
545      if (needFlucQ_) {
546        type += "cw";
547        RealType fqPos = integrableObject->getFlucQPos();
548        if (isinf(fqPos) || isnan(fqPos) ) {      
549          sprintf( painCave.errMsg,
550                   "DumpWriter detected a numerical error writing the"
551 <                 " fluctuating charge for object %d", index);      
551 >                 " fluctuating charge for object %s", id.c_str());      
552          painCave.isFatal = 1;
553          simError();
554        }
# Line 501 | Line 559 | namespace OpenMD {
559        if (isinf(fqVel) || isnan(fqVel) ) {      
560          sprintf( painCave.errMsg,
561                   "DumpWriter detected a numerical error writing the"
562 <                 " fluctuating charge velocity for object %d", index);      
562 >                 " fluctuating charge velocity for object %s", id.c_str());      
563          painCave.isFatal = 1;
564          simError();
565        }
# Line 514 | Line 572 | namespace OpenMD {
572          if (isinf(fqFrc) || isnan(fqFrc) ) {      
573            sprintf( painCave.errMsg,
574                     "DumpWriter detected a numerical error writing the"
575 <                   " fluctuating charge force for object %d", index);      
575 >                   " fluctuating charge force for object %s", id.c_str());      
576            painCave.isFatal = 1;
577            simError();
578          }
# Line 531 | Line 589 | namespace OpenMD {
589            isinf(eField[2]) || isnan(eField[2]) ) {      
590          sprintf( painCave.errMsg,
591                   "DumpWriter detected a numerical error writing the electric"
592 <                 " field for object %d", index);      
592 >                 " field for object %s", id.c_str());      
593          painCave.isFatal = 1;
594          simError();
595        }
# Line 540 | Line 598 | namespace OpenMD {
598        line += tempBuffer;
599      }
600  
601 <    sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str());
601 >
602 >    if (needParticlePot_) {
603 >      type += "u";
604 >      RealType particlePot = integrableObject->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 >    sprintf(tempBuffer, "%s %7s %s\n", id.c_str(), type.c_str(), line.c_str());
618      return std::string(tempBuffer);
619    }
620  
# Line 611 | Line 685 | namespace OpenMD {
685    std::ostream* DumpWriter::createOStream(const std::string& filename) {
686  
687      std::ostream* newOStream;
688 < #ifdef HAVE_LIBZ
688 > #ifdef HAVE_ZLIB
689      if (needCompression_) {
690        newOStream = new ogzstream(filename.c_str());
691      } else {
# Line 621 | Line 695 | namespace OpenMD {
695      newOStream = new std::ofstream(filename.c_str());
696   #endif
697      //write out MetaData first
698 <    (*newOStream) << "<OpenMD version=1>" << std::endl;
698 >    (*newOStream) << "<OpenMD version=2>" << std::endl;
699      (*newOStream) << "  <MetaData>" << std::endl;
700      (*newOStream) << info_->getRawMetaData();
701      (*newOStream) << "  </MetaData>" << std::endl;

Diff Legend

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