OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 06:55:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use isActiveInMatrixModel instead of activeInMatrixModel

Browse Source 
p4#: 20612
This commit is contained in:
Magne Sjaastad 2013-02-25 13:27:38 +01:00
parent 459f2a033b
commit d8000be32a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
View File

@ -266,12 +266,12 @@ void RigEclipseCase::computeActiveCellData()
size_t i, j, k;
m_mainGrid->ijkFromCellIndex(idx, &i, &j, &k);
if (m_activeCellInfo.activeIndexInMatrixModel(idx))
if (m_activeCellInfo.isActiveInMatrixModel(idx))
{
matrixModelActiveBB.add(i, j, k);
}
if (m_activeCellInfo.activeIndexInFractureModel(idx))
if (m_activeCellInfo.isActiveInFractureModel(idx))
{
fractureModelActiveBB.add(i, j, k);
}
@ -325,9 +325,9 @@ void RigEclipseCase::computeActiveCellsGeometryBoundingBox()
}
else
{
for (size_t i = 0; i < m_mainGrid->cells().size(); i++)
for (size_t i = 0; i < m_mainGrid->cellCount(); i++)
{
if (m_activeCellInfo.activeIndexInMatrixModel(i))
if (m_activeCellInfo.isActiveInMatrixModel(i))
{
const RigCell& c = m_mainGrid->cells()[i];
const caf::SizeTArray8& indices = c.cornerIndices();

2
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@ -650,7 +650,7 @@ void RiaSocketServer::calculateMatrixModelActiveCellInfo(std::vector<qint32>& gr
for (size_t cIdx = 0; cIdx < globalCells.size(); ++cIdx)
{
if (actCellInfo->activeIndexInMatrixModel(cIdx))
if (actCellInfo->isActiveInMatrixModel(cIdx))
{
RigGridBase* grid = globalCells[cIdx].hostGrid();
CVF_ASSERT(grid != NULL);