From 1514b98c7a83439916dd199b252ee5d263712f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 7 Aug 2014 13:32:31 +0200 Subject: [PATCH] More renaming : AccessObject-Accessor And CellFaceAccessor to CellEdgeAccessor --- .../RigActiveCellsResultAccessObject.cpp | 10 +++++----- .../RigActiveCellsResultAccessObject.h | 4 ++-- .../RigCellFaceResultAccessObject.cpp | 12 ++++++------ .../RigCellFaceResultAccessObject.h | 4 ++-- .../RigResultAccessObjectFactory.cpp | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.cpp b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.cpp index 6552f938f7..643d834575 100644 --- a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.cpp +++ b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.cpp @@ -24,7 +24,7 @@ #include -RigActiveCellsResultAccessObject::RigActiveCellsResultAccessObject(const RigGridBase* grid, std::vector* reservoirResultValues, const RigActiveCellInfo* activeCellInfo, const QString& resultName) +RigActiveCellsResultAccessor::RigActiveCellsResultAccessor(const RigGridBase* grid, std::vector* 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); diff --git a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.h b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.h index 14fb8c1dfe..47f640a17d 100644 --- a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.h +++ b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.h @@ -27,10 +27,10 @@ class RigActiveCellInfo; //================================================================================================== /// //================================================================================================== -class RigActiveCellsResultAccessObject : public RigResultAccessor +class RigActiveCellsResultAccessor : public RigResultAccessor { public: - RigActiveCellsResultAccessObject(const RigGridBase* grid, std::vector* reservoirResultValues, const RigActiveCellInfo* activeCellInfo, const QString& resultName); + RigActiveCellsResultAccessor(const RigGridBase* grid, std::vector* 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; diff --git a/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.cpp b/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.cpp index fe2327d835..eabe99cb33 100644 --- a/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.cpp @@ -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); diff --git a/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.h b/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.h index bbb64cc8e9..7d0ead9536 100644 --- a/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.h +++ b/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.h @@ -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); diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp index bcbc705706..dccfd0fed9 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp @@ -83,7 +83,7 @@ cvf::ref RigResultAccessorFactory::createNativeResultAccessor bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarSetIndex); if (useGlobalActiveIndex) { - cvf::ref object = new RigActiveCellsResultAccessObject(grid, resultValues, eclipseCase->activeCellInfo(porosityModel), uiResultName); + cvf::ref object = new RigActiveCellsResultAccessor(grid, resultValues, eclipseCase->activeCellInfo(porosityModel), uiResultName); return object; } else