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

Make opm summary reader work with mixed casing (#7593)

Browse Source 
* #7592 opm-common : Add case insensitive file search
* #7592 opm-common : Find file based on case insensitive search
* #7592 opm-common : Improve error messages
This commit is contained in:
Magne Sjaastad
2021-04-19 16:40:29 +02:00
committed by GitHub
parent b2d475dde2
commit a6277c0ddc
5 changed files with 88 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationLibCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -197,17 +197,16 @@ bool RifReaderEclipseSummary::open( const QString& headerFileName,
bool useLodsmryFiles = prefSummary->useOptimizedSummaryDataFiles();
if ( useLodsmryFiles && includeRestartFiles )
{
QString txt = "LODSMRY file loading for summary restart files is not supported. Disable one of the options";
if ( threadSafeLogger ) threadSafeLogger->error( txt );
return false;
QString txt =
"LODSMRY file loading for summary restart files is not supported. Restart history might be incomplete.";
if ( threadSafeLogger ) threadSafeLogger->warning( txt );
}
m_opmCommonReader = std::make_unique<RifOpmCommonEclipseSummary>();
m_opmCommonReader->useLodsmaryFiles( prefSummary->useOptimizedSummaryDataFiles() );
m_opmCommonReader->createLodsmaryFiles( prefSummary->createOptimizedSummaryDataFiles() );
isValid = m_opmCommonReader->open( headerFileName, includeRestartFiles, threadSafeLogger );
isValid = m_opmCommonReader->open( headerFileName, false, threadSafeLogger );
if ( !isValid ) m_opmCommonReader.reset();
}

9
ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
View File

@@ -100,9 +100,16 @@ void RimFileSummaryCase::createSummaryReaderInterfaceThreadSafe( RiaThreadSafeLo
//--------------------------------------------------------------------------------------------------
void RimFileSummaryCase::createSummaryReaderInterface()
{
RiaThreadSafeLogger threadSafeLogger;
m_summaryFileReader = RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(),
m_includeRestartFiles,
nullptr );
&threadSafeLogger );
auto messages = threadSafeLogger.messages();
for ( const auto& m : messages )
{
RiaLogging::info( m );
}
}
//--------------------------------------------------------------------------------------------------