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

#9722 Grid Group Statistics: Guard accessing empty data structures

Browse Source
This commit is contained in:
Magne Sjaastad
2023-01-24 12:59:44 +01:00
parent 583c248cf9
commit a770f89082
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationLibCode/ReservoirDataModel/RigResultModifierFactory.cpp
View File

@@ -36,11 +36,6 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier( RigE
{
if ( !eclipseCase ) return nullptr;
if ( !eclipseCase->results( porosityModel ) || !eclipseCase->activeCellInfo( porosityModel ) )
{
return nullptr;
}
if ( !resVarAddr.isValid() )
{
return nullptr;
@@ -52,8 +47,15 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier( RigE
return nullptr;
}
auto scalarSetResults = eclipseCase->results( porosityModel )->modifiableCellScalarResultTimesteps( resVarAddr );
if ( !eclipseCase->results( porosityModel ) || !eclipseCase->activeCellInfo( porosityModel ) )
{
return nullptr;
}
auto cellResultsData = eclipseCase->results( porosityModel );
if ( !cellResultsData->hasResultEntry( resVarAddr ) ) return nullptr;
auto scalarSetResults = cellResultsData->modifiableCellScalarResultTimesteps( resVarAddr );
if ( timeStepIndex >= scalarSetResults->size() )
{
return nullptr;
@@ -67,16 +69,14 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier( RigE
if ( resultValues->empty() ) return nullptr;
bool useGlobalActiveIndex = eclipseCase->results( porosityModel )->isUsingGlobalActiveIndex( resVarAddr );
bool useGlobalActiveIndex = cellResultsData->isUsingGlobalActiveIndex( resVarAddr );
if ( useGlobalActiveIndex )
{
cvf::ref<RigResultModifier> object =
new RigActiveCellsResultModifier( grid, eclipseCase->activeCellInfo( porosityModel ), resultValues );
return object;
}
else
{
cvf::ref<RigResultModifier> object = new RigAllGridCellsResultModifier( grid, resultValues );
return object;
}
cvf::ref<RigResultModifier> object = new RigAllGridCellsResultModifier( grid, resultValues );
return object;
}