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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2019-03-11 11:45:35 +01:00
parent 79a7dfd0c6
commit 70c3b4df71
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationCode/FileInterface/RifEnsembleStatisticsReader.cpp
View File

@ -20,7 +20,6 @@
#include "RimEnsembleStatisticsCase.h" #include "RimEnsembleStatisticsCase.h"
static const std::vector<time_t> EMPTY_TIME_STEPS_VECTOR; static const std::vector<time_t> EMPTY_TIME_STEPS_VECTOR;
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -33,12 +32,10 @@ RifEnsembleStatisticsReader::RifEnsembleStatisticsReader(RimEnsembleStatisticsCa
m_ensembleStatCase = ensStatCase; m_ensembleStatCase = ensStatCase;
m_allResultAddresses = std::set<RifEclipseSummaryAddress>( m_allResultAddresses = std::set<RifEclipseSummaryAddress>(
{ {RifEclipseSummaryAddress::ensembleStatisticsAddress(ENSEMBLE_STAT_P10_QUANTITY_NAME, ""),
RifEclipseSummaryAddress::ensembleStatisticsAddress(ENSEMBLE_STAT_P10_QUANTITY_NAME, ""),
RifEclipseSummaryAddress::ensembleStatisticsAddress(ENSEMBLE_STAT_P50_QUANTITY_NAME, ""), RifEclipseSummaryAddress::ensembleStatisticsAddress(ENSEMBLE_STAT_P50_QUANTITY_NAME, ""),
RifEclipseSummaryAddress::ensembleStatisticsAddress(ENSEMBLE_STAT_P90_QUANTITY_NAME, ""), RifEclipseSummaryAddress::ensembleStatisticsAddress(ENSEMBLE_STAT_P90_QUANTITY_NAME, ""),
RifEclipseSummaryAddress::ensembleStatisticsAddress(ENSEMBLE_STAT_MEAN_QUANTITY_NAME, "") RifEclipseSummaryAddress::ensembleStatisticsAddress(ENSEMBLE_STAT_MEAN_QUANTITY_NAME, "")});
});
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -60,16 +57,21 @@ bool RifEnsembleStatisticsReader::values(const RifEclipseSummaryAddress& resultA
const std::vector<double>* sourceData = nullptr; const std::vector<double>* sourceData = nullptr;
auto quantityName = resultAddress.ensembleStatisticsQuantityName(); auto quantityName = resultAddress.ensembleStatisticsQuantityName();
if (quantityName == ENSEMBLE_STAT_P10_QUANTITY_NAME) sourceData = &m_ensembleStatCase->p10(); if (quantityName == ENSEMBLE_STAT_P10_QUANTITY_NAME)
else if (quantityName == ENSEMBLE_STAT_P50_QUANTITY_NAME) sourceData = &m_ensembleStatCase->p50(); sourceData = &m_ensembleStatCase->p10();
else if (quantityName == ENSEMBLE_STAT_P90_QUANTITY_NAME) sourceData = &m_ensembleStatCase->p90(); else if (quantityName == ENSEMBLE_STAT_P50_QUANTITY_NAME)
else if (quantityName == ENSEMBLE_STAT_MEAN_QUANTITY_NAME) sourceData = &m_ensembleStatCase->mean(); sourceData = &m_ensembleStatCase->p50();
else if (quantityName == ENSEMBLE_STAT_P90_QUANTITY_NAME)
sourceData = &m_ensembleStatCase->p90();
else if (quantityName == ENSEMBLE_STAT_MEAN_QUANTITY_NAME)
sourceData = &m_ensembleStatCase->mean();
if (!sourceData) return false; if (!sourceData) return false;
values->clear(); values->clear();
values->reserve(sourceData->size()); values->reserve(sourceData->size());
for (auto val : *sourceData) values->push_back(val); for (auto val : *sourceData)
values->push_back(val);
return true; return true;
} }
@ -86,6 +88,5 @@ std::string RifEnsembleStatisticsReader::unitName(const RifEclipseSummaryAddress
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifEnsembleStatisticsReader::validateAddress(const RifEclipseSummaryAddress& address) const bool RifEnsembleStatisticsReader::validateAddress(const RifEclipseSummaryAddress& address) const
{ {
return address.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS && return address.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS && !address.quantityName().empty();
!address.quantityName().empty();
} }