Use RigResultAccessFactory

This commit is contained in:
Magne Sjaastad 2014-08-09 14:46:48 +02:00
parent b5d79ecb65
commit 14b5919e59

View File

@ -21,6 +21,8 @@
#include "RifReaderEclipseOutput.h" #include "RifReaderEclipseOutput.h"
#include "RigCaseCellResultsData.h" #include "RigCaseCellResultsData.h"
#include "RigCaseData.h" #include "RigCaseData.h"
#include "RigResultAccessor.h"
#include "RigResultAccessorFactory.h"
#include "cafProgressInfo.h" #include "cafProgressInfo.h"
@ -500,8 +502,8 @@ bool RifEclipseInputFileTools::writeBinaryResultToTextFile(const QString& fileNa
return false; return false;
} }
cvf::ref<cvf::StructGridScalarDataAccess> resultAccessor = eclipseCase->resultAccessor(eclipseCase->mainGrid(), porosityModel, timeStep, resultIndex); cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, eclipseCase->mainGrid()->gridIndex(), porosityModel, timeStep, resultName);
if (resultAccessor.isNull()) if (resultAccessor.isNull())
{ {
return false; return false;
} }
@ -514,7 +516,7 @@ bool RifEclipseInputFileTools::writeBinaryResultToTextFile(const QString& fileNa
{ {
for (i = 0; i < eclipseCase->mainGrid()->cellCountI(); i++) for (i = 0; i < eclipseCase->mainGrid()->cellCountI(); i++)
{ {
double resultValue = resultAccessor->cellScalar(eclipseCase->mainGrid()->cellIndexFromIJK(i, j, k)); double resultValue = resultAccessor->cellScalar(eclipseCase->mainGrid()->cellIndexFromIJK(i, j, k));
if (resultValue == HUGE_VAL) if (resultValue == HUGE_VAL)
{ {
resultValue = undefinedValue; resultValue = undefinedValue;