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

More renaming : AccessObject-Accessor

Browse Source 
And CellFaceAccessor to CellEdgeAccessor
This commit is contained in:
Jacob Støren 2014-08-07 13:32:31 +02:00 committed by Magne Sjaastad
parent 2bfcfc16b1
commit 1514b98c7a
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.cpp
View File

@ -24,7 +24,7 @@
#include <cmath>
RigActiveCellsResultAccessObject::RigActiveCellsResultAccessObject(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo, const QString& resultName)
RigActiveCellsResultAccessor::RigActiveCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo, const QString& resultName)
: m_grid(grid),
m_reservoirResultValues(reservoirResultValues),
m_activeCellInfo(activeCellInfo),
@ -36,7 +36,7 @@ RigActiveCellsResultAccessObject::RigActiveCellsResultAccessObject(const RigGrid
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigActiveCellsResultAccessObject::cellScalar(size_t localCellIndex) const
double RigActiveCellsResultAccessor::cellScalar(size_t localCellIndex) const
{
if (m_reservoirResultValues == NULL || m_reservoirResultValues->size() == 0 ) return HUGE_VAL;
@ -52,7 +52,7 @@ double RigActiveCellsResultAccessObject::cellScalar(size_t localCellIndex) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigActiveCellsResultAccessObject::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const
double RigActiveCellsResultAccessor::cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const
{
return cellScalar(localCellIndex);
}
@ -60,7 +60,7 @@ double RigActiveCellsResultAccessObject::cellFaceScalar(size_t localCellIndex, c
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigActiveCellsResultAccessObject::resultName() const
QString RigActiveCellsResultAccessor::resultName() const
{
return m_resultName;
}
@ -68,7 +68,7 @@ QString RigActiveCellsResultAccessObject::resultName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigActiveCellsResultAccessObject::setCellScalar(size_t localCellIndex, double scalarValue)
void RigActiveCellsResultAccessor::setCellScalar(size_t localCellIndex, double scalarValue)
{
size_t globalGridCellIndex = m_grid->globalGridCellIndex(localCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex);

4
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.h
View File

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

12
ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.cpp
View File

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

4
ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.h
View File

@ -26,10 +26,10 @@
//==================================================================================================
///
//==================================================================================================
class RigCellFaceResultAccessor : public RigResultAccessor
class RigCellEdgeResultAccessor : public RigResultAccessor
{
public:
RigCellFaceResultAccessor(const QString& resultName);
RigCellEdgeResultAccessor(const QString& resultName);
void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject);

2
ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp
View File

@ -83,7 +83,7 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createNativeResultAccessor
bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarSetIndex);
if (useGlobalActiveIndex)
{
cvf::ref<RigResultAccessor> object = new RigActiveCellsResultAccessObject(grid, resultValues, eclipseCase->activeCellInfo(porosityModel), uiResultName);
cvf::ref<RigResultAccessor> object = new RigActiveCellsResultAccessor(grid, resultValues, eclipseCase->activeCellInfo(porosityModel), uiResultName);
return object;
}
else