Merge pull request #677 from akva2/remove_gcc7_compat

use std::filesystem directly
This commit is contained in:
Atgeirr Flø Rasmussen 2021-11-01 15:29:57 +01:00 committed by GitHub
commit 22cabb6855

View File

@ -35,8 +35,6 @@
#include <opm/models/io/baseoutputwriter.hh> #include <opm/models/io/baseoutputwriter.hh>
#include <opm/models/parallel/tasklets.hh> #include <opm/models/parallel/tasklets.hh>
#include <opm/common/utility/FileSystem.hpp>
#include <opm/material/common/Valgrind.hpp> #include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp> #include <opm/material/common/Unused.hpp>
@ -48,6 +46,7 @@
#include <mpi.h> #include <mpi.h>
#endif #endif
#include <filesystem>
#include <list> #include <list>
#include <string> #include <string>
#include <limits> #include <limits>
@ -88,7 +87,7 @@ class VtkMultiWriter : public BaseOutputWriter
// determine name to write into the multi-file for the // determine name to write into the multi-file for the
// current time step // current time step
// The file names in the pvd file are relative, the path should therefore be stripped. // The file names in the pvd file are relative, the path should therefore be stripped.
const filesystem::path fullPath{fileName}; const std::filesystem::path fullPath{fileName};
const std::string localFileName = fullPath.filename(); const std::string localFileName = fullPath.filename();
multiWriter_.multiFile_.precision(16); multiWriter_.multiFile_.precision(16);
multiWriter_.multiFile_ << " <DataSet timestep=\"" << multiWriter_.curTime_ << "\" file=\"" multiWriter_.multiFile_ << " <DataSet timestep=\"" << multiWriter_.curTime_ << "\" file=\""