diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index a5650aa826..3018d29dd4 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -482,9 +482,9 @@ void RifReaderEclipseOutput::transferNNCData( const ecl_grid_type * mainEclGrid for (int nIdx = 0; nIdx < numNNC; ++nIdx) { RigGridBase* grid1 = mainGrid->gridByIndex(eclNNCData[nIdx].grid_nr1); - mainGrid->nncData()->connections()[nIdx].m_c1GlobIdx = grid1->globalGridCellIndex(eclNNCData[nIdx].global_index1); + mainGrid->nncData()->connections()[nIdx].m_c1GlobIdx = grid1->reservoirCellIndex(eclNNCData[nIdx].global_index1); RigGridBase* grid2 = mainGrid->gridByIndex(eclNNCData[nIdx].grid_nr2); - mainGrid->nncData()->connections()[nIdx].m_c2GlobIdx = grid2->globalGridCellIndex(eclNNCData[nIdx].global_index2); + mainGrid->nncData()->connections()[nIdx].m_c2GlobIdx = grid2->reservoirCellIndex(eclNNCData[nIdx].global_index2); mainGrid->nncData()->connections()[nIdx].m_transmissibility = eclNNCData[nIdx].trans; } diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 45f83d47ea..0ac3651308 100644 --- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -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) { diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index 39492f74ec..65a8f6706a 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -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; } diff --git a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp index 5693b69ec9..85f7c999e9 100644 --- a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp +++ b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp @@ -234,8 +234,8 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList& result for (int cellIdx = 0; static_cast(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 diff --git a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp index 7555ad8c4d..29c563a25e 100644 --- a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp @@ -39,8 +39,8 @@ double RigActiveCellsResultAccessor::cellScalar(size_t gridLocalCellIndex) const { if (m_reservoirResultValues == NULL || m_reservoirResultValues->size() == 0 ) return HUGE_VAL; - size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex); - size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex); + size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex); + size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex); if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL; CVF_TIGHT_ASSERT(resultValueIndex < m_reservoirResultValues->size()); diff --git a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp index 14b7b30a3c..247ef7f953 100644 --- a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp @@ -39,10 +39,10 @@ double RigAllGridCellsResultAccessor::cellScalar(size_t gridLocalCellIndex) cons { if (m_reservoirResultValues->size() == 0 ) return HUGE_VAL; - size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex); - CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size()); + size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex); + CVF_TIGHT_ASSERT(reservoirCellIndex < m_reservoirResultValues->size()); - return m_reservoirResultValues->at(globalGridCellIndex); + return m_reservoirResultValues->at(reservoirCellIndex); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp index 34830722fd..1d5619f87b 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp @@ -166,9 +166,9 @@ void RigCaseData::computeWellCellsPrGrid() if (gridIndex < m_wellCellsInGrid.size() && gridCellIndex < m_wellCellsInGrid[gridIndex]->size()) { - size_t globalGridCellIndex = grids[gridIndex]->globalGridCellIndex(gridCellIndex); - if (m_activeCellInfo->isActive(globalGridCellIndex) - || m_fractureActiveCellInfo->isActive(globalGridCellIndex)) + size_t reservoirCellIndex = grids[gridIndex]->reservoirCellIndex(gridCellIndex); + if (m_activeCellInfo->isActive(reservoirCellIndex) + || m_fractureActiveCellInfo->isActive(reservoirCellIndex)) { m_wellCellsInGrid[gridIndex]->set(gridCellIndex, true); m_gridCellToWellIndex[gridIndex]->set(gridCellIndex, static_cast(wIdx)); diff --git a/ApplicationCode/ReservoirDataModel/RigFault.cpp b/ApplicationCode/ReservoirDataModel/RigFault.cpp index 476f2d1f4c..0db6f08c90 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 reservoirCellIndex = grid->globalGridCellIndex(gridLocalCellIndex); + //size_t reservoirCellIndex = grid->reservoirCellIndex(gridLocalCellIndex); size_t ni, nj, nk; mainGrid->neighborIJKAtCellFace(i, j, k, faceEnum, &ni, &nj, &nk); diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp index 42036ff6a0..6f145298a4 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp +++ b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp @@ -368,7 +368,7 @@ double RigGridBase::characteristicIJCellSize() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigGridBase::globalGridCellIndex(size_t gridLocalCellIndex) const +size_t RigGridBase::reservoirCellIndex(size_t gridLocalCellIndex) const { return m_indexToStartOfCells + gridLocalCellIndex; } diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.h b/ApplicationCode/ReservoirDataModel/RigGridBase.h index e2819dec68..c9ce6d8c54 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 gridLocalCellIndex) const; + size_t reservoirCellIndex(size_t gridLocalCellIndex) const; void setIndexToStartOfCells(size_t indexToStartOfCells) { m_indexToStartOfCells = indexToStartOfCells; } void setGridIndex(size_t index) { m_gridIndex = index; } diff --git a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp index 4bbdea1cb9..dc58bf21c3 100644 --- a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp +++ b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp @@ -259,7 +259,7 @@ void RigMainGrid::calculateFaults() continue; } - neighborGlobalCellIdx = hostGrid->globalGridCellIndex(neighborGridCellIdx); + neighborGlobalCellIdx = hostGrid->reservoirCellIndex(neighborGridCellIdx); if (m_cells[neighborGlobalCellIdx].isInvalid()) { continue; diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp index 41c30f3fc7..d44ffc0dfb 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp @@ -176,10 +176,10 @@ double RigGridAllCellsScalarDataAccess::cellScalar(size_t gridLocalCellIndex) co { if (m_reservoirResultValues->size() == 0 ) return HUGE_VAL; - size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex); - CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size()); + size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex); + CVF_TIGHT_ASSERT(reservoirCellIndex < m_reservoirResultValues->size()); - return m_reservoirResultValues->at(globalGridCellIndex); + return m_reservoirResultValues->at(reservoirCellIndex); } //-------------------------------------------------------------------------------------------------- @@ -187,10 +187,10 @@ double RigGridAllCellsScalarDataAccess::cellScalar(size_t gridLocalCellIndex) co //-------------------------------------------------------------------------------------------------- void RigGridAllCellsScalarDataAccess::setCellScalar(size_t gridLocalCellIndex, double scalarValue) { - size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex); - CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size()); + size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex); + CVF_TIGHT_ASSERT(reservoirCellIndex < m_reservoirResultValues->size()); - (*m_reservoirResultValues)[globalGridCellIndex] = scalarValue; + (*m_reservoirResultValues)[reservoirCellIndex] = scalarValue; } //-------------------------------------------------------------------------------------------------- @@ -212,8 +212,8 @@ public: { if (m_reservoirResultValues == NULL || m_reservoirResultValues->size() == 0 ) return HUGE_VAL; - size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex); - size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex); + size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex); + size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex); if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL; CVF_TIGHT_ASSERT(resultValueIndex < m_reservoirResultValues->size()); @@ -226,8 +226,8 @@ public: //-------------------------------------------------------------------------------------------------- virtual void setCellScalar(size_t gridLocalCellIndex, double scalarValue) { - size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex); - size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex); + size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex); + size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex); CVF_TIGHT_ASSERT(m_reservoirResultValues != NULL && resultValueIndex < m_reservoirResultValues->size()); diff --git a/ApplicationCode/ReservoirDataModel/RigResultModifier.h b/ApplicationCode/ReservoirDataModel/RigResultModifier.h index 4c9d8d7dc1..651d12c4fe 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultModifier.h +++ b/ApplicationCode/ReservoirDataModel/RigResultModifier.h @@ -47,10 +47,10 @@ public: virtual void setCellScalar(size_t gridLocalCellIndex, double scalarValue) { - size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex); - CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size()); + size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex); + CVF_TIGHT_ASSERT(reservoirCellIndex < m_reservoirResultValues->size()); - (*m_reservoirResultValues)[globalGridCellIndex] = scalarValue; + (*m_reservoirResultValues)[reservoirCellIndex] = scalarValue; } private: @@ -74,8 +74,8 @@ public: virtual void setCellScalar(size_t gridLocalCellIndex, double scalarValue) { - size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex); - size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex); + size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex); + size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex); CVF_TIGHT_ASSERT(m_reservoirResultValues != NULL && resultValueIndex < m_reservoirResultValues->size());