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

#1354 Only use active cells in statistics for active cells

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-03-30 11:47:38 +02:00
parent d32461f0ee
commit 63205b4753
2 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.cpp
View File

@ -41,26 +41,10 @@ RigEclipseNativeStatCalc::RigEclipseNativeStatCalc(RigCaseCellResultsData* cellR
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigEclipseNativeStatCalc::minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max) void RigEclipseNativeStatCalc::minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max)
{ {
std::vector<double>& values = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex); MinMaxAccumulator acc(min, max);
traverseCells(acc, timeStepIndex);
size_t i; min = acc.min;
for (i = 0; i < values.size(); i++) max = acc.max;
{
if (values[i] == HUGE_VAL)
{
continue;
}
if (values[i] < min)
{
min = values[i];
}
if (values[i] > max)
{
max = values[i];
}
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -68,9 +52,10 @@ void RigEclipseNativeStatCalc::minMaxCellScalarValues(size_t timeStepIndex, doub
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigEclipseNativeStatCalc::posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg) void RigEclipseNativeStatCalc::posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg)
{ {
std::vector<double>& values = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex); PosNegAccumulator acc(pos, neg);
traverseCells(acc, timeStepIndex);
RigStatisticsCalculator::posNegClosestToZero(values, pos, neg); pos = acc.pos;
neg = acc.neg;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -78,9 +63,7 @@ void RigEclipseNativeStatCalc::posNegClosestToZero(size_t timeStepIndex, double&
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigEclipseNativeStatCalc::addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator) void RigEclipseNativeStatCalc::addDataToHistogramCalculator(size_t timeStepIndex, RigHistogramCalculator& histogramCalculator)
{ {
std::vector<double>& values = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex); traverseCells(histogramCalculator, timeStepIndex);
histogramCalculator.addData(values);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -88,12 +71,9 @@ void RigEclipseNativeStatCalc::addDataToHistogramCalculator(size_t timeStepIndex
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigEclipseNativeStatCalc::uniqueValues(size_t timeStepIndex, std::set<int>& values) void RigEclipseNativeStatCalc::uniqueValues(size_t timeStepIndex, std::set<int>& values)
{ {
std::vector<double>& doubleValues = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex); UniqueValueAccumulator acc;
traverseCells(acc, timeStepIndex);
for (size_t cIdx = 0; cIdx < doubleValues.size(); ++cIdx) values = acc.uniqueValues;
{
values.insert(std::floor(doubleValues[cIdx]));
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -101,22 +81,10 @@ void RigEclipseNativeStatCalc::uniqueValues(size_t timeStepIndex, std::set<int>&
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigEclipseNativeStatCalc::valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount) void RigEclipseNativeStatCalc::valueSumAndSampleCount(size_t timeStepIndex, double& valueSum, size_t& sampleCount)
{ {
std::vector<double>& values = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex); SumCountAccumulator acc(valueSum, sampleCount);
size_t undefValueCount = 0; traverseCells(acc, timeStepIndex);
for (size_t cIdx = 0; cIdx < values.size(); ++cIdx) valueSum = acc.valueSum;
{ sampleCount = acc.sampleCount;
double value = values[cIdx];
if (value == HUGE_VAL || value != value)
{
++undefValueCount;
continue;
}
valueSum += value;
}
sampleCount += values.size();
sampleCount -= undefValueCount;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

32
ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.h
View File

@ -20,6 +20,7 @@
#pragma once #pragma once
#include "RigStatisticsCalculator.h" #include "RigStatisticsCalculator.h"
#include "RigActiveCellInfo.h"
class RigHistogramCalculator; class RigHistogramCalculator;
class RigCaseCellResultsData; class RigCaseCellResultsData;
@ -43,4 +44,35 @@ public:
private: private:
RigCaseCellResultsData* m_resultsData; RigCaseCellResultsData* m_resultsData;
size_t m_scalarResultIndex; size_t m_scalarResultIndex;
template <typename StatisticsAccumulator>
void traverseCells(StatisticsAccumulator& accumulator, size_t timeStepIndex)
{
std::vector<double>& values = m_resultsData->cellScalarResults(m_scalarResultIndex, timeStepIndex);
if (values.empty())
{
// Can happen if values do not exist for the current time step index.
return;
}
const RigActiveCellInfo* actCellInfo = m_resultsData->activeCellInfo();
for (size_t cIdx = 0; cIdx < values.size(); ++cIdx)
{
// Filter out inactive cells
if (!actCellInfo->isActive(cIdx)) continue;
size_t cellResultIndex = cIdx;
if (m_resultsData->isUsingGlobalActiveIndex(m_scalarResultIndex))
{
cellResultIndex = actCellInfo->cellResultIndex(cIdx);
}
if (cellResultIndex != cvf::UNDEFINED_SIZE_T && cellResultIndex < values.size())
{
accumulator.addValue(values[cellResultIndex]);
}
}
}
}; };