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

#3077 Ensemble statistics. Option to base stat calc on filtered cases or all cases

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-06-29 12:34:56 +02:00
parent 0c1c454cdc
commit bcf7938427
6 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
View File

@@ -118,13 +118,12 @@ const RimEnsembleCurveSet* RimEnsembleStatisticsCase::curveSet() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleStatisticsCase::calculate()
void RimEnsembleStatisticsCase::calculate(const std::vector<RimSummaryCase*>& sumCases)
{
auto inputAddress = m_curveSet->summaryAddress();
auto ensemble = m_curveSet->summaryCaseCollection();
if (m_statisticsReader && ensemble && inputAddress.isValid())
if (m_statisticsReader && inputAddress.isValid())
{
calculate(validSummaryCases(ensemble->allSummaryCases(), inputAddress), inputAddress);
calculate(validSummaryCases(sumCases, inputAddress), inputAddress);
}
}
@@ -211,7 +210,7 @@ std::vector<RimSummaryCase*> RimEnsembleStatisticsCase::validSummaryCases(const
const auto& reader = sumCase->summaryReader();
if (reader)
{
std::vector<time_t> timeSteps = reader->timeSteps(inputAddress);
const std::vector<time_t>& timeSteps = reader->timeSteps(inputAddress);
if (!timeSteps.empty())
{
time_t firstTimeStep = timeSteps.front();