diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index e3fa51f9af..7c31d28ce4 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -562,11 +562,11 @@ void RivReservoirViewPartMgr::computeNativeVisibility(cvf::UByteArray* cellVisib for (int cellIndex = 0; cellIndex < static_cast(grid->cellCount()); cellIndex++) { const RigCell& cell = grid->cell(cellIndex); - size_t globalCellIndex = cell.mainGridCellIndex(); + size_t reservoirCellIndex = cell.mainGridCellIndex(); if ( !invalidCellsIsVisible && cell.isInvalid() - || !inactiveCellsIsVisible && !activeCellInfo->isActive(globalCellIndex) - || !activeCellsIsVisible && activeCellInfo->isActive(globalCellIndex) + || !inactiveCellsIsVisible && !activeCellInfo->isActive(reservoirCellIndex) + || !activeCellsIsVisible && activeCellInfo->isActive(reservoirCellIndex) //|| mainGridIsVisible && (cell.subGrid() != NULL) // this is handled on global level instead || (*cellIsInWellStatuses)[cellIndex] ) diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 442dd7886f..91c67b2af9 100644 --- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -254,11 +254,11 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells() { for (size_t caseIdx = 0; caseIdx < caseCollection->reservoirs.size(); caseIdx++) { - size_t globalCellIdx = grid->globalGridCellIndex(localGridCellIdx); + size_t reservoirCellIndex = grid->globalGridCellIndex(localGridCellIdx); if (activeM[localGridCellIdx] == 0) { - if (caseCollection->reservoirs[caseIdx]->reservoirData()->activeCellInfo(RifReaderInterface::MATRIX_RESULTS)->isActive(globalCellIdx)) + if (caseCollection->reservoirs[caseIdx]->reservoirData()->activeCellInfo(RifReaderInterface::MATRIX_RESULTS)->isActive(reservoirCellIndex)) { activeM[localGridCellIdx] = 1; } @@ -266,7 +266,7 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells() if (activeF[localGridCellIdx] == 0) { - if (caseCollection->reservoirs[caseIdx]->reservoirData()->activeCellInfo(RifReaderInterface::FRACTURE_RESULTS)->isActive(globalCellIdx)) + if (caseCollection->reservoirs[caseIdx]->reservoirData()->activeCellInfo(RifReaderInterface::FRACTURE_RESULTS)->isActive(reservoirCellIndex)) { activeF[localGridCellIdx] = 1; } @@ -279,17 +279,17 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells() for (size_t localGridCellIdx = 0; localGridCellIdx < grid->cellCount(); localGridCellIdx++) { - size_t globalCellIdx = grid->globalGridCellIndex(localGridCellIdx); + size_t reservoirCellIndex = grid->globalGridCellIndex(localGridCellIdx); if (activeM[localGridCellIdx] != 0) { - m_unionOfMatrixActiveCells->setCellResultIndex(globalCellIdx, globalActiveMatrixIndex++); + m_unionOfMatrixActiveCells->setCellResultIndex(reservoirCellIndex, globalActiveMatrixIndex++); activeMatrixIndex++; } if (activeF[localGridCellIdx] != 0) { - m_unionOfFractureActiveCells->setCellResultIndex(globalCellIdx, globalActiveFractureIndex++); + m_unionOfFractureActiveCells->setCellResultIndex(reservoirCellIndex, globalActiveFractureIndex++); activeFractureIndex++; } } diff --git a/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.cpp b/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.cpp index b58b17c5d4..7e9c07b5a3 100644 --- a/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.cpp +++ b/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.cpp @@ -58,41 +58,41 @@ size_t RigActiveCellInfo::globalCellResultCount() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigActiveCellInfo::isActive(size_t globalCellIndex) const +bool RigActiveCellInfo::isActive(size_t reservoirCellIndex) const { if (m_cellIndexToResultIndex.size() == 0) { return true; } - CVF_TIGHT_ASSERT(globalCellIndex < m_cellIndexToResultIndex.size()); + CVF_TIGHT_ASSERT(reservoirCellIndex < m_cellIndexToResultIndex.size()); - return m_cellIndexToResultIndex[globalCellIndex] != cvf::UNDEFINED_SIZE_T; + return m_cellIndexToResultIndex[reservoirCellIndex] != cvf::UNDEFINED_SIZE_T; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigActiveCellInfo::cellResultIndex(size_t globalCellIndex) const +size_t RigActiveCellInfo::cellResultIndex(size_t reservoirCellIndex) const { if (m_cellIndexToResultIndex.size() == 0) { - return globalCellIndex; + return reservoirCellIndex; } - CVF_TIGHT_ASSERT(globalCellIndex < m_cellIndexToResultIndex.size()); + CVF_TIGHT_ASSERT(reservoirCellIndex < m_cellIndexToResultIndex.size()); - return m_cellIndexToResultIndex[globalCellIndex]; + return m_cellIndexToResultIndex[reservoirCellIndex]; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigActiveCellInfo::setCellResultIndex(size_t globalCellIndex, size_t globalCellResultIndex) +void RigActiveCellInfo::setCellResultIndex(size_t reservoirCellIndex, size_t globalCellResultIndex) { CVF_TIGHT_ASSERT(globalCellResultIndex < m_cellIndexToResultIndex.size()); - m_cellIndexToResultIndex[globalCellIndex] = globalCellResultIndex; + m_cellIndexToResultIndex[reservoirCellIndex] = globalCellResultIndex; if (globalCellResultIndex >= m_globalCellResultCount) { diff --git a/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.h b/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.h index cbe11c9b8c..562d4e1074 100644 --- a/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.h +++ b/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.h @@ -38,9 +38,9 @@ public: size_t globalCellResultCount() const; bool isCoarseningActive() const; - bool isActive(size_t globalCellIndex) const; - size_t cellResultIndex(size_t globalCellIndex) const; - void setCellResultIndex(size_t globalCellIndex, size_t globalResultCellIndex); + bool isActive(size_t reservoirCellIndex) const; + size_t cellResultIndex(size_t reservoirCellIndex) const; + void setCellResultIndex(size_t reservoirCellIndex, size_t globalResultCellIndex); void setGridCount(size_t gridCount); void setGridActiveCellCounts(size_t gridIndex, size_t activeCellCount); diff --git a/ApplicationCode/ReservoirDataModel/RigFault.cpp b/ApplicationCode/ReservoirDataModel/RigFault.cpp index 8d9cfc5560..476f2d1f4c 100644 --- a/ApplicationCode/ReservoirDataModel/RigFault.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFault.cpp @@ -115,7 +115,7 @@ void RigFault::computeFaultFacesFromCellRanges(const RigMainGrid* mainGrid) } // Do not need to compute global grid cell index as for a maingrid localIndex == globalIndex - //size_t globalCellIndex = grid->globalGridCellIndex(gridLocalCellIndex); + //size_t reservoirCellIndex = grid->globalGridCellIndex(gridLocalCellIndex); size_t ni, nj, nk; mainGrid->neighborIJKAtCellFace(i, j, k, faceEnum, &ni, &nj, &nk); diff --git a/ApplicationCode/ReservoirDataModel/RigFault.h b/ApplicationCode/ReservoirDataModel/RigFault.h index 39198b5feb..b4a31c9ad3 100644 --- a/ApplicationCode/ReservoirDataModel/RigFault.h +++ b/ApplicationCode/ReservoirDataModel/RigFault.h @@ -46,14 +46,14 @@ public: m_faultIdxForCellFace.resize(globalCellCount, initVal); } - inline int faultIdx(size_t globalCellIdx, cvf::StructGridInterface::FaceType face) + inline int faultIdx(size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face) { - return m_faultIdxForCellFace[globalCellIdx][face]; + return m_faultIdxForCellFace[reservoirCellIndex][face]; } - inline void setFaultIdx(size_t globalCellIdx, cvf::StructGridInterface::FaceType face, int faultIdx) + inline void setFaultIdx(size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face, int faultIdx) { - m_faultIdxForCellFace[globalCellIdx][face] = faultIdx; + m_faultIdxForCellFace[reservoirCellIndex][face] = faultIdx; } private: diff --git a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp index c5da5e45de..f6b619fbdc 100644 --- a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp @@ -164,12 +164,12 @@ void RigNNCData::processConnections(const RigMainGrid& mainGrid) //-------------------------------------------------------------------------------------------------- /// TODO: Possibly not needed ! //-------------------------------------------------------------------------------------------------- -const std::vector& RigNNCData::findConnectionIndices( size_t globalCellIndex, cvf::StructGridInterface::FaceType face) const +const std::vector& RigNNCData::findConnectionIndices( size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face) const { ConnectionSearchMap::const_iterator it; static std::vector empty; - it = m_cellIdxToFaceToConnectionIdxMap.find(globalCellIndex); + it = m_cellIdxToFaceToConnectionIdxMap.find(reservoirCellIndex); if (it != m_cellIdxToFaceToConnectionIdxMap.end()) { return it->second[face]; diff --git a/ApplicationCode/ReservoirDataModel/RigNNCData.h b/ApplicationCode/ReservoirDataModel/RigNNCData.h index ca4b9bf54d..bbad5e3fe7 100644 --- a/ApplicationCode/ReservoirDataModel/RigNNCData.h +++ b/ApplicationCode/ReservoirDataModel/RigNNCData.h @@ -63,7 +63,7 @@ public: const std::vector& connections() const { return m_connections; }; private: // This section is possibly not needed - //const std::vector& findConnectionIndices(size_t globalCellIndex, cvf::StructGridInterface::FaceType face) const; + //const std::vector& findConnectionIndices(size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face) const; //typedef std::map, 7 > > ConnectionSearchMap; //ConnectionSearchMap m_cellIdxToFaceToConnectionIdxMap; diff --git a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp index 567dc990eb..7a07f09d4a 100644 --- a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp @@ -177,11 +177,11 @@ public: { quint64 valueIndex = 0; - for (size_t globalCellIdx = 0; globalCellIdx < mainGrid->cells().size(); globalCellIdx++) + for (size_t reservoirCellIndex = 0; reservoirCellIndex < mainGrid->cells().size(); reservoirCellIndex++) { - if (!actCellInfo->isActive(globalCellIdx)) continue; + if (!actCellInfo->isActive(reservoirCellIndex)) continue; - cvf::Vec3d center = mainGrid->cells()[globalCellIdx].center(); + cvf::Vec3d center = mainGrid->cells()[reservoirCellIndex].center(); doubleValues[valueIndex++] = center[coordIdx]; } @@ -351,11 +351,11 @@ public: quint64 valueIndex = 0; - for (size_t globalCellIdx = 0; globalCellIdx < mainGrid->cells().size(); globalCellIdx++) + for (size_t reservoirCellIndex = 0; reservoirCellIndex < mainGrid->cells().size(); reservoirCellIndex++) { - if (!actCellInfo->isActive(globalCellIdx)) continue; + if (!actCellInfo->isActive(reservoirCellIndex)) continue; - mainGrid->cellCornerVertices(globalCellIdx, cornerVerts); + mainGrid->cellCornerVertices(reservoirCellIndex, cornerVerts); doubleValues[valueIndex++] = cornerVerts[cornerIndexMapping][coordIdx]; }