diff --git a/src/basics/writer/WbWriterVtkXmlBinary.cpp b/src/basics/writer/WbWriterVtkXmlBinary.cpp index cedcda64b5893abe3f8f58e5e48d5948e897103d..675fcb0d95dbfcb40b34b277de3afc54f9ac4601 100644 --- a/src/basics/writer/WbWriterVtkXmlBinary.cpp +++ b/src/basics/writer/WbWriterVtkXmlBinary.cpp @@ -39,9 +39,8 @@ using namespace std; -ofstream createFileStream(const std::string& vtkFilename) +ofstream createFileStream(const std::string &vtkFilename) { - ofstream outputFileStream(vtkFilename.c_str(), ios::out | ios::binary); if (!outputFileStream) { outputFileStream.clear(); // flags ruecksetzen (ansonsten liefert utern if(!out) weiterhin true!!! @@ -50,8 +49,7 @@ ofstream createFileStream(const std::string& vtkFilename) UbSystem::makeDirectory(path); outputFileStream.open(vtkFilename.c_str(), ios::out | ios::binary); } - if (!outputFileStream) - throw UbException(UB_EXARGS, "couldn't open file " + vtkFilename); + if (!outputFileStream) throw UbException(UB_EXARGS, "couldn't open file " + vtkFilename); } return outputFileStream; } @@ -67,8 +65,7 @@ void addCollectionDatasetsForTimeStep(std::ofstream &outputFileStream, const vec { int group = 0, part = 0; for (size_t i = 0; i < filenames.size(); i++) { - outputFileStream << " <DataSet timestep=\"" << timeStep << "\" group=\"" << group << "\" part=\"" << part - << "\" file=\"" << filenames[i] << "\"/>" << endl; + outputFileStream << " <DataSet timestep=\"" << timeStep << "\" group=\"" << group << "\" part=\"" << part << "\" file=\"" << filenames[i] << "\"/>" << endl; if (separateGroups) group++; else @@ -110,6 +107,7 @@ string WbWriterVtkXmlBinary::writeCollection(const string &filename, const vecto finalizeCollectionFile(out); return vtkFilename; } + /*===============================================================================*/ string WbWriterVtkXmlBinary::addFilesToCollection(const string &filename, const vector<string> &filenames, const double &timeStep, const bool &separateGroups) const diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp index 7f6f5cbb64ed1c3ff7015e81de142fe786da1912..4178ba133ca590c91841163bc4eb589f559a718f 100644 --- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp +++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp @@ -197,10 +197,10 @@ std::string VIRTUALFLUIDS_GPU_EXPORT FileWriter::writeCollectionFileMedian(std:: return pFileName; } -std::string VIRTUALFLUIDS_GPU_EXPORT FileWriter::writePvdCollectionFileForTimeSeries( const Parameter ¶) +std::string VIRTUALFLUIDS_GPU_EXPORT FileWriter::writePvdCollectionFileForTimeSeries(const Parameter ¶) { std::string filename = makePvdCollectionFileName(para.getFName(), para.getMyProcessID()); - std::string pvdFileName= WbWriterVtkXmlBinary::getInstance()->writeCollectionForTimeSeries(filename, this->fileNamesForCollectionFileTimeSeries, false); + std::string pvdFileName = WbWriterVtkXmlBinary::getInstance()->writeCollectionForTimeSeries(filename, this->fileNamesForCollectionFileTimeSeries, false); return pvdFileName; } diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h index 4353ed293872b2018bde928c26b007a48a24cedd..c30e33b171563a612e224fd08fd1e4ee68b8fea8 100644 --- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h +++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h @@ -29,7 +29,7 @@ private: std::string writeCollectionFileMedian( std::shared_ptr<Parameter> para, unsigned int timestep ); - std::string writePvdCollectionFileForTimeSeries( const Parameter ¶); + std::string writePvdCollectionFileForTimeSeries(const Parameter ¶); std::vector<std::string> getNodeDataNames(std::shared_ptr<Parameter> para); std::vector<std::string> getMedianNodeDataNames(std::shared_ptr<Parameter> para);