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

Browse Source 
Renamed active to matrixActive
p4#: 20286
This commit is contained in:
Magne Sjaastad
2013-01-29 15:09:34 +01:00
parent cd9d94f5f9
commit 1c8bb6e38e
11 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -93,7 +93,7 @@ size_t RigMainGrid::numActiveCells()
size_t i;
for (i = 0; i < m_cells.size(); i++)
{
if (m_cells[i].active()) numActiveCells++;
if (m_cells[i].matrixActive()) numActiveCells++;
}
m_activeCellCount = numActiveCells;
@@ -183,7 +183,7 @@ void RigMainGrid::computeActiveAndValidCellRanges()
validBB.add(i, j, k);
}
if (c.active())
if (c.matrixActive())
{
activeBB.add(i, j, k);
}
@@ -222,7 +222,7 @@ void RigMainGrid::computeBoundingBox()
for (i = 0; i < cellCount(); i++)
{
const RigCell& c = cell(i);
if (c.active())
if (c.matrixActive())
{
const caf::SizeTArray8& indices = c.cornerIndices();
@@ -286,7 +286,7 @@ void RigMainGrid::calculateActiveCellInfo(std::vector<qint32> &gridNumber,
for (size_t cIdx = 0; cIdx < m_cells.size(); ++cIdx)
{
if (m_cells[cIdx].active())
if (m_cells[cIdx].matrixActive())
{
RigGridBase* grid = m_cells[cIdx].hostGrid();
CVF_ASSERT(grid != NULL);