mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-24 22:27:55 -05:00
RigStatisticsCalculator::mobileVolumeWeightedMean() accumulated into a sum from an out-parameter that callees were not required to write. Every implementation of the per time step overload has early-return paths that leave the value untouched, as does RigWeightedMeanCalc::weightedMeanOverCells, so indeterminate stack memory could be summed and presented in the UI. Return std::optional<double> from the computation layer instead of using an out-parameter, making "value not available" explicit and impossible to ignore: - RigWeightedMeanCalc::weightedMeanOverCells - RigStatisticsCalculator::mobileVolumeWeightedMean and all overrides Time steps without a computable mean no longer contribute to the accumulated sum, and are excluded from the divisor. Previously they would either add garbage or, with a naive zero initialisation, bias the average towards zero. RigStatisticsDataCache keeps the existing HUGE_VAL marker on its public API via value_or(), so behaviour seen by RigHistogramData and the overlay info is unchanged apart from the fix. Also: - Set m_isVolumeWeightedMeanCalculated in the per time step cache, which was never assigned, so the cached value was recomputed on every call. - Remove a duplicated ensureKnownResultLoaded() call in RigEclipseNativeVisibleCellsStatCalc. Fixes #14766
170 lines
5.7 KiB
C++
170 lines
5.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) Statoil ASA
|
|
// Copyright (C) Ceetron Solutions AS
|
|
//
|
|
// ResInsight is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
// FITNESS FOR A PARTICULAR PURPOSE.
|
|
//
|
|
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
|
// for more details.
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "RigStatisticsCalculator.h"
|
|
|
|
#include <cassert>
|
|
#include <cmath> // Needed for HUGE_VAL on Linux
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigStatisticsCalculator::meanCellScalarValue( double& meanValue )
|
|
{
|
|
double valueSum = 0.0;
|
|
size_t sampleCount = 0;
|
|
|
|
valueSumAndSampleCount( valueSum, sampleCount );
|
|
|
|
if ( sampleCount == 0 )
|
|
{
|
|
meanValue = HUGE_VAL;
|
|
}
|
|
else
|
|
{
|
|
meanValue = valueSum / sampleCount;
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigStatisticsCalculator::meanCellScalarValue( size_t timeStepIndex, double& meanValue )
|
|
{
|
|
double valueSum = 0.0;
|
|
size_t sampleCount = 0;
|
|
|
|
valueSumAndSampleCount( timeStepIndex, valueSum, sampleCount );
|
|
|
|
if ( sampleCount == 0 )
|
|
{
|
|
meanValue = HUGE_VAL;
|
|
}
|
|
else
|
|
{
|
|
meanValue = valueSum / sampleCount;
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigStatisticsCalculator::valueSumAndSampleCount( double& valueSum, size_t& sampleCount )
|
|
{
|
|
size_t tsCount = timeStepCount();
|
|
for ( size_t tIdx = 0; tIdx < tsCount; tIdx++ )
|
|
{
|
|
valueSumAndSampleCount( tIdx, valueSum, sampleCount );
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigStatisticsCalculator::addDataToHistogramCalculator( RigHistogramCalculator& histogramCalculator )
|
|
{
|
|
size_t tsCount = timeStepCount();
|
|
for ( size_t tIdx = 0; tIdx < tsCount; tIdx++ )
|
|
{
|
|
addDataToHistogramCalculator( tIdx, histogramCalculator );
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::optional<double> RigStatisticsCalculator::mobileVolumeWeightedMean( size_t timeStepIndex )
|
|
{
|
|
return {};
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::optional<double> RigStatisticsCalculator::mobileVolumeWeightedMean()
|
|
{
|
|
double sum = 0.0;
|
|
size_t contributingTsCount = 0;
|
|
|
|
const size_t tsCount = timeStepCount();
|
|
for ( size_t tIdx = 0; tIdx < tsCount; tIdx++ )
|
|
{
|
|
// Time steps without a computable mean, ie. when the mobile pore volume is missing, are not
|
|
// allowed to contribute to the accumulated sum
|
|
if ( const auto meanForTimeStep = mobileVolumeWeightedMean( tIdx ) )
|
|
{
|
|
sum += *meanForTimeStep;
|
|
contributingTsCount++;
|
|
}
|
|
}
|
|
|
|
if ( contributingTsCount == 0 ) return {};
|
|
|
|
return sum / contributingTsCount;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigStatisticsCalculator::posNegClosestToZero( const std::vector<double>& values, double& pos, double& neg )
|
|
{
|
|
size_t i;
|
|
for ( i = 0; i < values.size(); i++ )
|
|
{
|
|
if ( values[i] == HUGE_VAL )
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if ( values[i] < pos && values[i] > 0 )
|
|
{
|
|
pos = values[i];
|
|
}
|
|
|
|
if ( values[i] > neg && values[i] < 0 )
|
|
{
|
|
neg = values[i];
|
|
}
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool RigStatisticsCalculator::hasPreciseP10p90() const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigStatisticsCalculator::p10p90CellScalarValues( double& p10, double& p90 )
|
|
{
|
|
assert( false && "Precise p10/p90 not available" );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigStatisticsCalculator::p10p90CellScalarValues( size_t timeStepIndex, double& p10, double& p90 )
|
|
{
|
|
assert( false && "Precise p10/p90 not available" );
|
|
}
|