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

Merge pull request #5099 from OPM/improve-ensemble-statistics

Browse Source 
Improve ensemble statistics
This commit is contained in:
Magne Sjaastad 2019-11-27 09:57:17 +01:00
parent e4a4b40a3c
commit 4f4c48635b
5 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -1055,7 +1055,7 @@ void RimEnsembleCurveSet::updateStatisticsCurves( const std::vector<RimSummaryCa
else
statCases = group->allSummaryCases();
}
m_ensembleStatCase->calculate( statCases );
m_ensembleStatCase->calculate( statCases, m_statistics->includeIncompleteCurves() );
}
RimSummaryPlot* plot = nullptr;

5
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp
View File

@ -43,6 +43,8 @@ RimEnsembleStatistics::RimEnsembleStatistics()
CAF_PDM_InitField( &m_showP90Curve, "ShowP90Curve", true, "P10", "", "", "" ); // Yes, P10
CAF_PDM_InitField( &m_showMeanCurve, "ShowMeanCurve", true, "Mean", "", "", "" );
CAF_PDM_InitField( &m_showCurveLabels, "ShowCurveLabels", true, "Show Curve Labels", "", "", "" );
CAF_PDM_InitField( &m_includeIncompleteCurves, "IncludeIncompleteCurves", false, "Include Incomplete Curves", "", "", "" );
CAF_PDM_InitField( &m_warningLabel, "WarningLabel", QString( "Warning: Ensemble time range mismatch" ), "", "", "", "" );
CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3::BLACK ), "Color", "", "", "" );
@ -100,7 +102,7 @@ void RimEnsembleStatistics::fieldChangedByUi( const caf::PdmFieldHandle* changed
{
if ( changedField == &m_active || changedField == &m_basedOnFilteredCases || changedField == &m_showP10Curve ||
changedField == &m_showP50Curve || changedField == &m_showP90Curve || changedField == &m_showMeanCurve ||
changedField == &m_showCurveLabels || changedField == &m_color )
changedField == &m_showCurveLabels || changedField == &m_color || changedField == &m_includeIncompleteCurves )
{
auto curveSet = parentCurveSet();
if ( !curveSet ) return;
@ -129,6 +131,7 @@ void RimEnsembleStatistics::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
uiOrdering.add( &m_active );
uiOrdering.add( &m_hideEnsembleCurves );
uiOrdering.add( &m_basedOnFilteredCases );
uiOrdering.add( &m_includeIncompleteCurves );
uiOrdering.add( &m_showCurveLabels );
uiOrdering.add( &m_color );

6
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatistics.h
View File

@ -72,6 +72,11 @@ public:
return m_color;
}
bool includeIncompleteCurves() const
{
return m_includeIncompleteCurves;
}
void disableP10Curve( bool disable );
void disableP50Curve( bool disable );
void disableP90Curve( bool disable );
@ -93,6 +98,7 @@ private:
caf::PdmField<bool> m_showP90Curve;
caf::PdmField<bool> m_showMeanCurve;
caf::PdmField<bool> m_showCurveLabels;
caf::PdmField<bool> m_includeIncompleteCurves;
caf::PdmField<QString> m_warningLabel;

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

@ -117,12 +117,16 @@ const RimEnsembleCurveSet* RimEnsembleStatisticsCase::curveSet() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*>& sumCases )
void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*>& sumCases, bool includeIncompleteCurves )
{
auto inputAddress = m_curveSet->summaryAddress();
if ( m_statisticsReader && inputAddress.isValid() )
{
calculate( validSummaryCases( sumCases, inputAddress ), inputAddress );
const std::vector<RimSummaryCase*>& validCases = validSummaryCases( sumCases,
inputAddress,
includeIncompleteCurves );
calculate( validCases, inputAddress, includeIncompleteCurves );
}
}
@ -130,24 +134,27 @@ void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*>& s
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*> sumCases,
const RifEclipseSummaryAddress& inputAddress )
const RifEclipseSummaryAddress& inputAddress,
bool includeIncompleteCurves )
{
std::vector<time_t> allTimeSteps;
std::vector<std::vector<double>> allValues;
std::vector<std::vector<double>> caseAndTimeStepValues;
if ( !inputAddress.isValid() ) return;
allValues.reserve( sumCases.size() );
caseAndTimeStepValues.reserve( sumCases.size() );
for ( const auto& sumCase : sumCases )
{
const auto& reader = sumCase->summaryReader();
if ( reader )
{
std::vector<time_t> timeSteps = reader->timeSteps( inputAddress );
std::vector<double> values;
const std::vector<time_t>& timeSteps = reader->timeSteps( inputAddress );
std::vector<double> values;
reader->values( inputAddress, &values );
if ( timeSteps.size() != values.size() ) continue;
if ( values.empty() ) continue;
if ( !includeIncompleteCurves && timeSteps.size() != values.size() ) continue;
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( values, timeSteps );
@ -157,7 +164,7 @@ void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*> su
resampler.resampleAndComputeWeightedMeanValues( DateTimePeriod::DAY );
if ( allTimeSteps.empty() ) allTimeSteps = resampler.resampledTimeSteps();
allValues.push_back(
caseAndTimeStepValues.push_back(
std::vector<double>( resampler.resampledValues().begin(), resampler.resampledValues().end() ) );
}
}
@ -165,14 +172,17 @@ void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*> su
clearData();
m_timeSteps = allTimeSteps;
for ( int t = 0; t < (int)allTimeSteps.size(); t++ )
for ( size_t timeStepIndex = 0; timeStepIndex < allTimeSteps.size(); timeStepIndex++ )
{
std::vector<double> valuesAtTimeStep;
valuesAtTimeStep.reserve( sumCases.size() );
for ( int c = 0; c < (int)sumCases.size(); c++ )
for ( const std::vector<double>& caseValues : caseAndTimeStepValues )
{
valuesAtTimeStep.push_back( allValues[c][t] );
if ( timeStepIndex < caseValues.size() )
{
valuesAtTimeStep.push_back( caseValues[timeStepIndex] );
}
}
double p10, p50, p90, mean;
@ -213,7 +223,8 @@ void RimEnsembleStatisticsCase::clearData()
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCase*> RimEnsembleStatisticsCase::validSummaryCases( const std::vector<RimSummaryCase*> allSumCases,
const RifEclipseSummaryAddress& inputAddress )
const RifEclipseSummaryAddress& inputAddress,
bool includeIncompleteCurves )
{
std::vector<RimSummaryCase*> validCases;
std::vector<std::tuple<RimSummaryCase*, time_t, time_t>> times;
@ -245,8 +256,13 @@ std::vector<RimSummaryCase*> RimEnsembleStatisticsCase::validSummaryCases( const
time_t firstTimeStep = std::get<1>( item );
time_t lastTimeStep = std::get<2>( item );
if ( firstTimeStep == minTimeStep && lastTimeStep == maxTimeStep )
if ( firstTimeStep == minTimeStep )
{
if ( !includeIncompleteCurves && lastTimeStep != maxTimeStep )
{
continue;
}
validCases.push_back( sumCase );
}
}

11
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.h
View File

@ -65,14 +65,17 @@ public:
const RimEnsembleCurveSet* curveSet() const;
void calculate( const std::vector<RimSummaryCase*>& sumCases );
void calculate( const std::vector<RimSummaryCase*>& sumCases, bool includeIncompleteCurves );
RiaEclipseUnitTools::UnitSystem unitSystem() const;
private:
void calculate( const std::vector<RimSummaryCase*> sumCases, const RifEclipseSummaryAddress& inputAddress );
void clearData();
void calculate( const std::vector<RimSummaryCase*> sumCases,
const RifEclipseSummaryAddress& inputAddress,
bool includeIncompleteCurves );
void clearData();
std::vector<RimSummaryCase*> validSummaryCases( const std::vector<RimSummaryCase*> allSumCases,
const RifEclipseSummaryAddress& inputAddress );
const RifEclipseSummaryAddress& inputAddress,
bool includeIncompleteCurves );
private:
std::unique_ptr<RifEnsembleStatisticsReader> m_statisticsReader;