OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed more stuff to gridLocalCellIndex

Browse Source
This commit is contained in:
Jacob Støren 2014-08-08 10:07:32 +02:00 committed by Magne Sjaastad
parent 37ef1cf71c
commit 16f762984e
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@ -250,25 +250,25 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells()
std::vector<char> activeM(grid->cellCount(), 0); std::vector<char> activeM(grid->cellCount(), 0);
std::vector<char> activeF(grid->cellCount(), 0); std::vector<char> 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++) 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)) 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)) 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 activeMatrixIndex = 0;
size_t activeFractureIndex = 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++); m_unionOfMatrixActiveCells->setCellResultIndex(reservoirCellIndex, globalActiveMatrixIndex++);
activeMatrixIndex++; activeMatrixIndex++;
} }
if (activeF[localGridCellIdx] != 0) if (activeF[gridLocalCellIndex] != 0)
{ {
m_unionOfFractureActiveCells->setCellResultIndex(reservoirCellIndex, globalActiveFractureIndex++); m_unionOfFractureActiveCells->setCellResultIndex(reservoirCellIndex, globalActiveFractureIndex++);
activeFractureIndex++; activeFractureIndex++;

4
ApplicationCode/ReservoirDataModel/RigGridBase.cpp
View File

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

2
ApplicationCode/ReservoirDataModel/RigGridBase.h
View File

@ -52,7 +52,7 @@ public:
RigCell& cell(size_t gridCellIndex); RigCell& cell(size_t gridCellIndex);
const RigCell& cell(size_t gridCellIndex) const; 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 setIndexToStartOfCells(size_t indexToStartOfCells) { m_indexToStartOfCells = indexToStartOfCells; }
void setGridIndex(size_t index) { m_gridIndex = index; } void setGridIndex(size_t index) { m_gridIndex = index; }