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

#7763 Improve extrapolation for when points are too close.

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-06-09 13:38:33 +02:00 committed by Magne Sjaastad
parent 4de91e885b
commit 1ebe4ec2a1
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/Application/Tools/RiaInterpolationTools.cpp
View File

@ -162,7 +162,11 @@ int RiaInterpolationTools::extrapolateRange( int start,
std::vector<double> ys = { y[firstPoint], y[lastPoint] }; std::vector<double> ys = { y[firstPoint], y[lastPoint] };
for ( int index = start; index < end; index++ ) for ( int index = start; index < end; index++ )
{ {
y[index] = extrapolate( xs, ys, x[index] ); // Avoid excessive extrapolation when points are very close
if ( almostEqual( xs[0], xs[1] ) || almostEqual( ys[0], ys[1] ) )
y[index] = ys[0];
else
y[index] = extrapolate( xs, ys, x[index] );
} }
return end; return end;

24
ApplicationLibCode/UnitTests/RiaInterpolationTools-Test.cpp
View File

@ -166,3 +166,27 @@ TEST( RiaInterpolationToolsTest, InterpolateMissingValuesStraightLineExtrapolate
EXPECT_DOUBLE_EQ( y[4], 4.0 ); EXPECT_DOUBLE_EQ( y[4], 4.0 );
EXPECT_DOUBLE_EQ( y[5], 5.0 ); EXPECT_DOUBLE_EQ( y[5], 5.0 );
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST( RiaInterpolationToolsTest, InterpolateMissingValuesSmallDiffs )
{
double inf = std::numeric_limits<double>::infinity();
std::vector<double> x = { 898.02149910694368,
898.68522777852661,
898.68522777852661,
971.44605537010159,
971.44605537010887,
1074.7396805237731,
1074.7396805237802 };
std::vector<double> y = { inf, inf, inf, inf, inf, 590.65394902812329, 590.75823974609375 };
RiaInterpolationTools::interpolateMissingValues( x, y );
EXPECT_DOUBLE_EQ( y[0], 590.65394902812329 );
EXPECT_DOUBLE_EQ( y[1], 590.65394902812329 );
EXPECT_DOUBLE_EQ( y[2], 590.65394902812329 );
EXPECT_DOUBLE_EQ( y[3], 590.65394902812329 );
EXPECT_DOUBLE_EQ( y[4], 590.65394902812329 );
EXPECT_DOUBLE_EQ( y[5], 590.65394902812329 );
}