OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-03 20:20:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings related to converting time_t to double

Browse Source
This commit is contained in:
Magne Sjaastad 2018-01-19 16:55:16 +01:00
parent 5c1f5326a0
commit 245d10c5c1
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/ReservoirDataModel/RigTimeHistoryCurveMerger.cpp
View File

@ -196,8 +196,8 @@ double RigTimeHistoryCurveMerger::interpolationValue(const time_t& interpolation
bool isSecondValid = RigCurveDataTools::isValidValue(secondValue, removeInterpolatedValues); bool isSecondValid = RigCurveDataTools::isValidValue(secondValue, removeInterpolatedValues);
if (!isSecondValid) return HUGE_VAL; if (!isSecondValid) return HUGE_VAL;
double firstDiff = interpolationTimeStep - curveTimeSteps.at(firstI); double firstDiff = fabs(difftime(interpolationTimeStep, curveTimeSteps.at(firstI)));
double secondDiff = curveTimeSteps.at(secondI) - interpolationTimeStep; double secondDiff = fabs(difftime(curveTimeSteps.at(secondI), interpolationTimeStep));
double firstWeight = secondDiff / (firstDiff + secondDiff); double firstWeight = secondDiff / (firstDiff + secondDiff);
double secondWeight = firstDiff / (firstDiff + secondDiff); double secondWeight = firstDiff / (firstDiff + secondDiff);