--- branches/development/src/io/DumpWriter.cpp 2011/11/22 20:38:56 1665 +++ branches/development/src/io/DumpWriter.cpp 2012/07/03 18:32:27 1764 @@ -50,7 +50,7 @@ #ifdef IS_MPI #include -#endif //is_mpi +#endif using namespace std; namespace OpenMD { @@ -59,9 +59,18 @@ namespace OpenMD { : info_(info), filename_(info->getDumpFileName()), eorFilename_(info->getFinalConfigFileName()){ Globals* simParams = info->getSimParams(); - needCompression_ = simParams->getCompressDumpFile(); - needForceVector_ = simParams->getOutputForceVector(); - needParticlePot_ = simParams->getOutputParticlePotential(); + needCompression_ = simParams->getCompressDumpFile(); + needForceVector_ = simParams->getOutputForceVector(); + needParticlePot_ = simParams->getOutputParticlePotential(); + needFlucQ_ = simParams->getOutputFluctuatingCharges(); + needElectricField_ = simParams->getOutputElectricField(); + + if (needParticlePot_ || needFlucQ_ || needElectricField_) { + doSiteData_ = true; + } else { + doSiteData_ = false; + } + createDumpFile_ = true; #ifdef HAVE_LIBZ if (needCompression_) { @@ -99,8 +108,18 @@ namespace OpenMD { Globals* simParams = info->getSimParams(); eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor"; - needCompression_ = simParams->getCompressDumpFile(); - needForceVector_ = simParams->getOutputForceVector(); + needCompression_ = simParams->getCompressDumpFile(); + needForceVector_ = simParams->getOutputForceVector(); + needParticlePot_ = simParams->getOutputParticlePotential(); + needFlucQ_ = simParams->getOutputFluctuatingCharges(); + needElectricField_ = simParams->getOutputElectricField(); + + if (needParticlePot_ || needFlucQ_ || needElectricField_) { + doSiteData_ = true; + } else { + doSiteData_ = false; + } + createDumpFile_ = true; #ifdef HAVE_LIBZ if (needCompression_) { @@ -138,10 +157,18 @@ namespace OpenMD { Globals* simParams = info->getSimParams(); eorFilename_ = filename_.substr(0, filename_.rfind(".")) + ".eor"; - needCompression_ = simParams->getCompressDumpFile(); - needForceVector_ = simParams->getOutputForceVector(); - needParticlePot_ = simParams->getOutputParticlePotential(); - + needCompression_ = simParams->getCompressDumpFile(); + needForceVector_ = simParams->getOutputForceVector(); + needParticlePot_ = simParams->getOutputParticlePotential(); + needFlucQ_ = simParams->getOutputFluctuatingCharges(); + needElectricField_ = simParams->getOutputElectricField(); + + if (needParticlePot_ || needFlucQ_ || needElectricField_) { + doSiteData_ = true; + } else { + doSiteData_ = false; + } + #ifdef HAVE_LIBZ if (needCompression_) { filename_ += ".gz"; @@ -230,20 +257,21 @@ namespace OpenMD { hmat(0, 2), hmat(1, 2), hmat(2, 2)); os << buffer; - RealType chi = s->getChi(); - RealType integralOfChiDt = s->getIntegralOfChiDt(); - if (isinf(chi) || isnan(chi) || - isinf(integralOfChiDt) || isnan(integralOfChiDt)) { + pair thermostat = s->getThermostat(); + + if (isinf(thermostat.first) || isnan(thermostat.first) || + isinf(thermostat.second) || isnan(thermostat.second)) { sprintf( painCave.errMsg, "DumpWriter detected a numerical error writing the thermostat"); painCave.isFatal = 1; simError(); } - sprintf(buffer, " Thermostat: %.10g , %.10g\n", chi, integralOfChiDt); + sprintf(buffer, " Thermostat: %.10g , %.10g\n", thermostat.first, + thermostat.second); os << buffer; Mat3x3d eta; - eta = s->getEta(); + eta = s->getBarostat(); for (unsigned int i = 0; i < 3; i++) { for (unsigned int j = 0; j < 3; j++) { @@ -275,6 +303,8 @@ namespace OpenMD { StuntDouble* integrableObject; SimInfo::MoleculeIterator mi; Molecule::IntegrableObjectIterator ii; + RigidBody::AtomIterator ai; + Atom* atom; #ifndef IS_MPI os << " \n"; @@ -292,7 +322,32 @@ namespace OpenMD { } } os << " \n"; - + + if (doSiteData_) { + os << " \n"; + for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) { + + for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL; + integrableObject = mol->nextIntegrableObject(ii)) { + + int ioIndex = integrableObject->getGlobalIntegrableObjectIndex(); + // do one for the IO itself + os << prepareSiteLine(integrableObject, ioIndex, 0); + + if (integrableObject->isRigidBody()) { + + RigidBody* rb = static_cast(integrableObject); + int siteIndex = 0; + for (atom = rb->beginAtom(ai); atom != NULL; + atom = rb->nextAtom(ai)) { + os << prepareSiteLine(atom, ioIndex, siteIndex); + siteIndex++; + } + } + } + } + os << " \n"; + } os << " \n"; os.flush(); @@ -429,10 +484,7 @@ namespace OpenMD { if (needForceVector_) { type += "f"; - Vector3d frc; - - frc = integrableObject->getFrc(); - + Vector3d frc = integrableObject->getFrc(); if (isinf(frc[0]) || isnan(frc[0]) || isinf(frc[1]) || isnan(frc[1]) || isinf(frc[2]) || isnan(frc[2]) ) { @@ -448,10 +500,7 @@ namespace OpenMD { if (integrableObject->isDirectional()) { type += "t"; - Vector3d trq; - - trq = integrableObject->getTrq(); - + Vector3d trq = integrableObject->getTrq(); if (isinf(trq[0]) || isnan(trq[0]) || isinf(trq[1]) || isnan(trq[1]) || isinf(trq[2]) || isnan(trq[2]) ) { @@ -460,23 +509,97 @@ namespace OpenMD { " for object %d", index); painCave.isFatal = 1; simError(); - } - + } sprintf(tempBuffer, " %13e %13e %13e", trq[0], trq[1], trq[2]); line += tempBuffer; } } - if (needParticlePot_) { - type += "u"; - RealType particlePot; - particlePot = integrableObject->getParticlePot(); + sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str()); + return std::string(tempBuffer); + } + std::string DumpWriter::prepareSiteLine(StuntDouble* integrableObject, int ioIndex, int siteIndex) { + + + std::string id; + std::string type; + std::string line; + char tempBuffer[4096]; + + if (integrableObject->isRigidBody()) { + sprintf(tempBuffer, "%10d ", ioIndex); + id = std::string(tempBuffer); + } else { + sprintf(tempBuffer, "%10d %10d", ioIndex, siteIndex); + id = std::string(tempBuffer); + } + + if (needFlucQ_) { + type += "cw"; + RealType fqPos = integrableObject->getFlucQPos(); + if (isinf(fqPos) || isnan(fqPos) ) { + sprintf( painCave.errMsg, + "DumpWriter detected a numerical error writing the" + " fluctuating charge for object %s", id.c_str()); + painCave.isFatal = 1; + simError(); + } + sprintf(tempBuffer, " %13e ", fqPos); + line += tempBuffer; + + RealType fqVel = integrableObject->getFlucQVel(); + if (isinf(fqVel) || isnan(fqVel) ) { + sprintf( painCave.errMsg, + "DumpWriter detected a numerical error writing the" + " fluctuating charge velocity for object %s", id.c_str()); + painCave.isFatal = 1; + simError(); + } + sprintf(tempBuffer, " %13e ", fqVel); + line += tempBuffer; + + if (needForceVector_) { + type += "g"; + RealType fqFrc = integrableObject->getFlucQFrc(); + if (isinf(fqFrc) || isnan(fqFrc) ) { + sprintf( painCave.errMsg, + "DumpWriter detected a numerical error writing the" + " fluctuating charge force for object %s", id.c_str()); + painCave.isFatal = 1; + simError(); + } + sprintf(tempBuffer, " %13e ", fqFrc); + line += tempBuffer; + } + } + + if (needElectricField_) { + type += "e"; + Vector3d eField= integrableObject->getElectricField(); + if (isinf(eField[0]) || isnan(eField[0]) || + isinf(eField[1]) || isnan(eField[1]) || + isinf(eField[2]) || isnan(eField[2]) ) { + sprintf( painCave.errMsg, + "DumpWriter detected a numerical error writing the electric" + " field for object %s", id.c_str()); + painCave.isFatal = 1; + simError(); + } + sprintf(tempBuffer, " %13e %13e %13e", + eField[0], eField[1], eField[2]); + line += tempBuffer; + } + + + if (needParticlePot_) { + type += "u"; + RealType particlePot = integrableObject->getParticlePot(); if (isinf(particlePot) || isnan(particlePot)) { sprintf( painCave.errMsg, "DumpWriter detected a numerical error writing the particle " - " potential for object %d", index); + " potential for object %s", id.c_str()); painCave.isFatal = 1; simError(); } @@ -484,7 +607,8 @@ namespace OpenMD { line += tempBuffer; } - sprintf(tempBuffer, "%10d %7s %s\n", index, type.c_str(), line.c_str()); + + sprintf(tempBuffer, "%s %7s %s\n", id.c_str(), type.c_str(), line.c_str()); return std::string(tempBuffer); } @@ -565,7 +689,7 @@ namespace OpenMD { newOStream = new std::ofstream(filename.c_str()); #endif //write out MetaData first - (*newOStream) << "" << std::endl; + (*newOStream) << "" << std::endl; (*newOStream) << " " << std::endl; (*newOStream) << info_->getRawMetaData(); (*newOStream) << " " << std::endl;