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

#7358 Summary Curve Resampling : Use helper code in RiaSummaryTools

Browse Source
This commit is contained in:
Magne Sjaastad
2021-02-12 10:50:58 +01:00
parent e76be1ebd3
commit 721d912f9e
6 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp
View File

@@ -20,7 +20,6 @@
#include "RiaQDateTimeTools.h"
#include "RiaSummaryTools.h"
#include "RiaTimeHistoryCurveResampler.h"
#include "RifSummaryReaderInterface.h"
#include "RimSummaryCase.h"
@@ -220,27 +219,18 @@ caf::PdmObjectHandle* RimSummaryCase_resampleValues::execute()
// Error message
}
auto timeValues = sumReader->timeSteps( adr );
const auto& timeValues = sumReader->timeSteps( adr );
QString periodString = m_resamplingPeriod().trimmed();
RiaQDateTimeTools::DateTimePeriod period = RiaQDateTimeTools::DateTimePeriodEnum::fromText( periodString );
if ( period != RiaQDateTimeTools::DateTimePeriod::NONE )
{
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( values, timeValues );
auto [resampledTimeSteps, resampledValues] =
RiaSummaryTools::resampledValuesForPeriod( adr, timeValues, values, period );
if ( RiaSummaryTools::hasAccumulatedData( adr ) )
{
resampler.resampleAndComputePeriodEndValues( period );
}
else
{
resampler.resampleAndComputeWeightedMeanValues( period );
}
dataObject->m_timeValues = resampler.resampledTimeSteps();
dataObject->m_doubleValues = resampler.resampledValues();
dataObject->m_timeValues = resampledTimeSteps;
dataObject->m_doubleValues = resampledValues;
}
else
{