Use RigResultAccessFactory

This commit is contained in:
Magne Sjaastad 2014-08-09 14:46:27 +02:00
parent e2f2cf4f24
commit a500c68efe

View File

@ -41,6 +41,8 @@
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "RiuProcessMonitor.h" #include "RiuProcessMonitor.h"
#include "RigResultAccessorFactory.h"
#include "RigResultAccessor.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -319,8 +321,9 @@ public:
for (size_t tsIdx = 0; tsIdx < timestepCount; tsIdx++) for (size_t tsIdx = 0; tsIdx < timestepCount; tsIdx++)
{ {
cvf::ref<cvf::StructGridScalarDataAccess> cellCenterDataAccessObject = rimCase->reservoirData()->resultAccessor(rigGrid, porosityModelEnum, requestedTimesteps[tsIdx], scalarResultIndex); cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createResultAccessor(rimCase->reservoirData(), gridIdx, porosityModelEnum, requestedTimesteps[tsIdx], propertyName);
if (cellCenterDataAccessObject.isNull())
if (resultAccessor.isNull())
{ {
continue; continue;
} }
@ -330,7 +333,7 @@ public:
size_t valueIndex = 0; size_t valueIndex = 0;
for (size_t cellIdx = 0; cellIdx < rigGrid->cellCount(); cellIdx++) for (size_t cellIdx = 0; cellIdx < rigGrid->cellCount(); cellIdx++)
{ {
double cellValue = cellCenterDataAccessObject->cellScalar(cellIdx); double cellValue = resultAccessor->cellScalar(cellIdx);
if (cellValue == HUGE_VAL) if (cellValue == HUGE_VAL)
{ {
cellValue = 0.0; cellValue = 0.0;