Rename from cells to globalCellArray

This commit is contained in:
Magne Sjaastad
2015-11-24 14:21:02 +01:00
parent 1890ff19f9
commit 9429458d32
24 changed files with 64 additions and 64 deletions

View File

@@ -171,7 +171,7 @@ public:
hostCellK.reserve(numMatrixModelActiveCells);
globalCoarseningBoxIdx.reserve(numMatrixModelActiveCells);
const std::vector<RigCell>& reservoirCells = reservoirCase->reservoirData()->mainGrid()->cells();
const std::vector<RigCell>& reservoirCells = reservoirCase->reservoirData()->mainGrid()->globalCellArray();
std::vector<size_t> globalCoarseningBoxIndexStart;

View File

@@ -178,11 +178,11 @@ public:
{
quint64 valueIndex = 0;
for (size_t reservoirCellIndex = 0; reservoirCellIndex < mainGrid->cells().size(); reservoirCellIndex++)
for (size_t reservoirCellIndex = 0; reservoirCellIndex < mainGrid->globalCellArray().size(); reservoirCellIndex++)
{
if (!actCellInfo->isActive(reservoirCellIndex)) continue;
cvf::Vec3d center = mainGrid->cells()[reservoirCellIndex].center();
cvf::Vec3d center = mainGrid->globalCellArray()[reservoirCellIndex].center();
doubleValues[valueIndex++] = center[coordIdx];
}
@@ -352,7 +352,7 @@ public:
quint64 valueIndex = 0;
for (size_t reservoirCellIndex = 0; reservoirCellIndex < mainGrid->cells().size(); reservoirCellIndex++)
for (size_t reservoirCellIndex = 0; reservoirCellIndex < mainGrid->globalCellArray().size(); reservoirCellIndex++)
{
if (!actCellInfo->isActive(reservoirCellIndex)) continue;

View File

@@ -949,7 +949,7 @@ public:
// The size of this array must match the test in RigCaseCellResultsData::isUsingGlobalActiveIndex(),
// as it is used to determine if we have data for active cells or all cells
// See RigCaseCellResultsData::isUsingGlobalActiveIndex()
size_t totalNumberOfCellsIncludingLgrCells = grid->mainGrid()->cells().size();
size_t totalNumberOfCellsIncludingLgrCells = grid->mainGrid()->globalCellArray().size();
m_scalarResultsToAdd->at(tsId).resize(totalNumberOfCellsIncludingLgrCells, HUGE_VAL);
}