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

#9493 grid calculator on active cells only

Browse Source 
* Janitor: Improve getter for RigActiveCellInfo::gridActiveCellCounts.
* #9493 Grid Calculator: calculate on only active cells.
* #9493 Grid Calculator: filter with active cells.
* Fix calculation for input grid cases
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
This commit is contained in:
Kristian Bendiksen
2022-11-24 10:44:03 +01:00
committed by GitHub
parent e8789f3d4b
commit 99e9944e6e
5 changed files with 87 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -1178,11 +1178,8 @@ void RifReaderEclipseOutput::sourSimRlResult( const QString& result, size_t step
return;
}
size_t activeCellCount = cvf::UNDEFINED_SIZE_T;
{
RigActiveCellInfo* fracActCellInfo = m_eclipseCase->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
fracActCellInfo->gridActiveCellCounts( 0, activeCellCount );
}
RigActiveCellInfo* fracActCellInfo = m_eclipseCase->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
size_t activeCellCount = fracActCellInfo->gridActiveCellCounts( 0 );
size_t fileIndex = timeStepIndexOnFile( stepIndex );
@@ -2262,10 +2259,8 @@ QStringList RifReaderEclipseOutput::validKeywordsForPorosityModel( const QString
{
if ( timeStepCount == 1 )
{
size_t mainGridMatrixActiveCellCount;
matrixActiveCellInfo->gridActiveCellCounts( 0, mainGridMatrixActiveCellCount );
size_t mainGridFractureActiveCellCount;
fractureActiveCellInfo->gridActiveCellCounts( 0, mainGridFractureActiveCellCount );
size_t mainGridMatrixActiveCellCount = matrixActiveCellInfo->gridActiveCellCounts( 0 );
size_t mainGridFractureActiveCellCount = fractureActiveCellInfo->gridActiveCellCounts( 0 );
if ( keywordDataItemCount == mainGridMatrixActiveCellCount ||
keywordDataItemCount == mainGridFractureActiveCellCount ||
@@ -2413,11 +2408,8 @@ void RifReaderEclipseOutput::extractResultValuesBasedOnPorosityModel( RiaDefines
{
if ( m_eclipseCase->mainGrid()->gridByIndex( i )->isTempGrid() ) continue;
size_t matrixActiveCellCount = 0;
size_t fractureActiveCellCount = 0;
actCellInfo->gridActiveCellCounts( i, matrixActiveCellCount );
fracActCellInfo->gridActiveCellCounts( i, fractureActiveCellCount );
size_t matrixActiveCellCount = actCellInfo->gridActiveCellCounts( i );
size_t fractureActiveCellCount = fracActCellInfo->gridActiveCellCounts( i );
if ( matrixOrFracture == RiaDefines::PorosityModelType::MATRIX_MODEL )
{