From 9e22c90a4a643d964d9831c4036aeaff828f60d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Fri, 22 Aug 2014 08:01:31 +0200 Subject: [PATCH] Renamed cellindex to gridLocalCellIndex --- ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp | 2 +- .../ModelVisualization/RivNNCGeometryGenerator.cpp | 4 ++-- ApplicationCode/ProjectDataModel/RimReservoirView.cpp | 4 ++-- ApplicationCode/ReservoirDataModel/RigCell.cpp | 2 +- ApplicationCode/ReservoirDataModel/RigCell.h | 6 +++--- ApplicationCode/ReservoirDataModel/RigMainGrid.cpp | 2 +- ApplicationCode/ReservoirDataModel/RigNNCData.cpp | 4 ++-- .../ReservoirDataModel/RigReservoirBuilderMock.cpp | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index 48b56da2ae..a004f1aedb 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -116,7 +116,7 @@ bool transferGridCellData(RigMainGrid* mainGrid, RigActiveCellInfo* activeCellIn { RigCell& cell = mainGrid->cells()[cellStartIndex + gridLocalCellIndex]; - cell.setCellIndex(gridLocalCellIndex); + cell.setGridLocalCellIndex(gridLocalCellIndex); // Active cell index diff --git a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp index f146190167..2e70f368d2 100644 --- a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp +++ b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp @@ -98,13 +98,13 @@ void RivNNCGeometryGenerator::computeArrays() if ((*allCells)[conn.m_c1GlobIdx].hostGrid() == m_grid.p()) { - size_t cell1GridLocalIdx = (*allCells)[conn.m_c1GlobIdx].cellIndex(); + size_t cell1GridLocalIdx = (*allCells)[conn.m_c1GlobIdx].gridLocalCellIndex(); cell1Visible = (*m_cellVisibility)[cell1GridLocalIdx]; } if ((*allCells)[conn.m_c2GlobIdx].hostGrid() == m_grid.p()) { - size_t cell2GridLocalIdx = (*allCells)[conn.m_c2GlobIdx].cellIndex(); + size_t cell2GridLocalIdx = (*allCells)[conn.m_c2GlobIdx].gridLocalCellIndex(); cell2Visible = (*m_cellVisibility)[cell2GridLocalIdx]; } diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index 8cdfe90c12..ca375bfcbd 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -1828,7 +1828,7 @@ void RimReservoirView::appendNNCResultInfo(size_t nncIndex, QString* resultInfo) const RigCell& cell = grid->cells()[conn.m_c1GlobIdx]; RigGridBase* hostGrid = cell.hostGrid(); - size_t gridLocalCellIndex = cell.cellIndex(); + size_t gridLocalCellIndex = cell.gridLocalCellIndex(); size_t i, j, k; if (hostGrid->ijkFromCellIndex(gridLocalCellIndex, &i, &j, &k)) @@ -1850,7 +1850,7 @@ void RimReservoirView::appendNNCResultInfo(size_t nncIndex, QString* resultInfo) const RigCell& cell = grid->cells()[conn.m_c2GlobIdx]; RigGridBase* hostGrid = cell.hostGrid(); - size_t gridLocalCellIndex = cell.cellIndex(); + size_t gridLocalCellIndex = cell.gridLocalCellIndex(); size_t i, j, k; if (hostGrid->ijkFromCellIndex(gridLocalCellIndex, &i, &j, &k)) diff --git a/ApplicationCode/ReservoirDataModel/RigCell.cpp b/ApplicationCode/ReservoirDataModel/RigCell.cpp index e2b6f49427..730328b7db 100644 --- a/ApplicationCode/ReservoirDataModel/RigCell.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCell.cpp @@ -41,7 +41,7 @@ RigCell::RigCell() : m_subGrid(NULL), m_hostGrid(NULL), m_isInvalid(false), - m_cellIndex(cvf::UNDEFINED_SIZE_T), + m_gridLocalCellIndex(cvf::UNDEFINED_SIZE_T), m_coarseningBoxIndex(cvf::UNDEFINED_SIZE_T) { memcpy(m_cornerIndices.data(), undefinedCornersArray, 8*sizeof(size_t)); diff --git a/ApplicationCode/ReservoirDataModel/RigCell.h b/ApplicationCode/ReservoirDataModel/RigCell.h index 1a7475594d..7108a12452 100644 --- a/ApplicationCode/ReservoirDataModel/RigCell.h +++ b/ApplicationCode/ReservoirDataModel/RigCell.h @@ -41,8 +41,8 @@ public: bool isInvalid() const { return m_isInvalid; } void setInvalid( bool val ) { m_isInvalid = val; } - size_t cellIndex() const { return m_cellIndex; } - void setCellIndex(size_t val) { m_cellIndex = val; } + size_t gridLocalCellIndex() const { return m_gridLocalCellIndex; } + void setGridLocalCellIndex(size_t val) { m_gridLocalCellIndex = val; } RigLocalGrid* subGrid() const { return m_subGrid; } void setSubGrid(RigLocalGrid* subGrid) { m_subGrid = subGrid; } @@ -70,7 +70,7 @@ public: private: caf::SizeTArray8 m_cornerIndices; - size_t m_cellIndex; ///< This cells index in the grid it belongs to. + size_t m_gridLocalCellIndex; ///< This cells index in the grid it belongs to. RigGridBase* m_hostGrid; RigLocalGrid* m_subGrid; diff --git a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp index b5e79a750d..0c1916477b 100644 --- a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp +++ b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp @@ -251,7 +251,7 @@ void RigMainGrid::calculateFaults() if (firstNO_FAULTFaceForCell) // To avoid doing this for every face, and only when detecting a NO_FAULT { hostGrid = m_cells[gcIdx].hostGrid(); - hostGrid->ijkFromCellIndex(m_cells[gcIdx].cellIndex(), &i,&j, &k); + hostGrid->ijkFromCellIndex(m_cells[gcIdx].gridLocalCellIndex(), &i,&j, &k); firstNO_FAULTFaceForCell = false; } diff --git a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp index 128c4f66b9..b45f81b289 100644 --- a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp @@ -50,9 +50,9 @@ void RigNNCData::processConnections(const RigMainGrid& mainGrid) if (c1.hostGrid() == c2.hostGrid()) { size_t i1, j1, k1; - c1.hostGrid()->ijkFromCellIndex(c1.cellIndex(), &i1, &j1, &k1); + c1.hostGrid()->ijkFromCellIndex(c1.gridLocalCellIndex(), &i1, &j1, &k1); size_t i2, j2, k2; - c2.hostGrid()->ijkFromCellIndex(c2.cellIndex(), &i2, &j2, &k2); + c2.hostGrid()->ijkFromCellIndex(c2.gridLocalCellIndex(), &i2, &j2, &k2); isPossibleNeighborInDirection[cvf::StructGridInterface::POS_I] = ((i1 + 1) == i2); diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp index 3aaf9469f7..05b3f5c651 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp @@ -146,7 +146,7 @@ void RigReservoirBuilderMock::appendCells(size_t nodeStartIndex, size_t cellCoun RigCell& riCell = cells[cellIndexStart + i]; riCell.setHostGrid(hostGrid); - riCell.setCellIndex(i); + riCell.setGridLocalCellIndex(i); riCell.cornerIndices()[0] = nodeStartIndex + i * 8 + 0; riCell.cornerIndices()[1] = nodeStartIndex + i * 8 + 1;