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

2
ApplicationCode/ReservoirDataModel/RigCell.cpp
View File

@@ -38,7 +38,7 @@ RigCell::RigCell() :
m_mainGridCellIndex(cvf::UNDEFINED_SIZE_T),
m_subGrid(NULL),
m_hostGrid(NULL),
m_isActive(true),
m_isMatrixActive(true),
m_isInvalid(false),
m_isWellCell(false),
m_globalMatrixActiveIndex(cvf::UNDEFINED_SIZE_T),

6
ApplicationCode/ReservoirDataModel/RigCell.h
View File

@@ -37,8 +37,8 @@ public:
caf::SizeTArray8& cornerIndices() { return m_cornerIndices;}
const caf::SizeTArray8& cornerIndices() const { return m_cornerIndices;}
bool active() const { return m_isActive; }
void setActive(bool val) { m_isActive = val; }
bool matrixActive() const { return m_isMatrixActive; }
void setMatrixActive(bool val) { m_isMatrixActive = val; }
bool isInvalid() const { return m_isInvalid; }
void setInvalid( bool val ) { m_isInvalid = val; }
@@ -73,7 +73,7 @@ public:
private:
caf::SizeTArray8 m_cornerIndices;
bool m_isActive;
bool m_isMatrixActive;
bool m_isInvalid;
bool m_isWellCell;

2
ApplicationCode/ReservoirDataModel/RigGridBase.cpp
View File

@@ -357,7 +357,7 @@ bool RigGridBase::isCellActive(size_t i, size_t j, size_t k) const
{
size_t idx = cellIndexFromIJK(i, j, k);
const RigCell& c = cell(idx);
if (!c.active() || c.isInvalid())
if (!c.matrixActive() || c.isInvalid())
{
return false;
}

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

6
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@@ -152,7 +152,7 @@ void RigReservoirBuilderMock::appendCells(size_t nodeStartIndex, size_t cellCoun
riCell.cornerIndices()[7] = nodeStartIndex + i * 8 + 7;
riCell.setParentCellIndex(0);
if (!(i % 5)) riCell.setActive(false);
if (!(i % 5)) riCell.setMatrixActive(false);
cells.push_back(riCell);
}
@@ -288,7 +288,7 @@ bool RigReservoirBuilderMock::staticResult(RigReservoir* reservoir, const QStrin
for (k = 0; k < reservoir->mainGrid()->cells().size(); k++)
{
RigCell& cell = reservoir->mainGrid()->cells()[k];
if (cell.active())
if (cell.matrixActive())
{
if (cell.hostGrid() == reservoir->mainGrid())
{
@@ -330,7 +330,7 @@ bool RigReservoirBuilderMock::dynamicResult(RigReservoir* reservoir, const QStri
for (k = 0; k < reservoir->mainGrid()->cells().size(); k++)
{
RigCell& cell = reservoir->mainGrid()->cells()[k];
if (cell.active())
if (cell.matrixActive())
{
if (cell.hostGrid() == reservoir->mainGrid())
{

2
ApplicationCode/ReservoirDataModel/RigReservoirCellResults.cpp
View File

@@ -519,7 +519,7 @@ void RigReservoirCellResults::computeDepthRelatedResults()
{
const RigCell& cell = m_ownerMainGrid->cells()[cellIdx];
if (computeValuesForActiveCellsOnly && !cell.active())
if (computeValuesForActiveCellsOnly && !cell.matrixActive())
{
continue;
}