diff --git a/optimizer/Util/SDDSParser.cpp b/optimizer/Util/SDDSParser.cpp index 03abcbfe37582c4c3cef5aab2c80d690f8e19c59..30dc9fc7553cb46bc48fe87e8697c02c6aa5f845 100644 --- a/optimizer/Util/SDDSParser.cpp +++ b/optimizer/Util/SDDSParser.cpp @@ -49,8 +49,8 @@ SDDS::file SDDS::SDDSParser::run() { if (!success || contentsIter != contentsEnd) { - throw SDDSParserException("StatisticalErrors::parseSDDSFile", - "could not parse SDDS file"); + throw SDDSParserException("SDDSParser::parseSDDSFile", + "could not parse SDDS file"); } unsigned int param_order = 0; @@ -90,8 +90,8 @@ std::string SDDS::SDDSParser::readFile() { return contents; } - throw SDDSParserException("StatisticalErrors::readSDDSFile", - "could not open file '" + sddsFileName_m + "'"); + throw SDDSParserException("SDDSParser::readSDDSFile", + "could not open file '" + sddsFileName_m + "'"); return std::string(""); } diff --git a/src/Structure/GridLBalWriter.cpp b/src/Structure/GridLBalWriter.cpp index 810cdacbcb3615404c4fe8627e5acc533b9e7003..d78ca9f5dbda9cdbc3a11ecf010b2a092e9c0146 100644 --- a/src/Structure/GridLBalWriter.cpp +++ b/src/Structure/GridLBalWriter.cpp @@ -28,7 +28,7 @@ void GridLBalWriter::fillHeader(PartBunchBase<double, 3> *beam) { for (int lev = 0; lev < nLevel; ++lev) { std::stringstream tmp1; - tmp1 << "level-" << lev; + tmp1 << "\"level-" << lev << "\""; std::stringstream tmp2; tmp2 << "Number of boxes at level " << lev; @@ -38,7 +38,7 @@ void GridLBalWriter::fillHeader(PartBunchBase<double, 3> *beam) { for (int p = 0; p < Ippl::getNodes(); ++p) { std::stringstream tmp1; - tmp1 << "processor-" << p; + tmp1 << "\"processor-" << p << "\""; std::stringstream tmp2; tmp2 << "Number of grid points per processor " << p; @@ -94,7 +94,7 @@ void GridLBalWriter::write(PartBunchBase<double, 3> *beam) { for (int lev = 0; lev < nLevel; ++lev) { std::stringstream ss; - ss << "level-" << lev; + ss << "\"level-" << lev << "\""; // we need to cast due to boost::variant columns_m.addColumnValue(ss.str(), toString(gridsPerLevel[lev])); } @@ -102,7 +102,7 @@ void GridLBalWriter::write(PartBunchBase<double, 3> *beam) { int nProcs = Ippl::getNodes(); for (int p = 0; p < nProcs; ++p) { std::stringstream ss; - ss << "processor-" << p; + ss << "\"processor-" << p << "\""; // we need to cast due to boost::variant columns_m.addColumnValue(ss.str(), toString(gridPtsPerCore[p])); } diff --git a/src/Structure/LBalWriter.cpp b/src/Structure/LBalWriter.cpp index e718138efffb5bc9ac8297ef405b5f8f79dc5ca7..8d8db5032cadfd3184ecec170c6164fbc828ebf2 100644 --- a/src/Structure/LBalWriter.cpp +++ b/src/Structure/LBalWriter.cpp @@ -23,7 +23,7 @@ void LBalWriter::fillHeader(PartBunchBase<double, 3> *beam) { for (int p = 0; p < Ippl::getNodes(); ++p) { std::stringstream tmp1; - tmp1 << "processor-" << p; + tmp1 << "\"processor-" << p << "\""; std::stringstream tmp2; tmp2 << "Number of particles of processor " << p; @@ -38,7 +38,7 @@ void LBalWriter::fillHeader(PartBunchBase<double, 3> *beam) { for (int lev = 0; lev < nLevel; ++lev) { std::stringstream tmp1; - tmp1 << "level-" << lev; + tmp1 << "\"level-" << lev << "\""; std::stringstream tmp2; tmp2 << "Number of particles at level " << lev; @@ -94,7 +94,7 @@ void LBalWriter::write(PartBunchBase<double, 3> *beam) { size_t nProcs = Ippl::getNodes(); for (size_t p = 0; p < nProcs; ++ p) { std::stringstream ss; - ss << "processor-" << p; + ss << "\"processor-" << p << "\""; columns_m.addColumnValue(ss.str(), beam->getLoadBalance(p)); } @@ -103,7 +103,7 @@ void LBalWriter::write(PartBunchBase<double, 3> *beam) { int nLevel = (amrbeam->getAmrObject())->maxLevel() + 1; for (int lev = 0; lev < nLevel; ++lev) { std::stringstream ss; - ss << "level-" << lev; + ss << "\"level-" << lev << "\""; columns_m.addColumnValue(ss.str(), amrbeam->getLevelStatistics(lev)); } } diff --git a/src/Structure/MemoryWriter.cpp b/src/Structure/MemoryWriter.cpp index 1c904272fa10206fac2ce9aa24451e3fa41623b9..f9c5a4be30808d34d305467ed1eb580b8b8efb13 100644 --- a/src/Structure/MemoryWriter.cpp +++ b/src/Structure/MemoryWriter.cpp @@ -23,7 +23,7 @@ void MemoryWriter::fillHeader() { for (int p = 0; p < Ippl::getNodes(); ++p) { std::stringstream tmp1; - tmp1 << "processor-" << p; + tmp1 << "\"processor-" << p << "\""; std::stringstream tmp2; tmp2 << "Memory per processor " << p; @@ -88,7 +88,7 @@ void MemoryWriter::write(PartBunchBase<double, 3> *beam) for (int p = 0; p < nProcs; p++) { std::stringstream ss; - ss << "processor-" << p; + ss << "\"processor-" << p << "\""; columns_m.addColumnValue(ss.str(), memory->getMemoryUsage(p)); }