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

Removed functions from MainGrid

Browse Source 
p4#: 20459
This commit is contained in:
Magne Sjaastad
2013-02-12 12:55:58 +01:00
parent ea2c890b95
commit 6c7dc10791
7 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimInputReservoir.cpp
View File

@@ -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;
}

2
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -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);
}

4
ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
View File

@@ -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);
}

3
ApplicationCode/ProjectDataModel/RimResultReservoir.cpp
View File

@@ -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());
}