OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 15:10:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update GUI and calculations for ensemble stat contour map

Browse Source
This commit is contained in:
jonjenssen authored and jonjenssen committed 2025-03-26 13:35:58 +01:00
1 parent 7b269c43d4
commit 02a521d23f
7 files changed
+15 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ReservoirDataModel/ContourMap/RigEclipseContourMapProjection.cpp
+3 -7
View File
@@ -366,13 +366,9 @@ std::set<RigEclipseResultAddress> 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<double> 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 )
{
ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.cpp
-16
View File
@@ -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 );
}
ApplicationLibCode/ReservoirDataModel/ContourMap/RigFloodingSettings.h
-3
View File
@@ -36,9 +36,6 @@ public:
double oilUserDefFlooding() const;
double gasUserDefFlooding() const;
bool needsSogcr() const;
bool needsSowcr() const;
protected:
FloodingType m_oilFloodingType;
double m_userDefFloodingOil;