OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 22:50:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate linear interpolation algorithms

Browse Source 
Replaces custom linear interpolation logic with
`std::upper_bound` for improved efficiency.

Refactors the permeability plot panel to utilize the improved
interpolation tool.
This commit is contained in:
Magne Sjaastad committed 2025-10-03 08:37:24 +02:00
1 parent bb89699fb5
commit 336e4b65fd
3 files changed
+29 -109
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp
+8 -76
View File
@@ -18,12 +18,14 @@
#include "RiuRelativePermeabilityPlotPanel.h"
#include "RigFlowDiagSolverInterface.h"
#include "RiaCurveDataTools.h"
#include "RiaEclipseUnitTools.h"
#include "RiaInterpolationTools.h"
#include "RiaPlotDefines.h"
#include "RiaResultNames.h"
#include "RigFlowDiagSolverInterface.h"
#include "RiuDockedQwtPlot.h"
#include "RiuGuiTheme.h"
#include "RiuPlotCurveSymbol.h"
@@ -552,6 +554,9 @@ void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt( RiaDefines::EclipseUnitS
plot->replot();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QwtPlotCurve* RiuRelativePermeabilityPlotPanel::getLegendCurve( QString title, bool scaled )
{
QwtPlotCurve* curve = new QwtPlotCurve( title );
@@ -656,7 +661,7 @@ void RiuRelativePermeabilityPlotPanel::addCurveConstSaturationIntersectionMarker
std::vector<QPointF>* points,
std::vector<WhichYAxis>* axes )
{
const double yVal = interpolatedCurveYValue( curve.saturationVals, curve.yVals, saturationValue );
const double yVal = RiaInterpolationTools::linear( curve.saturationVals, curve.yVals, saturationValue );
if ( yVal != HUGE_VAL )
{
QwtPlotMarker* pointMarker = new QwtPlotMarker;
@@ -680,46 +685,6 @@ void RiuRelativePermeabilityPlotPanel::addCurveConstSaturationIntersectionMarker
}
}
//--------------------------------------------------------------------------------------------------
/// Assumes that all the x-values are ordered in increasing order
//--------------------------------------------------------------------------------------------------
double RiuRelativePermeabilityPlotPanel::interpolatedCurveYValue( const std::vector<double>& xVals, const std::vector<double>& yVals, double x )
{
if ( xVals.empty() ) return HUGE_VAL;
if ( x < xVals.front() ) return HUGE_VAL;
if ( x > xVals.back() ) return HUGE_VAL;
// Find first element greater or equal to the passed x-value
std::vector<double>::const_iterator it = std::upper_bound( xVals.begin(), xVals.end(), x );
// Due to checks above, we should never come up empty, but to safeguard against NaNs etc
if ( it == xVals.end() )
{
return HUGE_VAL;
}
// Corner case - exact match on first element
if ( it == xVals.begin() )
{
return yVals.front();
}
const size_t idx1 = it - xVals.begin();
CVF_ASSERT( idx1 > 0 );
const size_t idx0 = idx1 - 1;
const double x0 = xVals[idx0];
const double y0 = yVals[idx0];
const double x1 = xVals[idx1];
const double y1 = yVals[idx1];
CVF_ASSERT( x1 > x0 );
const double t = ( x1 - x0 ) > 0 ? ( x - x0 ) / ( x1 - x0 ) : 0;
const double y = y0 * ( 1.0 - t ) + y1 * t;
return y;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -879,36 +844,3 @@ void RiuRelativePermeabilityPlotPanel::showEvent( QShowEvent* event )
if ( m_plotUpdater != nullptr ) m_plotUpdater->doDelayedUpdate();
QWidget::showEvent( event );
}
//==================================================================================================
//
//
//
//==================================================================================================
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuRelativePermeabilityPlotPanel::ValueRange::ValueRange()
: min( HUGE_VAL )
, max( -HUGE_VAL )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuRelativePermeabilityPlotPanel::ValueRange::add( const ValueRange& range )
{
if ( range.max >= range.min )
{
if ( range.max > max )
{
max = range.max;
}
if ( range.min < min )
{
min = range.min;
}
}
}