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

4
ApplicationCode/ProjectDataModel/RimInputReservoir.cpp
View File

@@ -377,12 +377,12 @@ cvf::ref<RifReaderInterface> RimInputReservoir::createMockModel(QString modelNam
mockFileInterface->open("", reservoir.p());
{
size_t idx = reservoir->mainGrid()->cellIndexFromIJK(1, 3, 4);
reservoir->mainGrid()->cell(idx).setActive(false);
reservoir->mainGrid()->cell(idx).setMatrixActive(false);
}
{
size_t idx = reservoir->mainGrid()->cellIndexFromIJK(2, 2, 3);
reservoir->mainGrid()->cell(idx).setActive(false);
reservoir->mainGrid()->cell(idx).setMatrixActive(false);
}
// Add a property

2
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -1199,7 +1199,7 @@ void RimReservoirView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibl
for ( fIdx = 0; fIdx < cellCountFenceDirection; ++fIdx)
{
size_t fenceCellIndex = grid->cellIndexFromIJK(*pI,*pJ,*pK);
if (grid->cell(fenceCellIndex).active())
if (grid->cell(fenceCellIndex).matrixActive())
{
(*visibleCells)[fenceCellIndex] = true;
}

4
ApplicationCode/ProjectDataModel/RimResultReservoir.cpp
View File

@@ -118,12 +118,12 @@ cvf::ref<RifReaderInterface> RimResultReservoir::createMockModel(QString modelNa
mockFileInterface->open("", reservoir.p());
{
size_t idx = reservoir->mainGrid()->cellIndexFromIJK(1, 3, 4);
reservoir->mainGrid()->cell(idx).setActive(false);
reservoir->mainGrid()->cell(idx).setMatrixActive(false);
}
{
size_t idx = reservoir->mainGrid()->cellIndexFromIJK(2, 2, 3);
reservoir->mainGrid()->cell(idx).setActive(false);
reservoir->mainGrid()->cell(idx).setMatrixActive(false);
}
}
else if (modelName == "Result Mock Debug Model With Results")