#9773 Ensemble statistics: determine sub-sampling period dynamically.

OPM · Apr 19, 2023 · d49affc · d49affc
1 parent 7d5e6ba
commit d49affc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
@@ -21,6 +21,7 @@
 #include "RifEnsembleStatisticsReader.h"
 
 #include "RiaSummaryTools.h"
+#include "RiaTimeHistoryCurveResampler.h"
 
 #include "RigStatisticsMath.h"
 
@@ -146,6 +147,10 @@ void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*>& s
 
     if ( !inputAddress.isValid() ) return;
 
+    auto [minTimeStep, maxTimeStep] = findMinMaxTimeStep( sumCases, inputAddress );
+
+    RiaDefines::DateTimePeriod period = findBestResamplingPeriod( minTimeStep, maxTimeStep );
+
     caseAndTimeStepValues.reserve( sumCases.size() );
     for ( const auto& sumCase : sumCases )
     {
@@ -160,8 +165,7 @@ void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*>& s
 
             if ( !includeIncompleteCurves && timeSteps.size() != values.size() ) continue;
 
-            auto [resampledTimeSteps, resampledValues] =
-                RiaSummaryTools::resampledValuesForPeriod( inputAddress, timeSteps, values, RiaDefines::DateTimePeriod::DAY );
+            auto [resampledTimeSteps, resampledValues] = RiaSummaryTools::resampledValuesForPeriod( inputAddress, timeSteps, values, period );
 
             if ( allTimeSteps.empty() ) allTimeSteps = resampledTimeSteps;
             caseAndTimeStepValues.push_back( resampledValues );

diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.h b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.h
@@ -18,7 +18,9 @@
 
 #pragma once
 
+#include "RiaDateTimeDefines.h"
 #include "RiaDefines.h"
+
 #include "RifEclipseSummaryAddress.h"
 
 #include "RimSummaryCase.h"
@@ -62,6 +64,7 @@ class RimEnsembleStatisticsCase : public RimSummaryCase
                                                            bool                                includeIncompleteCurves );
     static std::pair<time_t, time_t>    findMinMaxTimeStep( const std::vector<RimSummaryCase*>& sumCases,
                                                             const RifEclipseSummaryAddress&     inputAddress );
+    static RiaDefines::DateTimePeriod   findBestResamplingPeriod( time_t minTimeStep, time_t maxTimeStep );
 
 private:
     std::unique_ptr<RifEnsembleStatisticsReader> m_statisticsReader;