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

55
ApplicationCode/ReservoirDataModel/RigGridBase.cpp
View File

@@ -473,13 +473,6 @@ double RigGridBase::characteristicCellSize()
//--------------------------------------------------------------------------------------------------
size_t RigGridBase::matrixModelActiveCellCount()
{
if (m_matrixModelActiveCellCount == cvf::UNDEFINED_SIZE_T)
{
computeMatrixAndFractureModelActiveCellCount();
}
CVF_ASSERT(m_matrixModelActiveCellCount != cvf::UNDEFINED_SIZE_T);
return m_matrixModelActiveCellCount;
}
@@ -488,16 +481,9 @@ size_t RigGridBase::matrixModelActiveCellCount()
//--------------------------------------------------------------------------------------------------
size_t RigGridBase::fractureModelActiveCellCount()
{
if (m_fractureModelActiveCellCount == cvf::UNDEFINED_SIZE_T)
{
computeMatrixAndFractureModelActiveCellCount();
}
CVF_ASSERT(m_fractureModelActiveCellCount != cvf::UNDEFINED_SIZE_T);
return m_fractureModelActiveCellCount;
}
/*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -506,20 +492,38 @@ void RigGridBase::computeMatrixAndFractureModelActiveCellCount()
m_matrixModelActiveCellCount = 0;
m_fractureModelActiveCellCount = 0;
size_t higestActiveIndexInMM = 0;
size_t higestActiveIndexInFM = 0;
bool firstMMActiveCell = true;
bool firstFMActiveCell = true;
for (size_t i = 0; i < cellCount(); i++)
{
const RigCell& c = cell(i);
if (c.isActiveInMatrixModel())
{
if (c.activeIndexInMatrixModel() > higestActiveIndexInMM || firstMMActiveCell)
{
m_matrixModelActiveCellCount++;
higestActiveIndexInMM = c.activeIndexInMatrixModel();
firstMMActiveCell = false;
}
}
if (c.isActiveInFractureModel())
{
if (c.activeIndexInFractureModel() > higestActiveIndexInFM || firstFMActiveCell)
{
m_fractureModelActiveCellCount++;
higestActiveIndexInFM = c.activeIndexInFractureModel();
firstFMActiveCell = false;
}
}
}
*/
//--------------------------------------------------------------------------------------------------
@@ -537,6 +541,27 @@ cvf::ref<RigGridScalarDataAccess> RigGridBase::dataAccessObject(RifReaderInterfa
return NULL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigGridBase::setFractureModelActiveCellCount(size_t activeFractureModelCellCount)
{
m_fractureModelActiveCellCount = activeFractureModelCellCount;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigGridBase::setMatrixModelActiveCellCount(size_t activeMatrixModelCellCount)
{
m_matrixModelActiveCellCount = activeMatrixModelCellCount;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------