OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-05 21:53:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

#7742 Contour map : Do not use activeCellInfo for all results

Browse Source 
Some results have values for each global grid cell. Do not use the active cell index when computing contour maps.
This commit is contained in:
Magne Sjaastad 2021-06-01 14:14:05 +02:00
parent b3467a2fca
commit 33a1bbb6d6
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
View File

@ -60,6 +60,7 @@ CAF_PDM_SOURCE_INIT( RimEclipseContourMapProjection, "RimEclipseContourMapProjec
RimEclipseContourMapProjection::RimEclipseContourMapProjection()
: RimContourMapProjection()
, m_kLayers( 0u )
, m_useActiveCellInfo( true )
{
CAF_PDM_InitObject( "RimEclipseContourMapProjection", ":/2DMapProjection16x16.png", "", "" );
@ -185,30 +186,35 @@ std::vector<double> RimEclipseContourMapProjection::generateResults( int timeSte
std::vector<double> aggregatedResults = std::vector<double>( nCells, std::numeric_limits<double>::infinity() );
RimEclipseCellColors* cellColors = view()->cellResult();
RimEclipseCase* eclipseCase = this->eclipseCase();
RimEclipseCellColors* cellColors = view()->cellResult();
auto gridCellResult = view()->currentGridCellResults();
{
{
auto resultAdr = cellColors->eclipseResultAddress();
if ( resultAdr.isValid() && gridCellResult->hasResultEntry( resultAdr ) )
m_useActiveCellInfo = gridCellResult->isUsingGlobalActiveIndex( resultAdr );
}
if ( !cellColors->isTernarySaturationSelected() )
{
RigCaseCellResultsData* resultData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
std::vector<double> gridResultValues;
std::vector<double> gridResultValues;
if ( isColumnResult() )
{
m_currentResultName = "";
resultData->ensureKnownResultLoaded(
gridCellResult->ensureKnownResultLoaded(
RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORO" ) );
resultData->ensureKnownResultLoaded(
gridCellResult->ensureKnownResultLoaded(
RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "NTG" ) );
resultData->ensureKnownResultLoaded(
gridCellResult->ensureKnownResultLoaded(
RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DZ" ) );
if ( m_resultAggregation == RESULTS_OIL_COLUMN || m_resultAggregation == RESULTS_HC_COLUMN )
{
resultData->ensureKnownResultLoaded(
gridCellResult->ensureKnownResultLoaded(
RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "SOIL" ) );
}
if ( m_resultAggregation == RESULTS_GAS_COLUMN || m_resultAggregation == RESULTS_HC_COLUMN )
{
resultData->ensureKnownResultLoaded(
gridCellResult->ensureKnownResultLoaded(
RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "SGAS" ) );
}
gridResultValues = calculateColumnResult( m_resultAggregation() );
@ -220,9 +226,9 @@ std::vector<double> RimEclipseContourMapProjection::generateResults( int timeSte
cellColors->resultVariable(),
cellColors->timeLapseBaseTimeStep(),
cellColors->caseDiffIndex() );
if ( resAddr.isValid() && resultData->hasResultEntry( resAddr ) )
if ( resAddr.isValid() && gridCellResult->hasResultEntry( resAddr ) )
{
gridResultValues = resultData->cellScalarResults( resAddr, timeStep );
gridResultValues = gridCellResult->cellScalarResults( resAddr, timeStep );
}
}
@ -496,7 +502,9 @@ double RimEclipseContourMapProjection::getParameterWeightForCell( size_t
//--------------------------------------------------------------------------------------------------
size_t RimEclipseContourMapProjection::gridResultIndex( size_t globalCellIdx ) const
{
return m_activeCellInfo->cellResultIndex( globalCellIdx );
if ( m_useActiveCellInfo ) return m_activeCellInfo->cellResultIndex( globalCellIdx );
return globalCellIdx;
}
//--------------------------------------------------------------------------------------------------

1
ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.h
View File

@ -101,6 +101,7 @@ protected:
cvf::ref<RigMainGrid> m_mainGrid;
cvf::ref<RigActiveCellInfo> m_activeCellInfo;
size_t m_kLayers;
bool m_useActiveCellInfo;
QString m_currentResultName;
};