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

Fix build warnings in RiaInterpolationTools.cpp

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-09-07 13:56:40 +02:00
parent e4677004af
commit e83a122bfd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ bool almostEqual( double a, double b, double maxRelDiff = std::numeric_limits<do
double fabsa = std::fabs( a ); double fabsa = std::fabs( a );
double fabsb = std::fabs( b ); double fabsb = std::fabs( b );
// Find the largest // Find the largest
float largest = ( fabsb > fabsa ) ? fabsb : fabsa; double largest = ( fabsb > fabsa ) ? fabsb : fabsa;
return ( diff <= largest * maxRelDiff ); return ( diff <= largest * maxRelDiff );
} }
@ -194,7 +194,7 @@ void RiaInterpolationTools::interpolateMissingValues( const std::vector<double>&
{ {
// The last value is inf: extrapolate from two last data points // The last value is inf: extrapolate from two last data points
int prevSetIndex2 = findPreviousDataPoint( y, prevSetIndex - 1 ); int prevSetIndex2 = findPreviousDataPoint( y, prevSetIndex - 1 );
index = extrapolateRange( index, y.size(), prevSetIndex2, prevSetIndex, x, y ); index = extrapolateRange( index, (int) y.size(), prevSetIndex2, prevSetIndex, x, y );
} }
else if ( nextSetIndex != static_cast<int>( y.size() ) ) else if ( nextSetIndex != static_cast<int>( y.size() ) )
{ {