OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Work in progress

Browse Source
This commit is contained in:
Jon Jenssen
2024-09-17 12:47:04 +02:00
committed by jonjenssen
parent 68bc64598b
commit 7b0d1ab75c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationLibCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@@ -756,11 +756,12 @@ void RivReservoirViewPartMgr::computeFilterVisibility( RivCellSetEnum
const bool useAndOperation = cellFilterColl->useAndOperation();
#pragma omp parallel for
for ( int cellIndex = 0; cellIndex < static_cast<int>( grid->cellCount() ); cellIndex++ )
for ( int nativeCellIndex = 0; nativeCellIndex < static_cast<int>( grid->cellCount() ); nativeCellIndex++ )
{
if ( ( *nativeVisibility )[cellIndex] )
if ( ( *nativeVisibility )[nativeCellIndex] )
{
const RigCell& cell = grid->cell( cellIndex );
const RigCell& cell = grid->nativeCell( nativeCellIndex );
const auto globalCellIndex = grid->nativeCellIndexToGlobal( nativeCellIndex );
bool visibleDueToParentGrid = false;
if ( lgr )
{
@@ -774,7 +775,7 @@ void RivReservoirViewPartMgr::computeFilterVisibility( RivCellSetEnum
size_t mainGridK;
const bool isInSubGridArea = cell.subGrid() != nullptr;
grid->ijkFromCellIndex( cellIndex, &mainGridI, &mainGridJ, &mainGridK );
grid->ijkFromCellIndex( globalCellIndex, &mainGridI, &mainGridJ, &mainGridK );
bool nativeRangeVisibility = false;
@@ -784,12 +785,12 @@ void RivReservoirViewPartMgr::computeFilterVisibility( RivCellSetEnum
{
if ( useAndOperation )
{
nativeRangeVisibility = indexIncludeVisibility[cellIndex] &&
nativeRangeVisibility = indexIncludeVisibility[nativeCellIndex] &&
gridCellRangeFilter.isCellVisible( mainGridI, mainGridJ, mainGridK, isInSubGridArea );
}
else
{
nativeRangeVisibility = indexIncludeVisibility[cellIndex] ||
nativeRangeVisibility = indexIncludeVisibility[nativeCellIndex] ||
gridCellRangeFilter.isCellVisible( mainGridI, mainGridJ, mainGridK, isInSubGridArea );
}
}
@@ -800,12 +801,12 @@ void RivReservoirViewPartMgr::computeFilterVisibility( RivCellSetEnum
}
else
{
nativeRangeVisibility = indexIncludeVisibility[cellIndex];
nativeRangeVisibility = indexIncludeVisibility[nativeCellIndex];
}
( *cellVisibility )[cellIndex] = ( visibleDueToParentGrid || nativeRangeVisibility ) &&
!gridCellRangeFilter.isCellExcluded( mainGridI, mainGridJ, mainGridK, isInSubGridArea ) &&
indexExcludeVisibility[cellIndex];
( *cellVisibility )[nativeCellIndex] = ( visibleDueToParentGrid || nativeRangeVisibility ) &&
!gridCellRangeFilter.isCellExcluded( mainGridI, mainGridJ, mainGridK, isInSubGridArea ) &&
indexExcludeVisibility[nativeCellIndex];
}
}
}