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

#9914 Fix import of single case already present in ensemble

Browse Source
This commit is contained in:
Magne Sjaastad 2023-03-06 10:45:49 +01:00
parent a8e131647f
commit 8f786fed5d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@ -121,7 +121,7 @@ bool RiaImportEclipseCaseTools::openEclipseCasesFromFile( const QStringList&
for ( RimSummaryCase* newSumCase : candidateCases ) for ( RimSummaryCase* newSumCase : candidateCases )
{ {
RimSummaryCaseCollection* existingCollection = nullptr; RimSummaryCaseCollection* existingCollection = nullptr;
auto existingSummaryCase = sumCaseColl->findSummaryCaseFromFileName( newSumCase->summaryHeaderFilename() ); auto existingSummaryCase = sumCaseColl->findTopLevelSummaryCaseFromFileName( newSumCase->summaryHeaderFilename() );
if ( existingSummaryCase ) if ( existingSummaryCase )
{ {
existingSummaryCase->firstAncestorOrThisOfType( existingCollection ); existingSummaryCase->firstAncestorOrThisOfType( existingCollection );

8
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@ -119,7 +119,7 @@ RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromEclipseResultCa
auto summaryFileName = helper.findSummaryFileCandidates(); auto summaryFileName = helper.findSummaryFileCandidates();
for ( const auto& candidateFileName : summaryFileName ) for ( const auto& candidateFileName : summaryFileName )
{ {
auto summaryCase = findSummaryCaseFromFileName( candidateFileName ); auto summaryCase = findTopLevelSummaryCaseFromFileName( candidateFileName );
if ( summaryCase ) if ( summaryCase )
{ {
return summaryCase; return summaryCase;
@ -132,9 +132,9 @@ RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromEclipseResultCa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromFileName( const QString& fileName ) const RimSummaryCase* RimSummaryCaseMainCollection::findTopLevelSummaryCaseFromFileName( const QString& fileName ) const
{ {
for ( const auto& summaryCase : allSummaryCases() ) for ( const auto& summaryCase : topLevelSummaryCases() )
{ {
if ( summaryCase->summaryHeaderFilename() == fileName ) if ( summaryCase->summaryHeaderFilename() == fileName )
{ {
@ -553,7 +553,7 @@ std::vector<RimSummaryCase*>
{ {
QCoreApplication::processEvents( QEventLoop::ExcludeUserInputEvents ); QCoreApplication::processEvents( QEventLoop::ExcludeUserInputEvents );
auto existingSummaryCase = findSummaryCaseFromFileName( fileInfo.summaryFileName() ); auto existingSummaryCase = findTopLevelSummaryCaseFromFileName( fileInfo.summaryFileName() );
if ( !existingSummaryCase ) if ( !existingSummaryCase )
{ {
const QString& smspecFileName = fileInfo.summaryFileName(); const QString& smspecFileName = fileInfo.summaryFileName();

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
View File

@ -55,7 +55,7 @@ public:
bool showProgress = false ); bool showProgress = false );
RimSummaryCase* findSummaryCaseFromEclipseResultCase( const RimEclipseResultCase* eclResCase ) const; RimSummaryCase* findSummaryCaseFromEclipseResultCase( const RimEclipseResultCase* eclResCase ) const;
RimSummaryCase* findSummaryCaseFromFileName( const QString& fileName ) const; RimSummaryCase* findTopLevelSummaryCaseFromFileName( const QString& fileName ) const;
void addCases( const std::vector<RimSummaryCase*> cases ); void addCases( const std::vector<RimSummaryCase*> cases );
void addCase( RimSummaryCase* summaryCase ); void addCase( RimSummaryCase* summaryCase );