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

Class Rename: ResultAccessObject to ResultAccessor

Browse Source
This commit is contained in:
Jacob Støren 2014-08-07 13:22:09 +02:00 committed by Magne Sjaastad
parent cac1cc8040
commit 2bfcfc16b1
11 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.h
View File

@ -27,7 +27,7 @@ class RigActiveCellInfo;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RigActiveCellsResultAccessObject : public RigResultAccessObject class RigActiveCellsResultAccessObject : public RigResultAccessor
{ {
public: public:
RigActiveCellsResultAccessObject(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo, const QString& resultName); RigActiveCellsResultAccessObject(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo, const QString& resultName);

10
ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessObject.cpp
View File

@ -26,7 +26,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigAllGridCellsResultAccessObject::RigAllGridCellsResultAccessObject(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const QString& resultName) RigAllGridCellsResultAccessor::RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const QString& resultName)
: m_grid(grid), : m_grid(grid),
m_reservoirResultValues(reservoirResultValues), m_reservoirResultValues(reservoirResultValues),
m_resultName(resultName) m_resultName(resultName)
@ -36,7 +36,7 @@ RigAllGridCellsResultAccessObject::RigAllGridCellsResultAccessObject(const RigGr
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RigAllGridCellsResultAccessObject::cellScalar(size_t localCellIndex) const double RigAllGridCellsResultAccessor::cellScalar(size_t localCellIndex) const
{ {
if (m_reservoirResultValues->size() == 0 ) return HUGE_VAL; if (m_reservoirResultValues->size() == 0 ) return HUGE_VAL;
@ -49,7 +49,7 @@ double RigAllGridCellsResultAccessObject::cellScalar(size_t localCellIndex) cons
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RigAllGridCellsResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const double RigAllGridCellsResultAccessor::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const
{ {
return cellScalar(localCellIndex); return cellScalar(localCellIndex);
} }
@ -57,7 +57,7 @@ double RigAllGridCellsResultAccessObject::cellFaceScalar(size_t localCellIndex,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RigAllGridCellsResultAccessObject::resultName() const QString RigAllGridCellsResultAccessor::resultName() const
{ {
return m_resultName; return m_resultName;
} }
@ -65,7 +65,7 @@ QString RigAllGridCellsResultAccessObject::resultName() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigAllGridCellsResultAccessObject::setCellScalar(size_t localCellIndex, double scalarValue) void RigAllGridCellsResultAccessor::setCellScalar(size_t localCellIndex, double scalarValue)
{ {
size_t globalGridCellIndex = m_grid->globalGridCellIndex(localCellIndex); size_t globalGridCellIndex = m_grid->globalGridCellIndex(localCellIndex);
CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size()); CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size());

4
ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessObject.h
View File

@ -26,10 +26,10 @@ class RigGridBase;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RigAllGridCellsResultAccessObject : public RigResultAccessObject class RigAllGridCellsResultAccessor : public RigResultAccessor
{ {
public: public:
RigAllGridCellsResultAccessObject(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const QString& resultName); RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const QString& resultName);
virtual double cellScalar(size_t localCellIndex) const; virtual double cellScalar(size_t localCellIndex) const;
virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const; virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const;

2
ApplicationCode/ReservoirDataModel/RigCaseData.cpp
View File

@ -496,7 +496,7 @@ cvf::ref<cvf::StructGridScalarDataAccess> RigCaseData::dataAccessObject(const Ri
if (timeStepIndex != cvf::UNDEFINED_SIZE_T && if (timeStepIndex != cvf::UNDEFINED_SIZE_T &&
scalarSetIndex != cvf::UNDEFINED_SIZE_T) scalarSetIndex != cvf::UNDEFINED_SIZE_T)
{ {
cvf::ref<cvf::StructGridScalarDataAccess> dataAccess = RigResultAccessObjectFactory::TO_BE_DELETED_createNativeDataAccessObject(this, grid->gridIndex(), porosityModel, timeStepIndex, scalarSetIndex); cvf::ref<cvf::StructGridScalarDataAccess> dataAccess = RigResultAccessorFactory::TO_BE_DELETED_createNativeDataAccessObject(this, grid->gridIndex(), porosityModel, timeStepIndex, scalarSetIndex);
return dataAccess; return dataAccess;
} }

14
ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.cpp
View File

@ -24,7 +24,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigCellFaceResultAccessObject::RigCellFaceResultAccessObject(const QString& resultName) RigCellFaceResultAccessor::RigCellFaceResultAccessor(const QString& resultName)
: m_resultName(resultName) : m_resultName(resultName)
{ {
m_resultAccessObjects.resize(6); m_resultAccessObjects.resize(6);
@ -33,7 +33,7 @@ RigCellFaceResultAccessObject::RigCellFaceResultAccessObject(const QString& resu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCellFaceResultAccessObject::setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessObject* resultAccessObject) void RigCellFaceResultAccessor::setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject)
{ {
m_resultAccessObjects[faceId] = resultAccessObject; m_resultAccessObjects[faceId] = resultAccessObject;
} }
@ -41,7 +41,7 @@ void RigCellFaceResultAccessObject::setDataAccessObjectForFace(cvf::StructGridIn
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RigCellFaceResultAccessObject::cellScalar(size_t localCellIndex) const double RigCellFaceResultAccessor::cellScalar(size_t localCellIndex) const
{ {
// TODO: How to handle when we get here? // TODO: How to handle when we get here?
@ -53,9 +53,9 @@ double RigCellFaceResultAccessObject::cellScalar(size_t localCellIndex) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RigCellFaceResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const double RigCellFaceResultAccessor::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const
{ {
const RigResultAccessObject* resultAccessObj = m_resultAccessObjects.at(faceId); const RigResultAccessor* resultAccessObj = m_resultAccessObjects.at(faceId);
if (resultAccessObj != NULL) if (resultAccessObj != NULL)
{ {
return resultAccessObj->cellFaceScalar(localCellIndex, faceId); return resultAccessObj->cellFaceScalar(localCellIndex, faceId);
@ -67,7 +67,7 @@ double RigCellFaceResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RigCellFaceResultAccessObject::resultName() const QString RigCellFaceResultAccessor::resultName() const
{ {
return m_resultName; return m_resultName;
} }
@ -75,7 +75,7 @@ QString RigCellFaceResultAccessObject::resultName() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCellFaceResultAccessObject::setCellScalar(size_t localCellIndex, double scalarValue) void RigCellFaceResultAccessor::setCellScalar(size_t localCellIndex, double scalarValue)
{ {
// TODO: How to handle when we get here? // TODO: How to handle when we get here?
CVF_ASSERT(false); CVF_ASSERT(false);

8
ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.h
View File

@ -26,12 +26,12 @@
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RigCellFaceResultAccessObject : public RigResultAccessObject class RigCellFaceResultAccessor : public RigResultAccessor
{ {
public: public:
RigCellFaceResultAccessObject(const QString& resultName); RigCellFaceResultAccessor(const QString& resultName);
void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessObject* resultAccessObject); void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject);
virtual double cellScalar(size_t localCellIndex) const; virtual double cellScalar(size_t localCellIndex) const;
virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const; virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const;
@ -39,7 +39,7 @@ public:
virtual void setCellScalar(size_t localCellIndex, double scalarValue); virtual void setCellScalar(size_t localCellIndex, double scalarValue);
private: private:
cvf::Collection<RigResultAccessObject> m_resultAccessObjects; cvf::Collection<RigResultAccessor> m_resultAccessObjects;
QString m_resultName; QString m_resultName;
}; };

24
ApplicationCode/ReservoirDataModel/RigCombTransResultAccessObject.cpp
View File

@ -26,7 +26,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigCombTransResultAccessObject::RigCombTransResultAccessObject(const RigGridBase* grid, const QString& resultName) RigCombTransResultAccessor::RigCombTransResultAccessor(const RigGridBase* grid, const QString& resultName)
: m_grid(grid), : m_grid(grid),
m_resultName(resultName) m_resultName(resultName)
{ {
@ -37,7 +37,7 @@ RigCombTransResultAccessObject::RigCombTransResultAccessObject(const RigGridBase
/// Only sensible to provide the positive values, as the negative ones will never be used. /// Only sensible to provide the positive values, as the negative ones will never be used.
/// The negative faces gets their value from the neighbor cell in that direction /// The negative faces gets their value from the neighbor cell in that direction
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCombTransResultAccessObject::setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessObject* resultAccessObject) void RigCombTransResultAccessor::setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject)
{ {
CVF_ASSERT(faceId == cvf::StructGridInterface::POS_I || faceId == cvf::StructGridInterface::POS_J || faceId == cvf::StructGridInterface::POS_K ); CVF_ASSERT(faceId == cvf::StructGridInterface::POS_I || faceId == cvf::StructGridInterface::POS_J || faceId == cvf::StructGridInterface::POS_K );
@ -47,7 +47,7 @@ void RigCombTransResultAccessObject::setDataAccessObjectForFace(cvf::StructGridI
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RigCombTransResultAccessObject::cellScalar(size_t localCellIndex) const double RigCombTransResultAccessor::cellScalar(size_t localCellIndex) const
{ {
// TODO: How to handle when we get here? // TODO: How to handle when we get here?
@ -59,13 +59,13 @@ double RigCombTransResultAccessObject::cellScalar(size_t localCellIndex) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RigCombTransResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const double RigCombTransResultAccessor::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const
{ {
switch (faceId) switch (faceId)
{ {
case cvf::StructGridInterface::POS_I: case cvf::StructGridInterface::POS_I:
{ {
const RigResultAccessObject* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_I); const RigResultAccessor* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_I);
if (resultAccessObj) if (resultAccessObj)
{ {
return resultAccessObj->cellScalar(localCellIndex); return resultAccessObj->cellScalar(localCellIndex);
@ -74,7 +74,7 @@ double RigCombTransResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf
break; break;
case cvf::StructGridInterface::NEG_I: case cvf::StructGridInterface::NEG_I:
{ {
const RigResultAccessObject* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_I); const RigResultAccessor* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_I);
if (resultAccessObj) if (resultAccessObj)
{ {
size_t i, j, k, neighborGridCellIdx; size_t i, j, k, neighborGridCellIdx;
@ -89,7 +89,7 @@ double RigCombTransResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf
break; break;
case cvf::StructGridInterface::POS_J: case cvf::StructGridInterface::POS_J:
{ {
const RigResultAccessObject* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_J); const RigResultAccessor* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_J);
if (resultAccessObj) if (resultAccessObj)
{ {
return resultAccessObj->cellScalar(localCellIndex); return resultAccessObj->cellScalar(localCellIndex);
@ -98,7 +98,7 @@ double RigCombTransResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf
break; break;
case cvf::StructGridInterface::NEG_J: case cvf::StructGridInterface::NEG_J:
{ {
const RigResultAccessObject* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_J); const RigResultAccessor* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_J);
if (resultAccessObj) if (resultAccessObj)
{ {
size_t i, j, k, neighborGridCellIdx; size_t i, j, k, neighborGridCellIdx;
@ -113,7 +113,7 @@ double RigCombTransResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf
break; break;
case cvf::StructGridInterface::POS_K: case cvf::StructGridInterface::POS_K:
{ {
const RigResultAccessObject* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_K); const RigResultAccessor* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_K);
if (resultAccessObj) if (resultAccessObj)
{ {
return resultAccessObj->cellScalar(localCellIndex); return resultAccessObj->cellScalar(localCellIndex);
@ -122,7 +122,7 @@ double RigCombTransResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf
break; break;
case cvf::StructGridInterface::NEG_K: case cvf::StructGridInterface::NEG_K:
{ {
const RigResultAccessObject* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_K); const RigResultAccessor* resultAccessObj = m_resultAccessObjects.at(cvf::StructGridInterface::POS_K);
if (resultAccessObj) if (resultAccessObj)
{ {
size_t i, j, k, neighborGridCellIdx; size_t i, j, k, neighborGridCellIdx;
@ -143,7 +143,7 @@ double RigCombTransResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RigCombTransResultAccessObject::resultName() const QString RigCombTransResultAccessor::resultName() const
{ {
return m_resultName; return m_resultName;
} }
@ -151,7 +151,7 @@ QString RigCombTransResultAccessObject::resultName() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCombTransResultAccessObject::setCellScalar(size_t localCellIndex, double scalarValue) void RigCombTransResultAccessor::setCellScalar(size_t localCellIndex, double scalarValue)
{ {
// TODO: How to handle when we get here? // TODO: How to handle when we get here?
CVF_ASSERT(false); CVF_ASSERT(false);

8
ApplicationCode/ReservoirDataModel/RigCombTransResultAccessObject.h
View File

@ -28,12 +28,12 @@ class RigGridBase;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RigCombTransResultAccessObject : public RigResultAccessObject class RigCombTransResultAccessor : public RigResultAccessor
{ {
public: public:
RigCombTransResultAccessObject(const RigGridBase* grid, const QString& resultName); RigCombTransResultAccessor(const RigGridBase* grid, const QString& resultName);
void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessObject* resultAccessObject); void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject);
virtual double cellScalar(size_t localCellIndex) const; virtual double cellScalar(size_t localCellIndex) const;
virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const; virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const;
@ -41,7 +41,7 @@ public:
virtual void setCellScalar(size_t localCellIndex, double scalarValue); virtual void setCellScalar(size_t localCellIndex, double scalarValue);
private: private:
cvf::Collection<RigResultAccessObject> m_resultAccessObjects; cvf::Collection<RigResultAccessor> m_resultAccessObjects;
const RigGridBase* m_grid; const RigGridBase* m_grid;
QString m_resultName; QString m_resultName;

2
ApplicationCode/ReservoirDataModel/RigResultAccessObject.h
View File

@ -28,7 +28,7 @@
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RigResultAccessObject : public cvf::Object class RigResultAccessor : public cvf::Object
{ {
public: public:
virtual double cellScalar(size_t localCellIndex) const = 0; virtual double cellScalar(size_t localCellIndex) const = 0;

18
ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp
View File

@ -39,7 +39,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createNativeDataAccessObject(RigCaseData* eclipseCase, cvf::ref<RigResultAccessor> RigResultAccessorFactory::createNativeResultAccessor(RigCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
@ -83,12 +83,12 @@ cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createNativeDataAc
bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarSetIndex); bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarSetIndex);
if (useGlobalActiveIndex) if (useGlobalActiveIndex)
{ {
cvf::ref<RigResultAccessObject> object = new RigActiveCellsResultAccessObject(grid, resultValues, eclipseCase->activeCellInfo(porosityModel), uiResultName); cvf::ref<RigResultAccessor> object = new RigActiveCellsResultAccessObject(grid, resultValues, eclipseCase->activeCellInfo(porosityModel), uiResultName);
return object; return object;
} }
else else
{ {
cvf::ref<RigResultAccessObject> object = new RigAllGridCellsResultAccessObject(grid, resultValues, uiResultName); cvf::ref<RigResultAccessor> object = new RigAllGridCellsResultAccessor(grid, resultValues, uiResultName);
return object; return object;
} }
} }
@ -98,7 +98,7 @@ cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createNativeDataAc
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createResultAccessObject(RigCaseData* eclipseCase, cvf::ref<RigResultAccessor> RigResultAccessorFactory::createResultAccessor(RigCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
@ -122,11 +122,11 @@ cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createResultAccess
// Taken from RivTransmissibilityColorMapper::updateCombinedTransmissibilityTextureCoordinates // Taken from RivTransmissibilityColorMapper::updateCombinedTransmissibilityTextureCoordinates
// //
cvf::ref<RigCombTransResultAccessObject> cellFaceAccessObject = new RigCombTransResultAccessObject(grid, uiResultName); cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor(grid, uiResultName);
{ {
QString resultName = "TRANX"; QString resultName = "TRANX";
cvf::ref<RigResultAccessObject> nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultName); cvf::ref<RigResultAccessor> nativeAccessObject = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultName);
if (nativeAccessObject.notNull()) if (nativeAccessObject.notNull())
{ {
cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_I, nativeAccessObject.p()); cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_I, nativeAccessObject.p());
@ -135,7 +135,7 @@ cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createResultAccess
{ {
QString resultName = "TRANY"; QString resultName = "TRANY";
cvf::ref<RigResultAccessObject> nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultName); cvf::ref<RigResultAccessor> nativeAccessObject = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultName);
if (nativeAccessObject.notNull()) if (nativeAccessObject.notNull())
{ {
cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_J, nativeAccessObject.p()); cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_J, nativeAccessObject.p());
@ -144,7 +144,7 @@ cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createResultAccess
{ {
QString resultName = "TRANZ"; QString resultName = "TRANZ";
cvf::ref<RigResultAccessObject> nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultName); cvf::ref<RigResultAccessor> nativeAccessObject = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultName);
if (nativeAccessObject.notNull()) if (nativeAccessObject.notNull())
{ {
cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_K, nativeAccessObject.p()); cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_K, nativeAccessObject.p());
@ -287,7 +287,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<cvf::StructGridScalarDataAccess> RigResultAccessObjectFactory::TO_BE_DELETED_createNativeDataAccessObject(RigCaseData* eclipseCase, cvf::ref<cvf::StructGridScalarDataAccess> RigResultAccessorFactory::TO_BE_DELETED_createNativeDataAccessObject(RigCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,

12
ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.h
View File

@ -24,13 +24,13 @@
class RigActiveCellInfo; class RigActiveCellInfo;
class RigGridBase; class RigGridBase;
class RigResultAccessObject; class RigResultAccessor;
class RigResultAccessObjectFactory class RigResultAccessorFactory
{ {
public: public:
static cvf::ref<RigResultAccessObject> static cvf::ref<RigResultAccessor>
createResultAccessObject(RigCaseData* eclipseCase, createResultAccessor(RigCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
@ -47,8 +47,8 @@ public:
private: private:
static cvf::ref<RigResultAccessObject> static cvf::ref<RigResultAccessor>
createNativeDataAccessObject(RigCaseData* eclipseCase, createNativeResultAccessor(RigCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,