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

#6305 Handle interpolation of values just outside the boundaries.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-06-10 10:11:34 +02:00
parent 34e0ae7537
commit e99f1fc98a
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/Application/Tools/RiaInterpolationTools.cpp
View File

@ -19,8 +19,23 @@
#include "RiaInterpolationTools.h"
#include <cassert>
#include <cmath>
#include <limits>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool almostEqual( double a, double b, double maxRelDiff = std::numeric_limits<double>::epsilon() * 128 )
{
// Calculate the difference.
double diff = std::fabs( a - b );
double fabsa = std::fabs( a );
double fabsb = std::fabs( b );
// Find the largest
float largest = ( fabsb > fabsa ) ? fabsb : fabsa;
return ( diff <= largest * maxRelDiff );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -29,7 +44,7 @@ double RiaInterpolationTools::linear( const std::vector<double>& x, const std::v
assert( x.size() == y.size() );
// Handle cases with only one data point.
if ( x.size() == 1 )
if ( x.size() <= 1 )
{
return std::numeric_limits<double>::infinity();
}
@ -49,6 +64,11 @@ double RiaInterpolationTools::linear( const std::vector<double>& x, const std::v
// Value is outside of the defined range
if ( !found )
{
// Check if we are just outside the boundaries
if ( almostEqual( value, x[0] ) )
return y[0];
else if ( almostEqual( value, x[x.size() - 1] ) )
return y[x.size() - 1];
return std::numeric_limits<double>::infinity();
}