diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index 83a63d5bce..d5121039f4 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -329,9 +329,6 @@ bool RifReaderEclipseOutput::transferGeometry(const ecl_grid_type* mainEclGrid, progInfo.setProgress(3 + lgrIdx); } - mainGrid->setGlobalMatrixModelActiveCellCount(globalMatrixActiveSize); - mainGrid->setGlobalFractureModelActiveCellCount(globalFractureActiveSize); - activeCellInfo->computeDerivedData(); return true; diff --git a/ApplicationCode/ProjectDataModel/RimInputReservoir.cpp b/ApplicationCode/ProjectDataModel/RimInputReservoir.cpp index bfb6815eef..029882d30c 100644 --- a/ApplicationCode/ProjectDataModel/RimInputReservoir.cpp +++ b/ApplicationCode/ProjectDataModel/RimInputReservoir.cpp @@ -93,8 +93,7 @@ void RimInputReservoir::openDataFileSet(const QStringList& filenames) } - m_rigReservoir->mainGrid()->setGlobalMatrixModelActiveCellCount(matrixActiveCellCount); - m_rigReservoir->mainGrid()->setGlobalFractureModelActiveCellCount(fractureActiveCellCount); + m_rigReservoir->activeCellInfo()->computeDerivedData(); return; } diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index ecad221c2f..7097f003a6 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -709,7 +709,7 @@ void RimReservoirView::loadDataAndUpdate() CVF_ASSERT(this->cellResult() != NULL); this->cellResult()->loadResult(); - if (m_reservoir->reservoirData()->mainGrid()->globalFractureModelActiveCellCount() == 0) + if (m_reservoir->reservoirData()->activeCellInfo()->globalFractureModelActiveCellCount() == 0) { this->cellResult->porosityModel.setUiHidden(true); } diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp index 29ec38da4a..176dd9a2d4 100644 --- a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp @@ -63,9 +63,9 @@ void RimResultDefinition::setReservoirView(RimReservoirView* ownerReservoirView) // TODO: This code is executed before reservoir is read, and then porosity model is never set to zero if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData() && - m_reservoirView->eclipseCase()->reservoirData()->mainGrid() ) + m_reservoirView->eclipseCase()->reservoirData()->activeCellInfo() ) { - if (m_reservoirView->eclipseCase()->reservoirData()->mainGrid()->globalFractureModelActiveCellCount() == 0) + if (m_reservoirView->eclipseCase()->reservoirData()->activeCellInfo()->globalFractureModelActiveCellCount() == 0) { porosityModel.setUiHidden(true); } diff --git a/ApplicationCode/ProjectDataModel/RimResultReservoir.cpp b/ApplicationCode/ProjectDataModel/RimResultReservoir.cpp index c3af3f4a8f..8b2265744c 100644 --- a/ApplicationCode/ProjectDataModel/RimResultReservoir.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultReservoir.cpp @@ -75,9 +75,6 @@ bool RimResultReservoir::openEclipseGridFile() } } - m_rigReservoir->mainGrid()->setGlobalMatrixModelActiveCellCount(matrixActiveCellCount); - m_rigReservoir->mainGrid()->setGlobalFractureModelActiveCellCount(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/RigMainGrid.cpp b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp index e1e97444be..9bfa1d65c5 100644 --- a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp +++ b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp @@ -28,9 +28,7 @@ RigMainGrid::RigMainGrid(void) m_activeCellPositionMin(cvf::Vec3st::UNDEFINED), m_activeCellPositionMax(cvf::Vec3st::UNDEFINED), m_validCellPositionMin(cvf::Vec3st::UNDEFINED), - m_validCellPositionMax(cvf::Vec3st::UNDEFINED), - m_globalMatrixModelActiveCellCount(cvf::UNDEFINED_SIZE_T), - m_globalFractureModelActiveCellCount(cvf::UNDEFINED_SIZE_T) + m_validCellPositionMax(cvf::Vec3st::UNDEFINED) { m_matrixModelResults = new RigReservoirCellResults(this); m_fractureModelResults = new RigReservoirCellResults(this); @@ -80,22 +78,6 @@ void RigMainGrid::initAllSubCellsMainGridCellIndex() } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -size_t RigMainGrid::globalMatrixModelActiveCellCount() const -{ - return m_globalMatrixModelActiveCellCount; - -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -size_t RigMainGrid::globalFractureModelActiveCellCount() const -{ - return m_globalFractureModelActiveCellCount; -} //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ReservoirDataModel/RigMainGrid.h b/ApplicationCode/ReservoirDataModel/RigMainGrid.h index fe73c4dd78..fbd09d325d 100644 --- a/ApplicationCode/ReservoirDataModel/RigMainGrid.h +++ b/ApplicationCode/ReservoirDataModel/RigMainGrid.h @@ -45,11 +45,6 @@ public: RigReservoirCellResults* results(RifReaderInterface::PorosityModelResultType porosityModel); const RigReservoirCellResults* results(RifReaderInterface::PorosityModelResultType porosityModel) const; - size_t globalMatrixModelActiveCellCount() const; - size_t globalFractureModelActiveCellCount() const; - void setGlobalMatrixModelActiveCellCount (size_t globalMatrixModelActiveCellCount) { m_globalMatrixModelActiveCellCount = globalMatrixModelActiveCellCount; } - void setGlobalFractureModelActiveCellCount(size_t globalFractureModelActiveCellCount) { m_globalFractureModelActiveCellCount = globalFractureModelActiveCellCount;} - void matrixModelActiveCellsBoundingBox(cvf::Vec3st& min, cvf::Vec3st& max) const; void validCellsBoundingBox(cvf::Vec3st& min, cvf::Vec3st& max) const; @@ -79,9 +74,6 @@ private: cvf::ref m_matrixModelResults; cvf::ref m_fractureModelResults; - size_t m_globalMatrixModelActiveCellCount; - size_t m_globalFractureModelActiveCellCount; - cvf::Vec3st m_activeCellPositionMin; cvf::Vec3st m_activeCellPositionMax; cvf::Vec3st m_validCellPositionMin;