OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of std::filesystem on older compilers

Browse Source
This commit is contained in:
Magne Sjaastad 2021-04-16 15:16:00 +02:00
parent d18abce39a
commit 9cd36fab5b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationLibCode/FileInterface/RifHdf5SummaryExporter.cpp
View File

@ -24,6 +24,7 @@
#include "RifHdf5Exporter.h" #include "RifHdf5Exporter.h"
#include "RifSummaryReaderInterface.h" #include "RifSummaryReaderInterface.h"
#include "opm/common/utility/FileSystem.hpp"
#include "opm/common/utility/TimeService.hpp" #include "opm/common/utility/TimeService.hpp"
#include "opm/io/eclipse/ESmry.hpp" #include "opm/io/eclipse/ESmry.hpp"
@ -32,8 +33,6 @@
#include <QFileInfo> #include <QFileInfo>
#include <QString> #include <QString>
#include <filesystem>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -81,7 +80,7 @@ bool RifHdf5SummaryExporter::ensureHdf5FileIsCreated( const std::string& smspecF
const std::string& h5FileName, const std::string& h5FileName,
size_t& hdfFilesCreatedCount ) size_t& hdfFilesCreatedCount )
{ {
if ( !std::filesystem::exists( smspecFileName ) ) return false; if ( !Opm::filesystem::exists( smspecFileName ) ) return false;
{ {
// Check if we have write permission in the folder // Check if we have write permission in the folder
@ -93,7 +92,7 @@ bool RifHdf5SummaryExporter::ensureHdf5FileIsCreated( const std::string& smspecF
bool exportIsRequired = false; bool exportIsRequired = false;
{ {
bool h5FileExists = std::filesystem::exists( h5FileName ); bool h5FileExists = Opm::filesystem::exists( h5FileName );
if ( !h5FileExists ) exportIsRequired = true; if ( !h5FileExists ) exportIsRequired = true;
RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
@ -262,10 +261,12 @@ bool RifHdf5SummaryExporter::writeSummaryVectors( RifHdf5Exporter& exporter, Opm
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifHdf5SummaryExporter::isFirstOlderThanSecond( const std::string& firstFileName, const std::string& secondFileName ) bool RifHdf5SummaryExporter::isFirstOlderThanSecond( const std::string& firstFileName, const std::string& secondFileName )
{ {
if ( !std::filesystem::exists( firstFileName ) || !std::filesystem::exists( secondFileName ) ) return false; // Use Opm namespace to make sure the code compiles on older compilers
auto timeA = std::filesystem::last_write_time( firstFileName ); if ( !Opm::filesystem::exists( firstFileName ) || !Opm::filesystem::exists( secondFileName ) ) return false;
auto timeB = std::filesystem::last_write_time( secondFileName );
auto timeA = Opm::filesystem::last_write_time( firstFileName );
auto timeB = Opm::filesystem::last_write_time( secondFileName );
return ( timeA < timeB ); return ( timeA < timeB );
} }