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

Prepare for dual porosity data structures.

Browse Source 
Renamed from activeCellIndex to activeMatrixCellIndex
p4#: 20285
This commit is contained in:
Magne Sjaastad 2013-01-29 14:56:55 +01:00
parent 66a41c1ab9
commit cd9d94f5f9
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -114,7 +114,7 @@ bool transferGridCellData(RigMainGrid* mainGrid, RigGridBase* localGrid, const e
cell.setCellIndex(gIdx);
bool active = ecl_grid_cell_active1(localEclGrid, gIdx);
cell.setActive(active);
cell.setGlobalActiveIndex(active ? activeStartIndex + ecl_grid_get_active_index1(localEclGrid, gIdx) : cvf::UNDEFINED_SIZE_T);
cell.setGlobalMatrixActiveIndex(active ? activeStartIndex + ecl_grid_get_active_index1(localEclGrid, gIdx) : cvf::UNDEFINED_SIZE_T);
int parentCellIndex = ecl_grid_get_parent_cell1(localEclGrid, gIdx);
if (parentCellIndex == -1)

4
ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.cpp
View File

@ -140,7 +140,7 @@ void RivCellEdgeGeometryGenerator::addCellEdgeResultsToDrawableGeo(
size_t resultValueIndex = cellIndex;
if (cellScalarResultUseGlobalActiveIndex)
{
resultValueIndex = grid->cell(cellIndex).globalActiveIndex();
resultValueIndex = grid->cell(cellIndex).globalMatrixActiveIndex();
}
{
@ -169,7 +169,7 @@ void RivCellEdgeGeometryGenerator::addCellEdgeResultsToDrawableGeo(
resultValueIndex = cellIndex;
if (edgeScalarResultUseGlobalActiveIndex[cubeFaceIdx])
{
resultValueIndex = grid->cell(cellIndex).globalActiveIndex();
resultValueIndex = grid->cell(cellIndex).globalMatrixActiveIndex();
}
// Assuming static values to be mapped onto cell edge, always using time step zero

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -607,7 +607,7 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis
size_t resultValueIndex = cellIndex;
if (useGlobalActiveIndex)
{
resultValueIndex = grid->cell(cellIndex).globalActiveIndex();
resultValueIndex = grid->cell(cellIndex).globalMatrixActiveIndex();
}
double scalarValue = grid->mainGrid()->results()->cellScalarResult(timeStepIndex, scalarResultIndex, resultValueIndex);

2
ApplicationCode/ReservoirDataModel/RigCell.cpp
View File

@ -41,7 +41,7 @@ RigCell::RigCell() :
m_isActive(true),
m_isInvalid(false),
m_isWellCell(false),
m_globalActiveIndex(cvf::UNDEFINED_SIZE_T),
m_globalMatrixActiveIndex(cvf::UNDEFINED_SIZE_T),
m_cellIndex(cvf::UNDEFINED_SIZE_T)
{
memcpy(m_cornerIndices.m_array, undefinedCornersArray, 8*sizeof(size_t));

8
ApplicationCode/ReservoirDataModel/RigCell.h
View File

@ -49,8 +49,8 @@ public:
size_t cellIndex() const { return m_cellIndex; }
void setCellIndex(size_t val) { m_cellIndex = val; }
size_t globalActiveIndex() const { return m_globalActiveIndex; }
void setGlobalActiveIndex(size_t val) { m_globalActiveIndex = val; }
size_t globalMatrixActiveIndex() const { return m_globalMatrixActiveIndex; }
void setGlobalMatrixActiveIndex(size_t val) { m_globalMatrixActiveIndex = val; }
RigLocalGrid* subGrid() const { return m_subGrid; }
void setSubGrid(RigLocalGrid* subGrid) { m_subGrid = subGrid; }
@ -85,6 +85,6 @@ private:
size_t m_parentCellIndex; ///< Grid cell index of the cell in the parent grid containing this cell
size_t m_mainGridCellIndex;
size_t m_globalActiveIndex; ///< This cell's running index of all the active calls in the reservoir. Used for result mapping
size_t m_cellIndex; ///< This cells index in the grid it belongs to.
size_t m_globalMatrixActiveIndex; ///< This cell's running index of all the active calls in the reservoir. Used for result mapping
size_t m_cellIndex; ///< This cells index in the grid it belongs to.
};

2
ApplicationCode/ReservoirDataModel/RigGridBase.cpp
View File

@ -255,7 +255,7 @@ double RigGridBase::cellScalar(size_t timeStepIndex, size_t scalarSetIndex, size
bool useGlobalActiveIndex = m_mainGrid->results()->isUsingGlobalActiveIndex(scalarSetIndex);
if (useGlobalActiveIndex)
{
resultValueIndex = cell(cellIndex).globalActiveIndex();
resultValueIndex = cell(cellIndex).globalMatrixActiveIndex();
if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL;
}

4
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@ -299,7 +299,7 @@ bool RigReservoirBuilderMock::staticResult(RigReservoir* reservoir, const QStrin
values->push_back(500);
}
cell.setGlobalActiveIndex(rIdx);
cell.setGlobalMatrixActiveIndex(rIdx);
++rIdx;
}
@ -342,7 +342,7 @@ bool RigReservoirBuilderMock::dynamicResult(RigReservoir* reservoir, const QStri
values->push_back(500);
}
cell.setGlobalActiveIndex(rIdx);
cell.setGlobalMatrixActiveIndex(rIdx);
++rIdx;
}
}