OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 15:36:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3693 Intersect : Use active state of LGR cell to define visibility

Browse Source 
Eclipse reports parent cell to LGR cells as active, and this property has been tested for in code.

Intersect reports inactive cell in the parent grid cell. Then we have to only check the active state of the LGR cell, not the parent cell.
This commit is contained in:
Magne Sjaastad 2021-06-07 07:42:36 +02:00
parent 1322bae6b6
commit be160a9fe6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -639,12 +639,11 @@ void RivReservoirViewPartMgr::computeNativeVisibility( cvf::UByteArray*
for ( int cellIndex = 0; cellIndex < static_cast<int>( grid->cellCount() ); cellIndex++ )
{
const RigCell& cell = grid->cell( cellIndex );
size_t reservoirCellIndex = cell.mainGridCellIndex();
size_t reservoirCellIndex = grid->reservoirCellIndex( cellIndex );
bool isCellActive = activeCellInfo->isActive( reservoirCellIndex );
if ( !invalidCellsIsVisible && cell.isInvalid() ||
!inactiveCellsIsVisible && !activeCellInfo->isActive( reservoirCellIndex ) ||
!activeCellsIsVisible && activeCellInfo->isActive( reservoirCellIndex ) ||
( *cellIsInWellStatuses )[cellIndex] )
if ( !invalidCellsIsVisible && cell.isInvalid() || !inactiveCellsIsVisible && !isCellActive ||
!activeCellsIsVisible && isCellActive || ( *cellIsInWellStatuses )[cellIndex] )
{
( *cellVisibility )[cellIndex] = false;
}
@ -693,8 +692,8 @@ void RivReservoirViewPartMgr::computeOverriddenCellVisibility( cvf::UByteArray*
for ( int mcIdx = 0; mcIdx < cellCount; ++mcIdx )
{
( *cellVisibility )[lcIdx] |= ( *totCellVisibility )[cellIndicesInMasterCase[mcIdx]]; // If any is visible,
// show
( *cellVisibility )[lcIdx] |= ( *totCellVisibility )[cellIndicesInMasterCase[mcIdx]]; // If any is
// visible, show
}
#else
@ -772,8 +771,8 @@ void RivReservoirViewPartMgr::computeFilterVisibility( RivCellSetEnum
if ( geometryType == RANGE_FILTERED_WELL_CELLS )
{
geometryType = RANGE_FILTERED; // Use the range filtering in the parent grid, not the well cells in the
// parent grid
geometryType = RANGE_FILTERED; // Use the range filtering in the parent grid, not the well cells in
// the parent grid
}
RivReservoirPartMgr* reservoirGridPartMgr = &m_geometries[geometryType];