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

6
ApplicationLibCode/FileInterface/RifColumnBasedUserData.cpp
View File

@@ -99,7 +99,7 @@ bool RifColumnBasedUserData::values( const RifEclipseSummaryAddress& resultAddre
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifColumnBasedUserData::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifColumnBasedUserData::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
auto search = m_mapFromAddressToTimeStepIndex.find( resultAddress );
if ( search != m_mapFromAddressToTimeStepIndex.end() )
@@ -107,9 +107,7 @@ const std::vector<time_t>& RifColumnBasedUserData::timeSteps( const RifEclipseSu
return m_timeSteps[search->second];
}
static std::vector<time_t> emptyVector;
return emptyVector;
return {};
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/FileInterface/RifColumnBasedUserData.h
View File

@@ -42,7 +42,7 @@ public:
bool parse( const QString& data, QString* errorText = nullptr );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;

5
ApplicationLibCode/FileInterface/RifCsvUserData.cpp
View File

@@ -93,7 +93,7 @@ bool RifCsvUserData::values( const RifEclipseSummaryAddress& resultAddress, std:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifCsvUserData::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifCsvUserData::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
// First, check whether date time values exist for the current address
auto search = m_mapFromAddressToResultIndex.find( resultAddress );
@@ -113,8 +113,7 @@ const std::vector<time_t>& RifCsvUserData::timeSteps( const RifEclipseSummaryAdd
return m_parser->tableData().columnInfos()[index].dateTimeValues;
}
static std::vector<time_t> emptyVector;
return emptyVector;
return {};
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/FileInterface/RifCsvUserData.h
View File

@@ -44,7 +44,7 @@ public:
bool parse( const QString& fileName, const AsciiDataParseOptions& parseOptions, QString* errorText = nullptr );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;

5
ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.cpp
View File

@@ -52,12 +52,11 @@ RifDerivedEnsembleReader::RifDerivedEnsembleReader( RimDerivedSummaryCase* d
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifDerivedEnsembleReader::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifDerivedEnsembleReader::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
if ( !resultAddress.isValid() )
{
static std::vector<time_t> empty;
return empty;
return {};
}
if ( m_derivedCase->needsCalculation( resultAddress ) )

2
ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.h
View File

@@ -34,7 +34,7 @@ public:
RifSummaryReaderInterface* sourceSummaryReader1,
RifSummaryReaderInterface* sourceSummaryReader2 );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;

2
ApplicationLibCode/FileInterface/RifEclEclipseSummary.cpp
View File

@@ -288,7 +288,7 @@ bool RifEclEclipseSummary::values( const RifEclipseSummaryAddress& resultAddress
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifEclEclipseSummary::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifEclEclipseSummary::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
return m_timeSteps;
}

2
ApplicationLibCode/FileInterface/RifEclEclipseSummary.h
View File

@@ -48,7 +48,7 @@ public:
bool open( const QString& headerFileName, RiaThreadSafeLogger* threadSafeLogger );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;

6
ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp
View File

@@ -22,8 +22,6 @@
#include "RimEnsembleStatisticsCase.h"
#include "RimSummaryCaseCollection.h"
static const std::vector<time_t> EMPTY_TIME_STEPS_VECTOR;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -43,9 +41,9 @@ RifEnsembleStatisticsReader::RifEnsembleStatisticsReader( RimEnsembleStatisticsC
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifEnsembleStatisticsReader::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifEnsembleStatisticsReader::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
if ( !validateAddress( resultAddress ) ) return EMPTY_TIME_STEPS_VECTOR;
if ( !validateAddress( resultAddress ) ) return {};
return m_ensembleStatCase->timeSteps();
}

2
ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.h
View File

@@ -31,7 +31,7 @@ class RifEnsembleStatisticsReader : public RifSummaryReaderInterface
public:
RifEnsembleStatisticsReader( RimEnsembleStatisticsCase* ensStatCase );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;

6
ApplicationLibCode/FileInterface/RifKeywordVectorUserData.cpp
View File

@@ -206,7 +206,7 @@ bool RifKeywordVectorUserData::values( const RifEclipseSummaryAddress& resultAdd
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifKeywordVectorUserData::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifKeywordVectorUserData::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
auto timeIndexIterator = m_mapFromAddressToTimeIndex.find( resultAddress );
if ( timeIndexIterator != m_mapFromAddressToTimeIndex.end() )
@@ -214,9 +214,7 @@ const std::vector<time_t>& RifKeywordVectorUserData::timeSteps( const RifEclipse
return m_timeSteps[timeIndexIterator->second];
}
static std::vector<time_t> emptyVector;
return emptyVector;
return {};
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/FileInterface/RifKeywordVectorUserData.h
View File

@@ -43,7 +43,7 @@ public:
bool parse( const QString& data, const QString& customWellName );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;

6
ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.cpp
View File

@@ -50,16 +50,14 @@ void RifMultipleSummaryReaders::removeReader( RifSummaryReaderInterface* reader
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifMultipleSummaryReaders::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifMultipleSummaryReaders::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
for ( const auto& r : m_readers )
{
if ( r->hasAddress( resultAddress ) ) return r->timeSteps( resultAddress );
}
static std::vector<time_t> empty;
return empty;
return {};
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.h
View File

@@ -35,7 +35,7 @@ public:
void addReader( RifSummaryReaderInterface* reader );
void removeReader( RifSummaryReaderInterface* reader );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;

2
ApplicationLibCode/FileInterface/RifOpmCommonSummary.cpp
View File

@@ -143,7 +143,7 @@ bool RifOpmCommonEclipseSummary::open( const QString& fileName, bool includeRest
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifOpmCommonEclipseSummary::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifOpmCommonEclipseSummary::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
return m_timeSteps;
}

2
ApplicationLibCode/FileInterface/RifOpmCommonSummary.h
View File

@@ -74,7 +74,7 @@ public:
bool open( const QString& fileName, bool includeRestartFiles, RiaThreadSafeLogger* threadSafeLogger );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;

2
ApplicationLibCode/FileInterface/RifOpmHdf5Summary.cpp
View File

@@ -83,7 +83,7 @@ bool RifOpmHdf5Summary::open( const QString& headerFileName, bool includeRestart
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifOpmHdf5Summary::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifOpmHdf5Summary::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
return m_timeSteps;
}

2
ApplicationLibCode/FileInterface/RifOpmHdf5Summary.h
View File

@@ -56,7 +56,7 @@ public:
bool open( const QString& headerFileName, bool includeRestartFiles, RiaThreadSafeLogger* threadSafeLogger );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;

5
ApplicationLibCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -226,13 +226,12 @@ bool RifReaderEclipseSummary::values( const RifEclipseSummaryAddress& resultAddr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderEclipseSummary::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifReaderEclipseSummary::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
auto reader = currentSummaryReader();
if ( reader ) return reader->timeSteps( resultAddress );
static std::vector<time_t> emptyVector;
return emptyVector;
return {};
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h
View File

@@ -49,7 +49,7 @@ public:
bool open( const QString& headerFileName, RiaThreadSafeLogger* threadSafeLogger );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;

2
ApplicationLibCode/FileInterface/RifReaderObservedData.cpp
View File

@@ -146,7 +146,7 @@ bool RifReaderObservedData::values( const RifEclipseSummaryAddress& resultAddres
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderObservedData::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifReaderObservedData::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
return m_timeSteps;
}

2
ApplicationLibCode/FileInterface/RifReaderObservedData.h
View File

@@ -45,7 +45,7 @@ public:
const QString& identifierName,
RifEclipseSummaryAddress::SummaryVarCategory summaryCategory );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;

2
ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h
View File

@@ -44,7 +44,7 @@ public:
RifEclipseSummaryAddress errorAddress( const RifEclipseSummaryAddress& resultAddress ) const;
virtual const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const = 0;
virtual std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const = 0;
virtual bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const = 0;

2
ApplicationLibCode/FileInterface/RifSummaryReaderMultipleFiles.cpp
View File

@@ -35,7 +35,7 @@ RifSummaryReaderMultipleFiles::RifSummaryReaderMultipleFiles( const std::vector<
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifSummaryReaderMultipleFiles::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
std::vector<time_t> RifSummaryReaderMultipleFiles::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
return m_aggregatedTimeSteps;
}

2
ApplicationLibCode/FileInterface/RifSummaryReaderMultipleFiles.h
View File

@@ -39,7 +39,7 @@ public:
bool createReadersAndImportMetaData( RiaThreadSafeLogger* threadSafeLogger );
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
std::vector<time_t> timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;