From 16f762984ece0c22e0d4095dd1fda7abf0e3f693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Fri, 8 Aug 2014 10:07:32 +0200 Subject: [PATCH] Renamed more stuff to gridLocalCellIndex --- .../RimIdenticalGridCaseGroup.cpp | 20 +++++++++---------- .../ReservoirDataModel/RigGridBase.cpp | 4 ++-- .../ReservoirDataModel/RigGridBase.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 91c67b2af9..45f83d47ea 100644 --- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -250,25 +250,25 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells() std::vector activeM(grid->cellCount(), 0); std::vector activeF(grid->cellCount(), 0); - for (size_t localGridCellIdx = 0; localGridCellIdx < grid->cellCount(); localGridCellIdx++) + for (size_t gridLocalCellIndex = 0; gridLocalCellIndex < grid->cellCount(); gridLocalCellIndex++) { for (size_t caseIdx = 0; caseIdx < caseCollection->reservoirs.size(); caseIdx++) { - size_t reservoirCellIndex = grid->globalGridCellIndex(localGridCellIdx); + size_t reservoirCellIndex = grid->globalGridCellIndex(gridLocalCellIndex); - if (activeM[localGridCellIdx] == 0) + if (activeM[gridLocalCellIndex] == 0) { if (caseCollection->reservoirs[caseIdx]->reservoirData()->activeCellInfo(RifReaderInterface::MATRIX_RESULTS)->isActive(reservoirCellIndex)) { - activeM[localGridCellIdx] = 1; + activeM[gridLocalCellIndex] = 1; } } - if (activeF[localGridCellIdx] == 0) + if (activeF[gridLocalCellIndex] == 0) { if (caseCollection->reservoirs[caseIdx]->reservoirData()->activeCellInfo(RifReaderInterface::FRACTURE_RESULTS)->isActive(reservoirCellIndex)) { - activeF[localGridCellIdx] = 1; + activeF[gridLocalCellIndex] = 1; } } } @@ -277,17 +277,17 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells() size_t activeMatrixIndex = 0; size_t activeFractureIndex = 0; - for (size_t localGridCellIdx = 0; localGridCellIdx < grid->cellCount(); localGridCellIdx++) + for (size_t gridLocalCellIndex = 0; gridLocalCellIndex < grid->cellCount(); gridLocalCellIndex++) { - size_t reservoirCellIndex = grid->globalGridCellIndex(localGridCellIdx); + size_t reservoirCellIndex = grid->globalGridCellIndex(gridLocalCellIndex); - if (activeM[localGridCellIdx] != 0) + if (activeM[gridLocalCellIndex] != 0) { m_unionOfMatrixActiveCells->setCellResultIndex(reservoirCellIndex, globalActiveMatrixIndex++); activeMatrixIndex++; } - if (activeF[localGridCellIdx] != 0) + if (activeF[gridLocalCellIndex] != 0) { m_unionOfFractureActiveCells->setCellResultIndex(reservoirCellIndex, globalActiveFractureIndex++); activeFractureIndex++; diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp index 1342059660..42036ff6a0 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp +++ b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp @@ -368,9 +368,9 @@ double RigGridBase::characteristicIJCellSize() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigGridBase::globalGridCellIndex(size_t localGridCellIndex) const +size_t RigGridBase::globalGridCellIndex(size_t gridLocalCellIndex) const { - return m_indexToStartOfCells + localGridCellIndex; + return m_indexToStartOfCells + gridLocalCellIndex; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.h b/ApplicationCode/ReservoirDataModel/RigGridBase.h index a8285ad227..e2819dec68 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridBase.h +++ b/ApplicationCode/ReservoirDataModel/RigGridBase.h @@ -52,7 +52,7 @@ public: RigCell& cell(size_t gridCellIndex); const RigCell& cell(size_t gridCellIndex) const; - size_t globalGridCellIndex(size_t localGridCellIndex) const; + size_t globalGridCellIndex(size_t gridLocalCellIndex) const; void setIndexToStartOfCells(size_t indexToStartOfCells) { m_indexToStartOfCells = indexToStartOfCells; } void setGridIndex(size_t index) { m_gridIndex = index; }