mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-25 06:38:13 -05:00
Kristian Bendiksen
4d2a868079
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
63 lines
2.6 KiB
C++
63 lines
2.6 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.
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#pragma once
|
|
|
|
#include "cvfCollection.h"
|
|
#include "cvfObject.h"
|
|
|
|
#include <optional>
|
|
#include <vector>
|
|
|
|
class RigHistogramCalculator;
|
|
|
|
//==================================================================================================
|
|
///
|
|
//==================================================================================================
|
|
class RigStatisticsCalculator : public cvf::Object
|
|
{
|
|
public:
|
|
virtual void minMaxCellScalarValues( size_t timeStepIndex, double& min, double& max ) = 0;
|
|
virtual void posNegClosestToZero( size_t timeStepIndex, double& pos, double& neg ) = 0;
|
|
|
|
void meanCellScalarValue( double& meanValue );
|
|
void meanCellScalarValue( size_t timeStepIndex, double& meanValue );
|
|
|
|
void valueSumAndSampleCount( double& valueSum, size_t& sampleCount );
|
|
virtual void valueSumAndSampleCount( size_t timeStepIndex, double& valueSum, size_t& sampleCount ) = 0;
|
|
|
|
void addDataToHistogramCalculator( RigHistogramCalculator& histogramCalculator );
|
|
virtual void addDataToHistogramCalculator( size_t timeStepIndex, RigHistogramCalculator& histogramCalculator ) = 0;
|
|
|
|
virtual void uniqueValues( size_t timeStepIndex, std::set<int>& values ) = 0;
|
|
|
|
virtual bool hasPreciseP10p90() const;
|
|
virtual void p10p90CellScalarValues( double& p10, double& p90 );
|
|
virtual void p10p90CellScalarValues( size_t timeStepIndex, double& p10, double& p90 );
|
|
|
|
virtual size_t timeStepCount() = 0;
|
|
|
|
// Returns the mobile volume weighted mean, or an empty optional if it can not be computed, ie. when the
|
|
// mobile pore volume result is not available. Implementations must not return a value in that case.
|
|
std::optional<double> mobileVolumeWeightedMean();
|
|
virtual std::optional<double> mobileVolumeWeightedMean( size_t timeStepIndex );
|
|
|
|
static void posNegClosestToZero( const std::vector<double>& values, double& pos, double& neg );
|
|
};
|