From d8000be32a4ef37a4d28e68fba41cfba6eb99815 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetron.com>
Date: Mon, 25 Feb 2013 13:27:38 +0100
Subject: [PATCH] Use isActiveInMatrixModel instead of activeInMatrixModel p4#:
 20612

---
 ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp | 8 ++++----
 ApplicationCode/SocketInterface/RiaSocketServer.cpp   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
index 1f476b3f65..a192199546 100644
--- a/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
@@ -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();
diff --git a/ApplicationCode/SocketInterface/RiaSocketServer.cpp b/ApplicationCode/SocketInterface/RiaSocketServer.cpp
index c818ec1185..80308f3e8e 100644
--- a/ApplicationCode/SocketInterface/RiaSocketServer.cpp
+++ b/ApplicationCode/SocketInterface/RiaSocketServer.cpp
@@ -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);