Support loading formation names when importing an ensemble

OPM · Jan 20, 2025 · 4ea46dd · 4ea46dd
1 parent 7acbc86
commit 4ea46dd
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 3 deletions.
diff --git a/ApplicationLibCode/Commands/EclipseCommands/RicCreateGridCaseEnsemblesFromFilesFeature.cpp b/ApplicationLibCode/Commands/EclipseCommands/RicCreateGridCaseEnsemblesFromFilesFeature.cpp
@@ -22,21 +22,25 @@
 #include "RiaImportEclipseCaseTools.h"
 
 #include "RicCreateGridCaseGroupFromFilesFeature.h"
+#include "RicImportFormationNamesFeature.h"
 #include "RicNewViewFeature.h"
 #include "RicRecursiveFileSearchDialog.h"
 
 #include "Rim3dView.h"
 #include "RimEclipseCaseCollection.h"
 #include "RimEclipseCaseEnsemble.h"
 #include "RimEclipseResultCase.h"
+#include "RimFormationNames.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimViewNameConfig.h"
 
 #include "cafProgressInfo.h"
 #include "cafSelectionManager.h"
+#include "cafUtils.h"
 
 #include <QAction>
+#include <QDir>
 #include <QFileInfo>
 
 CAF_CMD_SOURCE_INIT( RicCreateGridCaseEnsemblesFromFilesFeature, "RicCreateGridCaseEnsemblesFromFilesFeature" );
@@ -115,9 +119,16 @@ RimEclipseCaseEnsemble* RicCreateGridCaseEnsemblesFromFilesFeature::importSingle
 
         QString caseName = gridFileName.completeBaseName();
 
-        auto* rimResultReservoir = new RimEclipseResultCase();
-        rimResultReservoir->setCaseInfo( caseName, caseFileName );
-        eclipseCaseEnsemble->addCase( rimResultReservoir );
+        auto* rimResultCase = new RimEclipseResultCase();
+        rimResultCase->setCaseInfo( caseName, caseFileName );
+        eclipseCaseEnsemble->addCase( rimResultCase );
+
+        QFileInfo fi( caseFileName );
+
+        // look for formation file two levels up from the egrid file
+        auto               formationFolder = QDir( fi.dir().path() + "/../../" );
+        RimFormationNames* formations      = loadFormationsFromEnsembleFolder( formationFolder.absolutePath() );
+        if ( formations != nullptr ) rimResultCase->setFormationNames( formations );
     }
 
     oilfield->analysisModels()->caseEnsembles.push_back( eclipseCaseEnsemble );
@@ -154,3 +165,17 @@ std::pair<QStringList, RiaEnsembleNameTools::EnsembleGroupingMode>
 
     return std::make_pair( result.files, result.groupingMode );
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimFormationNames* RicCreateGridCaseEnsemblesFromFilesFeature::loadFormationsFromEnsembleFolder( const QString folderName )
+{
+    QStringList filters;
+    filters << "*.lyr";
+
+    QStringList fileList = caf::Utils::getFilesInDirectory( folderName, filters, true /*absolute filename*/ );
+    if ( fileList.isEmpty() ) return nullptr;
+
+    return RicImportFormationNamesFeature::importFormationFiles( fileList );
+}
diff --git a/ApplicationLibCode/Commands/EclipseCommands/RicCreateGridCaseEnsemblesFromFilesFeature.h b/ApplicationLibCode/Commands/EclipseCommands/RicCreateGridCaseEnsemblesFromFilesFeature.h
@@ -25,6 +25,7 @@
 #include <vector>
 
 class RimEclipseCaseEnsemble;
+class RimFormationNames;
 
 //==================================================================================================
 ///
@@ -40,6 +41,8 @@ class RicCreateGridCaseEnsemblesFromFilesFeature : public caf::CmdFeature
     {
     }
 
+    static RimFormationNames* loadFormationsFromEnsembleFolder( const QString folderName );
+
 protected:
     void onActionTriggered( bool isChecked ) override;
     void setupActionLook( QAction* actionToSetup ) override;

diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
@@ -45,11 +45,13 @@
 #include "RigMainGrid.h"
 
 #include "RimDialogData.h"
+#include "RimEclipseCaseEnsemble.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseInputProperty.h"
 #include "RimEclipseInputPropertyCollection.h"
 #include "RimEclipseView.h"
 #include "RimFlowDiagSolution.h"
+#include "RimFormationNames.h"
 #include "RimMockModelSettings.h"
 #include "RimProject.h"
 #include "RimReservoirCellResultsStorage.h"
@@ -695,3 +697,30 @@ void RimEclipseResultCase::defineEditorAttribute( const caf::PdmFieldHandle* fie
         }
     }
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QList<caf::PdmOptionItemInfo> RimEclipseResultCase::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
+{
+    // if this is part of an ensemble, use lyr file set during ensemble creating
+    if ( fieldNeedingOptions == &m_activeFormationNames )
+    {
+        auto ensemble = firstAncestorOrThisOfType<RimEclipseCaseEnsemble>();
+        if ( ensemble != nullptr )
+        {
+            QList<caf::PdmOptionItemInfo> options;
+            if ( m_activeFormationNames() )
+            {
+                options.push_back( caf::PdmOptionItemInfo( m_activeFormationNames->fileNameWoPath(), m_activeFormationNames(), false ) );
+            }
+            else
+            {
+                options.push_back( caf::PdmOptionItemInfo( "None", nullptr ) );
+            }
+            return options;
+        }
+    }
+
+    return RimEclipseCase::calculateValueOptions( fieldNeedingOptions );
+}
diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h
@@ -80,6 +80,7 @@ class RimEclipseResultCase : public RimEclipseCase
 protected:
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
     void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
+    QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
 
 private:
     void loadAndUpdateSourSimData();