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

#8313 Ensemble import: Avoid log message when no h5-file is found

Browse Source
This commit is contained in:
Magne Sjaastad 2021-11-24 08:53:33 +01:00
parent 5d96a98b06
commit 8b36ec9925
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationLibCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@ -85,15 +85,11 @@ bool RifReaderEclipseSummary::open( const QString& headerFileName, RiaThreadSafe
if ( prefSummary->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON || if ( prefSummary->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON ||
prefSummary->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::OPM_COMMON ) prefSummary->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::OPM_COMMON )
{ {
bool h5FileFound = false; QFileInfo fi( headerFileName );
{ QString basenameNoExtension = fi.absolutePath() + "/" + fi.baseName();
QFileInfo fi( headerFileName ); QString h5FileName = basenameNoExtension + ".h5";
QString basenameNoExtension = fi.absolutePath() + "/" + fi.baseName();
QString h5FileName = basenameNoExtension + ".h5"; bool h5FileFound = QFile::exists( h5FileName );
h5FileFound = QFile::exists( h5FileName );
}
if ( h5FileFound || if ( h5FileFound ||
( prefSummary->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON ) ) ( prefSummary->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON ) )
@ -101,27 +97,28 @@ bool RifReaderEclipseSummary::open( const QString& headerFileName, RiaThreadSafe
#ifdef USE_HDF5 #ifdef USE_HDF5
if ( prefSummary->createH5SummaryDataFiles() ) if ( prefSummary->createH5SummaryDataFiles() )
{ {
QFileInfo fi( headerFileName );
QString h5FilenameCandidate = fi.absolutePath() + "/" + fi.baseName() + ".h5";
size_t createdH5FileCount = 0; size_t createdH5FileCount = 0;
RifHdf5SummaryExporter::ensureHdf5FileIsCreated( headerFileName.toStdString(), RifHdf5SummaryExporter::ensureHdf5FileIsCreated( headerFileName.toStdString(),
h5FilenameCandidate.toStdString(), h5FileName.toStdString(),
createdH5FileCount ); createdH5FileCount );
if ( createdH5FileCount > 0 ) if ( createdH5FileCount > 0 )
{ {
QString txt = QString( "Created %1 " ).arg( h5FilenameCandidate ); QString txt = QString( "Created %1 " ).arg( h5FileName );
if ( threadSafeLogger ) threadSafeLogger->info( txt ); if ( threadSafeLogger ) threadSafeLogger->info( txt );
} }
h5FileFound = QFile::exists( h5FileName );
} }
auto hdfReader = std::make_unique<RifOpmHdf5Summary>(); if ( h5FileFound )
isValid = hdfReader->open( headerFileName, false, threadSafeLogger );
if ( isValid )
{ {
m_summaryReader = std::move( hdfReader ); auto hdfReader = std::make_unique<RifOpmHdf5Summary>();
isValid = hdfReader->open( headerFileName, false, threadSafeLogger );
if ( isValid )
{
m_summaryReader = std::move( hdfReader );
}
} }
#endif #endif
} }