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

Compute active and fracture cell count for all grids

Browse Source 
Renamed numActiveCells on maingrid to globalMatrixActiveCellCount
p4#: 20295
This commit is contained in:
Magne Sjaastad
2013-01-30 10:39:45 +01:00
parent 76721130eb
commit 4275e67a82
9 changed files with 95 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -29,7 +29,7 @@ RigMainGrid::RigMainGrid(void)
m_activeCellPositionMax(cvf::Vec3st::UNDEFINED),
m_validCellPositionMin(cvf::Vec3st::UNDEFINED),
m_validCellPositionMax(cvf::Vec3st::UNDEFINED),
m_activeCellCount(cvf::UNDEFINED_SIZE_T)
m_globalMatrixActiveCellCount(cvf::UNDEFINED_SIZE_T)
{
m_results = new RigReservoirCellResults(this);
@@ -82,9 +82,9 @@ void RigMainGrid::initAllSubCellsMainGridCellIndex()
/// Calculates the number of active cells in the complete reservoir.
/// Caches the result, so subsequent calls are fast
//--------------------------------------------------------------------------------------------------
size_t RigMainGrid::numActiveCells()
size_t RigMainGrid::globalMatrixActiveCellCount()
{
if (m_activeCellCount != cvf::UNDEFINED_SIZE_T) return m_activeCellCount;
if (m_globalMatrixActiveCellCount != cvf::UNDEFINED_SIZE_T) return m_globalMatrixActiveCellCount;
if (m_cells.size() == 0) return 0;
@@ -96,8 +96,8 @@ size_t RigMainGrid::numActiveCells()
if (m_cells[i].matrixActive()) numActiveCells++;
}
m_activeCellCount = numActiveCells;
return m_activeCellCount;
m_globalMatrixActiveCellCount = numActiveCells;
return m_globalMatrixActiveCellCount;
}
@@ -248,6 +248,7 @@ void RigMainGrid::computeCachedData()
initAllSubCellsMainGridCellIndex();
computeActiveAndValidCellRanges();
computeBoundingBox();
computeActiveCellCountForAllGrids();
}
//--------------------------------------------------------------------------------------------------
@@ -264,7 +265,7 @@ void RigMainGrid::calculateActiveCellInfo(std::vector<qint32> &gridNumber,
std::vector<qint32> &hostCellJ,
std::vector<qint32> &hostCellK)
{
size_t numActiveCells = this->numActiveCells();
size_t numActiveCells = this->globalMatrixActiveCellCount();
gridNumber.clear();
cellI.clear();
@@ -344,3 +345,17 @@ const RigGridBase* RigMainGrid::gridByIndex(size_t localGridIndex) const
CVF_ASSERT(localGridIndex - 1 < m_localGrids.size()) ;
return m_localGrids[localGridIndex-1].p();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::computeActiveCellCountForAllGrids()
{
computeMatrixAndFractureActiveCellCount();
size_t i;
for (i = 0; i < m_localGrids.size(); ++i)
{
m_localGrids[i]->computeMatrixAndFractureActiveCellCount();
}
}