From 02a521d23f1c7a353bebf8b549f00efb0990587b Mon Sep 17 00:00:00 2001 From: jonjenssen Date: Wed, 26 Mar 2025 12:58:45 +0100 Subject: [PATCH] Update GUI and calculations for ensemble stat contour map --- .../Application/RiaResultNames.cpp | 8 ++++++++ ApplicationLibCode/Application/RiaResultNames.h | 1 + .../ContourMap/RimContourMapProjection.cpp | 4 ++-- .../ContourMap/RimStatisticsContourMap.cpp | 2 +- .../RigEclipseContourMapProjection.cpp | 10 +++------- .../ContourMap/RigFloodingSettings.cpp | 16 ---------------- .../ContourMap/RigFloodingSettings.h | 3 --- 7 files changed, 15 insertions(+), 29 deletions(-) diff --git a/ApplicationLibCode/Application/RiaResultNames.cpp b/ApplicationLibCode/Application/RiaResultNames.cpp index f0caa86158..bdf568c20d 100644 --- a/ApplicationLibCode/Application/RiaResultNames.cpp +++ b/ApplicationLibCode/Application/RiaResultNames.cpp @@ -477,6 +477,14 @@ QString RiaResultNames::sogcr() return "SOGCR"; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaResultNames::sgcr() +{ + return "SGCR"; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Application/RiaResultNames.h b/ApplicationLibCode/Application/RiaResultNames.h index ff56b5fd26..2399caab8d 100644 --- a/ApplicationLibCode/Application/RiaResultNames.h +++ b/ApplicationLibCode/Application/RiaResultNames.h @@ -89,6 +89,7 @@ QString swat(); QString sowcr(); QString sogcr(); +QString sgcr(); // Well path derived results QString wbsAzimuthResult(); diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapProjection.cpp b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapProjection.cpp index 20a05176ef..5c3ab3f048 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapProjection.cpp +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapProjection.cpp @@ -68,8 +68,8 @@ void RimContourMapProjection::ResultAggregation::setUp() template <> void RimContourMapProjection::FloodingType::setUp() { - addItem( RigFloodingSettings::FloodingType::WATER_FLOODING, "WATER_FLOODING", "Water Flooding (SOWCR)" ); - addItem( RigFloodingSettings::FloodingType::GAS_FLOODING, "GAS_FLOODING", "Gas Flooding (SOGCR)" ); + addItem( RigFloodingSettings::FloodingType::WATER_FLOODING, "WATER_FLOODING", "Water Flooding" ); + addItem( RigFloodingSettings::FloodingType::GAS_FLOODING, "GAS_FLOODING", "Gas Flooding" ); addItem( RigFloodingSettings::FloodingType::USER_DEFINED, "USER_DEFINED", "User Defined Value" ); } diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp index 5103f9a0c7..cd4510151f 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp @@ -101,7 +101,7 @@ RimStatisticsContourMap::RimStatisticsContourMap() CAF_PDM_InitField( &m_userDefinedFloodingOil, "UserDefinedFloodingOil", 0.0, "" ); m_userDefinedFloodingOil.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_gasFloodingType, "GasFloodingType", RigFloodingSettings::FloodingType::GAS_FLOODING, "Residual Oil-in-Gas Given By" ); + CAF_PDM_InitField( &m_gasFloodingType, "GasFloodingType", RigFloodingSettings::FloodingType::GAS_FLOODING, "Residual Gas Given By" ); caf::AppEnum::setEnumSubset( &m_gasFloodingType, { RigFloodingSettings::FloodingType::GAS_FLOODING, RigFloodingSettings::FloodingType::USER_DEFINED } ); diff --git a/ApplicationLibCode/ReservoirDataModel/ContourMap/RigEclipseContourMapProjection.cpp b/ApplicationLibCode/ReservoirDataModel/ContourMap/RigEclipseContourMapProjection.cpp index 50a6501605..b3cd107c86 100644 --- a/ApplicationLibCode/ReservoirDataModel/ContourMap/RigEclipseContourMapProjection.cpp +++ b/ApplicationLibCode/ReservoirDataModel/ContourMap/RigEclipseContourMapProjection.cpp @@ -366,13 +366,9 @@ std::set RigEclipseContourMapProjection::neededResults( if ( ( resultAggregation == RigContourMapCalculator::ResultAggregationType::MOBILE_GAS_COLUMN ) || ( resultAggregation == RigContourMapCalculator::ResultAggregationType::MOBILE_HYDROCARBON_COLUMN ) ) { - if ( floodingSettings.gasFlooding() == RigFloodingSettings::FloodingType::WATER_FLOODING ) + if ( floodingSettings.gasFlooding() == RigFloodingSettings::FloodingType::GAS_FLOODING ) { - results.emplace( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::sowcr() ); - } - else if ( floodingSettings.gasFlooding() == RigFloodingSettings::FloodingType::GAS_FLOODING ) - { - results.emplace( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::sogcr() ); + results.emplace( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::sgcr() ); } } } @@ -431,7 +427,7 @@ std::vector RigEclipseContourMapProjection::residualGasData( RigCaseCell if ( floodingSettings.gasFlooding() == RigFloodingSettings::FloodingType::GAS_FLOODING ) { residualGas = - resultData.cellScalarResults( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::sogcr() ), 0 ); + resultData.cellScalarResults( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::sgcr() ), 0 ); } else if ( floodingSettings.gasFlooding() == RigFloodingSettings::FloodingType::USER_DEFINED ) { diff --git a/ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.cpp b/ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.cpp index 2d6b2ab424..6f428b0501 100644 --- a/ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.cpp +++ b/ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.cpp @@ -70,19 +70,3 @@ double RigFloodingSettings::gasUserDefFlooding() const { return m_userDefFloodingGas; } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RigFloodingSettings::needsSogcr() const -{ - return ( m_gasFloodingType == FloodingType::GAS_FLOODING ) || ( m_oilFloodingType == FloodingType::GAS_FLOODING ); -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RigFloodingSettings::needsSowcr() const -{ - return ( m_gasFloodingType == FloodingType::WATER_FLOODING ) || ( m_oilFloodingType == FloodingType::WATER_FLOODING ); -} diff --git a/ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.h b/ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.h index ce2338534f..ed217cca6f 100644 --- a/ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.h +++ b/ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.h @@ -36,9 +36,6 @@ public: double oilUserDefFlooding() const; double gasUserDefFlooding() const; - bool needsSogcr() const; - bool needsSowcr() const; - protected: FloodingType m_oilFloodingType; double m_userDefFloodingOil;