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

#10648 Refactor summary reader: return std::vector<double> instead of taking ptr.

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-09-29 17:52:31 +02:00
parent 263e39b97b
commit d177491843
49 changed files with 204 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationLibCode/FileInterface/RifSummaryReaderMultipleFiles.cpp
View File

@@ -43,12 +43,12 @@ std::vector<time_t> RifSummaryReaderMultipleFiles::timeSteps( const RifEclipseSu
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifSummaryReaderMultipleFiles::values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const
std::pair<bool, std::vector<double>> RifSummaryReaderMultipleFiles::values( const RifEclipseSummaryAddress& resultAddress ) const
{
std::vector<double> values;
for ( const auto& reader : m_summaryReaders )
{
std::vector<double> readerValues;
reader->values( resultAddress, &readerValues );
auto [isOk, readerValues] = reader->values( resultAddress );
if ( readerValues.empty() )
{
@@ -60,19 +60,18 @@ bool RifSummaryReaderMultipleFiles::values( const RifEclipseSummaryAddress& resu
// https://github.com/OPM/ResInsight/issues/7065
std::vector<double> zeros( reader->timeSteps( {} ).size(), 0.0 );
readerValues = zeros;
}
auto valueCount = timeStepCount( reader.get() );
readerValues.resize( valueCount );
values->insert( values->end(), readerValues.begin(), readerValues.end() );
values.insert( values.end(), readerValues.begin(), readerValues.end() );
}
CAF_ASSERT( m_aggregatedTimeSteps.size() == values->size() );
CAF_ASSERT( m_aggregatedTimeSteps.size() == values.size() );
return true;
return { true, values };
}
//--------------------------------------------------------------------------------------------------