From a0d6890aa3d40f2df3d7dfbb9b2db553fb995032 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 13 Feb 2013 11:24:36 +0100 Subject: [PATCH] Removed obsolete code p4#: 20492 --- .../FileInterface/RifReaderEclipseOutput.cpp | 5 ----- .../ProjectDataModel/RimInputReservoir.cpp | 18 ------------------ .../ProjectDataModel/RimResultReservoir.cpp | 17 ----------------- ApplicationCode/ReservoirDataModel/RigCell.cpp | 1 - ApplicationCode/ReservoirDataModel/RigCell.h | 6 ------ .../ReservoirDataModel/RigReservoir.cpp | 6 ++---- 6 files changed, 2 insertions(+), 51 deletions(-) diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index b73dc55234..11930b2838 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -129,13 +129,8 @@ bool transferGridCellData(RigMainGrid* mainGrid, RigActiveCellInfo* activeCellIn int fractureActiveIndex = ecl_grid_get_active_fracture_index1(localEclGrid, localCellIdx); if (fractureActiveIndex != -1) { - cell.setActiveIndexInFractureModel(fractureActiveStartIndex + fractureActiveIndex); activeCellInfo->setActiveIndexInFractureModel(cellStartIndex + localCellIdx, fractureActiveStartIndex + fractureActiveIndex); } - else - { - cell.setActiveIndexInFractureModel(cvf::UNDEFINED_SIZE_T); - } // Parent cell index diff --git a/ApplicationCode/ProjectDataModel/RimInputReservoir.cpp b/ApplicationCode/ProjectDataModel/RimInputReservoir.cpp index 029882d30c..4f13b8d996 100644 --- a/ApplicationCode/ProjectDataModel/RimInputReservoir.cpp +++ b/ApplicationCode/ProjectDataModel/RimInputReservoir.cpp @@ -75,24 +75,6 @@ void RimInputReservoir::openDataFileSet(const QStringList& filenames) m_rigReservoir->mainGrid()->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p()); m_rigReservoir->mainGrid()->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p()); - size_t matrixActiveCellCount = 0; - size_t fractureActiveCellCount = 0; - - for (size_t cellIdx = 0; cellIdx < m_rigReservoir->mainGrid()->cells().size(); cellIdx++) - { - const RigCell& cell = m_rigReservoir->mainGrid()->cells()[cellIdx]; - - if (cell.isActiveInMatrixModel()) - { - matrixActiveCellCount++; - } - if (cell.isActiveInFractureModel()) - { - fractureActiveCellCount++; - } - - } - m_rigReservoir->activeCellInfo()->computeDerivedData(); return; diff --git a/ApplicationCode/ProjectDataModel/RimResultReservoir.cpp b/ApplicationCode/ProjectDataModel/RimResultReservoir.cpp index 8b2265744c..aa6608c47c 100644 --- a/ApplicationCode/ProjectDataModel/RimResultReservoir.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultReservoir.cpp @@ -58,23 +58,6 @@ bool RimResultReservoir::openEclipseGridFile() { readerInterface = this->createMockModel(this->caseName()); - size_t matrixActiveCellCount = 0; - size_t fractureActiveCellCount = 0; - - for (size_t cellIdx = 0; cellIdx < m_rigReservoir->mainGrid()->cells().size(); cellIdx++) - { - const RigCell& cell = m_rigReservoir->mainGrid()->cells()[cellIdx]; - - if (cell.isActiveInMatrixModel()) - { - matrixActiveCellCount++; - } - if (cell.isActiveInFractureModel()) - { - fractureActiveCellCount++; - } - - } m_rigReservoir->mainGrid()->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p()); m_rigReservoir->mainGrid()->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p()); } diff --git a/ApplicationCode/ReservoirDataModel/RigCell.cpp b/ApplicationCode/ReservoirDataModel/RigCell.cpp index 6c7bfd573c..555e748d2b 100644 --- a/ApplicationCode/ReservoirDataModel/RigCell.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCell.cpp @@ -41,7 +41,6 @@ RigCell::RigCell() : m_isInvalid(false), m_isWellCell(false), m_activeIndexInMatrixModel(cvf::UNDEFINED_SIZE_T), - m_activeIndexInFractureModel(cvf::UNDEFINED_SIZE_T), m_cellIndex(cvf::UNDEFINED_SIZE_T), m_isInCoarseCell(false) { diff --git a/ApplicationCode/ReservoirDataModel/RigCell.h b/ApplicationCode/ReservoirDataModel/RigCell.h index 4e3ac4abe2..a6ee7c6395 100644 --- a/ApplicationCode/ReservoirDataModel/RigCell.h +++ b/ApplicationCode/ReservoirDataModel/RigCell.h @@ -41,10 +41,6 @@ public: size_t activeIndexInMatrixModel() const { return m_activeIndexInMatrixModel; } void setActiveIndexInMatrixModel(size_t val) { m_activeIndexInMatrixModel = val; } - bool isActiveInFractureModel() const { return m_activeIndexInFractureModel != cvf::UNDEFINED_SIZE_T; } - size_t activeIndexInFractureModel() const { return m_activeIndexInFractureModel; } - void setActiveIndexInFractureModel(size_t val) { m_activeIndexInFractureModel = val; } - bool isInvalid() const { return m_isInvalid; } void setInvalid( bool val ) { m_isInvalid = val; } @@ -95,6 +91,4 @@ private: bool m_isWellCell; size_t m_activeIndexInMatrixModel; ///< This cell's running index of all the active calls (matrix) in the reservoir - size_t m_activeIndexInFractureModel; ///< This cell's running index of all the active calls (fracture) in the reservoir - }; diff --git a/ApplicationCode/ReservoirDataModel/RigReservoir.cpp b/ApplicationCode/ReservoirDataModel/RigReservoir.cpp index 9b084135ae..051d0d09bd 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoir.cpp +++ b/ApplicationCode/ReservoirDataModel/RigReservoir.cpp @@ -266,17 +266,15 @@ void RigReservoir::computeActiveCellData() size_t idx; for (idx = 0; idx < m_mainGrid->cellCount(); idx++) { - const RigCell& c = m_mainGrid->cell(idx); - size_t i, j, k; m_mainGrid->ijkFromCellIndex(idx, &i, &j, &k); - if (c.isActiveInMatrixModel()) + if (m_activeCellInfo.activeIndexInMatrixModel(idx)) { matrixModelActiveBB.add(i, j, k); } - if (c.isActiveInFractureModel()) + if (m_activeCellInfo.activeIndexInFractureModel(idx)) { fractureModelActiveBB.add(i, j, k); }