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

#5784 Contour Map : Guard null pointer access

Browse Source
This commit is contained in:
Magne Sjaastad 2020-04-10 08:05:06 +02:00
parent d748cfc96f
commit c56385361e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
View File

@ -260,9 +260,9 @@ std::vector<double> RimEclipseContourMapProjection::calculateColumnResult( Resul
const RigCaseCellResultsData* resultData = eclipseCase()->results( RiaDefines::MATRIX_MODEL ); const RigCaseCellResultsData* resultData = eclipseCase()->results( RiaDefines::MATRIX_MODEL );
bool hasPoroResult = resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PORO" ) ); bool hasPoroResult = resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PORO" ) );
bool hasNtgResult = resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "NTG" ) ); bool hasNtgResult = resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "NTG" ) );
bool haDzResult = resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ) ); bool hasDzResult = resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ) );
if ( !( hasPoroResult && hasNtgResult && haDzResult ) ) if ( !( hasPoroResult && hasNtgResult && hasDzResult ) )
{ {
return std::vector<double>(); return std::vector<double>();
} }
@ -291,6 +291,9 @@ std::vector<double> RimEclipseContourMapProjection::calculateColumnResult( Resul
} }
if ( resultAggregation == RESULTS_GAS_COLUMN || resultAggregation == RESULTS_HC_COLUMN ) if ( resultAggregation == RESULTS_GAS_COLUMN || resultAggregation == RESULTS_HC_COLUMN )
{
bool hasGasResult = resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::DYNAMIC_NATIVE, "SGAS" ) );
if ( hasGasResult )
{ {
const std::vector<double>& sgasResults = const std::vector<double>& sgasResults =
resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::DYNAMIC_NATIVE, "SGAS" ), timeStep ); resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::DYNAMIC_NATIVE, "SGAS" ), timeStep );
@ -299,6 +302,7 @@ std::vector<double> RimEclipseContourMapProjection::calculateColumnResult( Resul
resultValues[cellResultIdx] += sgasResults[cellResultIdx]; resultValues[cellResultIdx] += sgasResults[cellResultIdx];
} }
} }
}
for ( size_t cellResultIdx = 0; cellResultIdx < resultValues.size(); ++cellResultIdx ) for ( size_t cellResultIdx = 0; cellResultIdx < resultValues.size(); ++cellResultIdx )
{ {