Skip to content

Commit

Permalink
Revert "Early return if data already is available"
Browse files Browse the repository at this point in the history
This reverts commit 274d4fc.
  • Loading branch information
magnesj committed Apr 22, 2024
1 parent 745f988 commit 91c82f0
Showing 1 changed file with 1 addition and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1587,13 +1587,6 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultByResultTypeOrder( con
//--------------------------------------------------------------------------------------------------
size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const RigEclipseResultAddress& resVarAddr, size_t timeStepIndex )
{
size_t scalarResultIndex = findScalarResultIndexFromAddress( resVarAddr );
if ( scalarResultIndex == cvf::UNDEFINED_SIZE_T )
{
return cvf::UNDEFINED_SIZE_T;
}
if ( isDataPresent( scalarResultIndex ) ) return scalarResultIndex;

RiaDefines::ResultCatType type = resVarAddr.resultCatType();
QString resultName = resVarAddr.resultName();

Expand Down Expand Up @@ -1622,6 +1615,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const Rig
return completionTypeScalarResultIndex;
}

size_t scalarResultIndex = findScalarResultIndexFromAddress( resVarAddr );
if ( scalarResultIndex == cvf::UNDEFINED_SIZE_T ) return cvf::UNDEFINED_SIZE_T;

if ( type == RiaDefines::ResultCatType::GENERATED )
Expand Down

0 comments on commit 91c82f0

Please sign in to comment.