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 cellindex to gridLocalCellIndex

Browse Source
This commit is contained in:
Jacob Støren 2014-08-22 08:01:31 +02:00
parent 03df28282c
commit 9e22c90a4a
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -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

4
ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp
View File

@ -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];
}

4
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -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))

2
ApplicationCode/ReservoirDataModel/RigCell.cpp
View File

@ -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));

6
ApplicationCode/ReservoirDataModel/RigCell.h
View File

@ -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;

2
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@ -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;
}

4
ApplicationCode/ReservoirDataModel/RigNNCData.cpp
View File

@ -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);

2
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@ -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;