From e635bb5dbb09ed139acfa828859a9dc069cfaf5c Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 1 Feb 2013 13:10:31 +0100 Subject: [PATCH] Removed functions in RigGridBase due to changes in StructGridInterface p4#: 20335 --- .../RifEclipseInputFileTools.cpp | 10 +++- .../ProjectDataModel/RimReservoirView.cpp | 17 ++++-- .../ReservoirDataModel/RigGridBase.cpp | 59 ------------------- .../ReservoirDataModel/RigGridBase.h | 9 --- 4 files changed, 21 insertions(+), 74 deletions(-) diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp index 76d28f3214..563c2d66d8 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp @@ -35,6 +35,7 @@ #include "well_state.h" #include "util.h" #include +#include "RigGridScalarDataAccess.h" @@ -417,16 +418,21 @@ bool RifEclipseInputFileTools::writeBinaryResultToTextFile(const QString& fileNa return false; } + cvf::ref dataAccessObject = reservoir->mainGrid()->dataAccessObject(timeStep, resultIndex); + if (dataAccessObject.isNull()) + { + return false; + } + std::vector resultData; size_t i, j, k; - for (k = 0; k < reservoir->mainGrid()->cellCountK(); k++) { for (j = 0; j < reservoir->mainGrid()->cellCountJ(); j++) { for (i = 0; i < reservoir->mainGrid()->cellCountI(); i++) { - double resultValue = reservoir->mainGrid()->cellScalar(timeStep, resultIndex, i, j, k); + double resultValue = dataAccessObject->cellScalar(i, j, k); if (resultValue == HUGE_VAL) { resultValue = undefinedValue; diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index c187bbb2bc..ea1ed31119 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -43,6 +43,7 @@ #include "cafCeetronNavigation.h" #include "RimReservoir.h" #include "Rim3dOverlayInfoConfig.h" +#include "RigGridScalarDataAccess.h" namespace caf { @@ -850,8 +851,12 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex, const RigGridBase* grid = reservoir->grid(gridIndex); if (this->cellResult()->hasResult()) { - double scalarValue = grid->cellScalar(m_currentTimeStep, this->cellResult()->gridScalarIndex(), cellIndex); - resultInfoText->append(QString("Cell result : %1\n").arg(scalarValue)); + cvf::ref dataAccessObject = grid->dataAccessObject(m_currentTimeStep, this->cellResult()->gridScalarIndex()); + if (dataAccessObject.notNull()) + { + double scalarValue = dataAccessObject->cellScalar(cellIndex); + resultInfoText->append(QString("Cell result : %1\n").arg(scalarValue)); + } } if (this->cellEdgeResult()->hasResult()) @@ -866,8 +871,12 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex, if (resultIndices[idx] == cvf::UNDEFINED_SIZE_T) continue; // Cell edge results are static, results are loaded for first time step only - double scalarValue = grid->cellScalar(0, resultIndices[idx], cellIndex); - resultInfoText->append(QString("%1 : %2\n").arg(resultNames[idx]).arg(scalarValue)); + cvf::ref dataAccessObject = grid->dataAccessObject(0, resultIndices[idx]); + if (dataAccessObject.notNull()) + { + double scalarValue = dataAccessObject->cellScalar(cellIndex); + resultInfoText->append(QString("%1 : %2\n").arg(resultNames[idx]).arg(scalarValue)); + } } } } diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp index 02bc71d4b3..9d2c4dbd1c 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp +++ b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp @@ -148,13 +148,6 @@ void RigGridBase::initSubCellsMainGridCellIndex() } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -size_t RigGridBase::scalarSetCount() const -{ - return m_mainGrid->results()->resultCount(); -} //-------------------------------------------------------------------------------------------------- /// @@ -222,49 +215,6 @@ size_t RigGridBase::gridPointIndexFromIJK(size_t i, size_t j, size_t k) const return 0; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RigGridBase::cellCornerScalars(size_t timeStepIndex, size_t scalarSetIndex, size_t i, size_t j, size_t k, double scalars[8]) const -{ - -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -size_t RigGridBase::vectorSetCount() const -{ - return 0; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -double RigGridBase::cellScalar(size_t timeStepIndex, size_t scalarSetIndex, size_t i, size_t j, size_t k) const -{ - size_t cellIndex = cellIndexFromIJK(i, j, k); - - return cellScalar(timeStepIndex, scalarSetIndex, cellIndex); -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -double RigGridBase::cellScalar(size_t timeStepIndex, size_t scalarSetIndex, size_t cellIndex) const -{ - size_t resultValueIndex = cellIndex; - - bool useGlobalActiveIndex = m_mainGrid->results()->isUsingGlobalActiveIndex(scalarSetIndex); - if (useGlobalActiveIndex) - { - resultValueIndex = cell(cellIndex).activeIndexInMatrixModel(); - if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL; - } - - return m_mainGrid->results()->cellScalarResult(timeStepIndex, scalarSetIndex, resultValueIndex); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -391,15 +341,6 @@ bool RigGridBase::cellIJKNeighbor(size_t i, size_t j, size_t k, FaceType face, s return true; } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -const cvf::Vec3d* RigGridBase::cellVector(size_t vectorSetIndex, size_t i, size_t j, size_t k) const -{ - return NULL; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.h b/ApplicationCode/ReservoirDataModel/RigGridBase.h index 5d89148342..9879eb8c27 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridBase.h +++ b/ApplicationCode/ReservoirDataModel/RigGridBase.h @@ -91,15 +91,6 @@ public: virtual size_t gridPointIndexFromIJK( size_t i, size_t j, size_t k ) const; virtual cvf::Vec3d gridPointCoordinate( size_t i, size_t j, size_t k ) const; - virtual size_t scalarSetCount() const; - virtual double cellScalar(size_t timeStepIndex, size_t scalarSetIndex, size_t i, size_t j, size_t k ) const; - virtual double cellScalar(size_t timeStepIndex, size_t scalarSetIndex, size_t cellIndex ) const; - - virtual void cellCornerScalars(size_t timeStepIndex, size_t scalarSetIndex, size_t i, size_t j, size_t k, double scalars[8]) const; - - virtual size_t vectorSetCount() const; - virtual const cvf::Vec3d* cellVector( size_t vectorSetIndex, size_t i, size_t j, size_t k ) const; - virtual bool isCellActive( size_t i, size_t j, size_t k ) const; virtual bool isCellValid( size_t i, size_t j, size_t k ) const; virtual bool cellIJKNeighbor(size_t i, size_t j, size_t k, FaceType face, size_t* neighborCellIndex ) const;