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

Renamed globalGridCellIndex to reservoirCellIndex

Browse Source
This commit is contained in:
Jacob Støren
2014-08-08 10:16:54 +02:00
committed by Magne Sjaastad
parent 16f762984e
commit 6cdd9cfdc5
13 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@@ -254,7 +254,7 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells()
{
for (size_t caseIdx = 0; caseIdx < caseCollection->reservoirs.size(); caseIdx++)
{
size_t reservoirCellIndex = grid->globalGridCellIndex(gridLocalCellIndex);
size_t reservoirCellIndex = grid->reservoirCellIndex(gridLocalCellIndex);
if (activeM[gridLocalCellIndex] == 0)
{
@@ -279,7 +279,7 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells()
for (size_t gridLocalCellIndex = 0; gridLocalCellIndex < grid->cellCount(); gridLocalCellIndex++)
{
size_t reservoirCellIndex = grid->globalGridCellIndex(gridLocalCellIndex);
size_t reservoirCellIndex = grid->reservoirCellIndex(gridLocalCellIndex);
if (activeM[gridLocalCellIndex] != 0)
{

8
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -1641,9 +1641,9 @@ void RimReservoirView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibl
if (wellResFrames[wfIdx].m_wellHead.m_gridIndex == grid->gridIndex())
{
size_t gridCellIndex = wellResFrames[wfIdx].m_wellHead.m_gridCellIndex;
size_t globalGridCellIndex = grid->globalGridCellIndex(gridCellIndex);
size_t reservoirCellIndex = grid->reservoirCellIndex(gridCellIndex);
if (activeCellInfo->isActive(globalGridCellIndex))
if (activeCellInfo->isActive(reservoirCellIndex))
{
(*visibleCells)[gridCellIndex] = true;
}
@@ -1698,9 +1698,9 @@ void RimReservoirView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibl
for ( fIdx = 0; fIdx < cellCountFenceDirection; ++fIdx)
{
size_t fenceCellIndex = grid->cellIndexFromIJK(*pI,*pJ,*pK);
size_t globalGridCellIndex = grid->globalGridCellIndex(fenceCellIndex);
size_t reservoirCellIndex = grid->reservoirCellIndex(fenceCellIndex);
if (activeCellInfo && activeCellInfo->isActive(globalGridCellIndex))
if (activeCellInfo && activeCellInfo->isActive(reservoirCellIndex))
{
(*visibleCells)[fenceCellIndex] = true;
}

4
ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
View File

@@ -234,8 +234,8 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>& result
for (int cellIdx = 0; static_cast<size_t>(cellIdx) < grid->cellCount(); cellIdx++)
{
size_t globalGridCellIdx = grid->globalGridCellIndex(cellIdx);
if (m_destinationCase->activeCellInfo(poroModel)->isActive(globalGridCellIdx))
size_t reservoirCellIndex = grid->reservoirCellIndex(cellIdx);
if (m_destinationCase->activeCellInfo(poroModel)->isActive(reservoirCellIndex))
{
// Extract the cell values from each of the cases and assemble them into one vector