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

Use active cell info struct instead of RigCell member function

Browse Source 
p4#: 20613
This commit is contained in:
Magne Sjaastad
2013-02-25 14:01:40 +01:00
parent d8000be32a
commit edda92182b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -1185,6 +1185,13 @@ void RimReservoirView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibl
// If all wells are forced off, return // If all wells are forced off, return
if (this->wellCollection()->wellCellVisibility() == RimWellCollection::FORCE_ALL_OFF) return; if (this->wellCollection()->wellCellVisibility() == RimWellCollection::FORCE_ALL_OFF) return;
RigActiveCellInfo* activeCellInfo = NULL;
if (eclipseCase() && eclipseCase()->reservoirData())
{
activeCellInfo = eclipseCase()->reservoirData()->activeCellInfo();
}
CVF_ASSERT(activeCellInfo);
// Loop over the wells and find their contribution // Loop over the wells and find their contribution
for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx) for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx)
{ {
@@ -1249,7 +1256,9 @@ void RimReservoirView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibl
for ( fIdx = 0; fIdx < cellCountFenceDirection; ++fIdx) for ( fIdx = 0; fIdx < cellCountFenceDirection; ++fIdx)
{ {
size_t fenceCellIndex = grid->cellIndexFromIJK(*pI,*pJ,*pK); size_t fenceCellIndex = grid->cellIndexFromIJK(*pI,*pJ,*pK);
if (grid->cell(fenceCellIndex).isActiveInMatrixModel()) size_t globalGridCellIndex = grid->globalGridCellIndex(fenceCellIndex);
if (activeCellInfo && activeCellInfo->isActiveInMatrixModel(globalGridCellIndex))
{ {
(*visibleCells)[fenceCellIndex] = true; (*visibleCells)[fenceCellIndex] = true;
} }