OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-07 14:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improves summary import for ensemble workflows

Browse Source 
- Introducing a configuration system to automatically detect file patterns for restart and parameter files across ensemble realizations.
- Adding UI elements to control improved summary import settings.
- Modifying summary file reader to use the determined file patterns.
This commit is contained in:
Magne Sjaastad committed 2025-07-23 15:58:56 +02:00
1 parent f9f9b6b07b
commit b4e99e9a3a
25 files changed
+810 -313
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
+41 -8
View File
@@ -25,6 +25,7 @@
#include "RifEclipseSummaryTools.h"
#include "RifMultipleSummaryReaders.h"
#include "RifOpmCommonSummary.h"
#include "RifOpmSummaryTools.h"
#include "RifProjectSummaryDataWriter.h"
#include "RifReaderEclipseSummary.h"
#include "RifReaderOpmRft.h"
@@ -39,6 +40,7 @@
#include "cafPdmUiFilePathEditor.h"
#include "cafPdmUiTreeOrdering.h"
#include "RiaPreferencesSystem.h"
#include <QDir>
#include <QFileInfo>
#include <QUuid>
@@ -89,7 +91,8 @@ QString RimFileSummaryCase::caseName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFileSummaryCase::createSummaryReaderInterfaceThreadSafe( RiaThreadSafeLogger* threadSafeLogger )
void RimFileSummaryCase::createSummaryReaderInterfaceThreadSafe( RifEnsembleImportConfig ensembleImportState,
RiaThreadSafeLogger* threadSafeLogger )
{
// RimFileSummaryCase::findRelatedFilesAndCreateReader is a performance bottleneck. The function
// RifEclipseSummaryTools::getRestartFile() should be refactored to use opm-common instead of resdata.
@@ -101,7 +104,10 @@ void RimFileSummaryCase::createSummaryReaderInterfaceThreadSafe( RiaThreadSafeLo
m_fileSummaryReaderId = -1;
m_additionalSummaryReaderId = -1;
auto reader = RimFileSummaryCase::findRelatedFilesAndCreateReader( summaryHeaderFilename(), m_includeRestartFiles, threadSafeLogger );
auto reader = RimFileSummaryCase::findRelatedFilesAndCreateReader( summaryHeaderFilename(),
m_includeRestartFiles,
ensembleImportState,
threadSafeLogger );
if ( !reader ) return;
m_fileSummaryReaderId = reader->serialNumber();
@@ -119,7 +125,7 @@ void RimFileSummaryCase::createSummaryReaderInterfaceThreadSafe( RiaThreadSafeLo
void RimFileSummaryCase::createSummaryReaderInterface()
{
RiaThreadSafeLogger threadSafeLogger;
createSummaryReaderInterfaceThreadSafe( &threadSafeLogger );
createSummaryReaderInterfaceThreadSafe( RifEnsembleImportConfig(), &threadSafeLogger );
auto messages = threadSafeLogger.messages();
for ( const auto& m : messages )
@@ -155,25 +161,48 @@ void RimFileSummaryCase::createRftReaderInterface()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<RifSummaryReaderInterface> RimFileSummaryCase::findRelatedFilesAndCreateReader( const QString& headerFileName,
bool lookForRestartFiles,
RiaThreadSafeLogger* threadSafeLogger )
std::unique_ptr<RifSummaryReaderInterface> RimFileSummaryCase::findRelatedFilesAndCreateReader( const QString& headerFileName,
bool lookForRestartFiles,
RifEnsembleImportConfig ensembleImportState,
RiaThreadSafeLogger* threadSafeLogger )
{
if ( lookForRestartFiles )
{
auto startTime = RiaLogging::currentTime();
std::vector<QString> warnings;
std::vector<QString> restartFileNames;
if ( RiaPreferencesSummary::current()->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::OPM_COMMON )
{
restartFileNames = RifEclipseSummaryTools::getRestartFileNamesOpm( headerFileName, warnings );
if ( ensembleImportState.useConfigValues() )
{
auto realizationNumber = RifOpmSummaryTools::extractRealizationNumber( headerFileName );
if ( !realizationNumber.has_value() )
{
RiaLogging::error( realizationNumber.error() );
return nullptr;
}
restartFileNames = ensembleImportState.restartFilesForRealization( realizationNumber.value() );
}
else
{
// If the restart file names are not provided, we search for them
restartFileNames = RifEclipseSummaryTools::getRestartFileNamesOpm( headerFileName, warnings );
}
}
else
{
restartFileNames = RifEclipseSummaryTools::getRestartFileNames( headerFileName, warnings );
}
bool isLoggingEnabled = RiaPreferencesSystem::current()->isLoggingActivatedForKeyword( "OpmSummaryImport" );
if ( isLoggingEnabled ) RiaLogging::logElapsedTime( "Searched for restart files for " + headerFileName, startTime );
if ( !restartFileNames.empty() )
{
auto startTime = RiaLogging::currentTime();
std::vector<std::string> summaryFileNames;
summaryFileNames.push_back( headerFileName.toStdString() );
for ( const auto& fileName : restartFileNames )
@@ -185,16 +214,20 @@ std::unique_ptr<RifSummaryReaderInterface> RimFileSummaryCase::findRelatedFilesA
std::reverse( summaryFileNames.begin(), summaryFileNames.end() );
auto summaryReader = std::make_unique<RifSummaryReaderAggregator>( summaryFileNames );
if ( !summaryReader->createReadersAndImportMetaData( threadSafeLogger ) )
if ( !summaryReader->createReadersAndImportMetaData( ensembleImportState, threadSafeLogger ) )
{
return nullptr;
}
bool isLoggingEnabled = RiaPreferencesSystem::current()->isLoggingActivatedForKeyword( "OpmSummaryImport" );
if ( isLoggingEnabled ) RiaLogging::logElapsedTime( "Created reader", startTime );
return summaryReader;
}
}
auto summaryFileReader = std::make_unique<RifReaderEclipseSummary>();
summaryFileReader->setEnsembleImportState( ensembleImportState );
// All restart data is taken care of by RifSummaryReaderAggregator, never read restart data from native file
// readers