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

Simplify RifSummaryReaderInterface timeSteps.

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-02-13 12:40:08 +01:00
committed by Magne Sjaastad
parent 5c5e460025
commit 69a668df50
32 changed files with 62 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/Application/RiaSummaryCurveDefinition.cpp
View File

@@ -117,15 +117,13 @@ void RiaSummaryCurveDefinition::resultValues( const RiaSummaryCurveDefinition&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RiaSummaryCurveDefinition::timeSteps( const RiaSummaryCurveDefinition& curveDefinition )
std::vector<time_t> RiaSummaryCurveDefinition::timeSteps( const RiaSummaryCurveDefinition& curveDefinition )
{
static std::vector<time_t> dummy;
if ( !curveDefinition.summaryAddress().isValid() ) return dummy;
if ( !curveDefinition.summaryCase() ) return dummy;
if ( !curveDefinition.summaryAddress().isValid() ) return {};
if ( !curveDefinition.summaryCase() ) return {};
RifSummaryReaderInterface* reader = curveDefinition.summaryCase()->summaryReader();
if ( !reader ) return dummy;
if ( !reader ) return {};
return reader->timeSteps( curveDefinition.summaryAddress() );
}

2
ApplicationLibCode/Application/RiaSummaryCurveDefinition.h
View File

@@ -52,7 +52,7 @@ public:
// TODO: Consider moving to a separate tools class
static void resultValues( const RiaSummaryCurveDefinition& curveDefinition, gsl::not_null<std::vector<double>*> values );
static const std::vector<time_t>& timeSteps( const RiaSummaryCurveDefinition& curveDefinition );
static std::vector<time_t> timeSteps( const RiaSummaryCurveDefinition& curveDefinition );
QString curveDefinitionText() const;