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

Results from a case with Coarse cells is now finally ok.

Browse Source 
p4#: 20344
This commit is contained in:
Jacob Støren
2013-02-01 15:33:21 +01:00
parent e9b3759263
commit 3c9ac23534
7 changed files with 89 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -85,11 +85,8 @@ void RigMainGrid::initAllSubCellsMainGridCellIndex()
//--------------------------------------------------------------------------------------------------
size_t RigMainGrid::globalMatrixModelActiveCellCount()
{
if (m_globalMatrixModelActiveCellCount != cvf::UNDEFINED_SIZE_T) return m_globalMatrixModelActiveCellCount;
computeGlobalActiveCellCount();
return m_globalMatrixModelActiveCellCount;
}
//--------------------------------------------------------------------------------------------------
@@ -97,10 +94,6 @@ size_t RigMainGrid::globalMatrixModelActiveCellCount()
//--------------------------------------------------------------------------------------------------
size_t RigMainGrid::globalFractureModelActiveCellCount()
{
if (m_globalFractureModelActiveCellCount != cvf::UNDEFINED_SIZE_T) return m_globalFractureModelActiveCellCount;
computeGlobalActiveCellCount();
return m_globalFractureModelActiveCellCount;
}
@@ -248,7 +241,6 @@ void RigMainGrid::computeCachedData()
initAllSubCellsMainGridCellIndex();
computeActiveAndValidCellRanges();
computeBoundingBox();
computeActiveCellCountForAllGrids();
}
//--------------------------------------------------------------------------------------------------
@@ -345,7 +337,7 @@ const RigGridBase* RigMainGrid::gridByIndex(size_t localGridIndex) const
CVF_ASSERT(localGridIndex - 1 < m_localGrids.size()) ;
return m_localGrids[localGridIndex-1].p();
}
/*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -359,23 +351,24 @@ void RigMainGrid::computeActiveCellCountForAllGrids()
m_localGrids[i]->computeMatrixAndFractureModelActiveCellCount();
}
}
*/
/*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::computeGlobalActiveCellCount()
{
m_globalMatrixModelActiveCellCount = 0;
m_globalFractureModelActiveCellCount = 0;
m_globalMatrixModelActiveCellCount = this->matrixModelActiveCellCount();
m_globalFractureModelActiveCellCount = this->fractureModelActiveCellCount();
size_t i;
for (i = 0; i < m_cells.size(); i++)
for (i = 0; i < m_localGrids.size(); i++)
{
if (m_cells[i].isActiveInMatrixModel()) m_globalMatrixModelActiveCellCount++;
if (m_cells[i].isActiveInFractureModel()) m_globalFractureModelActiveCellCount++;
m_globalMatrixModelActiveCellCount += m_localGrids[i]->matrixModelActiveCellCount() ;
m_globalFractureModelActiveCellCount += m_localGrids[i]->fractureModelActiveCellCount() ;
}
}
*/
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -401,3 +394,4 @@ const RigReservoirCellResults* RigMainGrid::results(RifReaderInterface::Porosity
return m_fractureModelResults.p();
}