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

#3162 Resampling. INF values ignored in calc

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-07-06 14:14:15 +02:00
parent 11d74cd383
commit b8fbbc63f0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp
View File

@ -34,6 +34,11 @@
// return QString("%1.%2.%3 %4:%5:%6").arg(y).arg(m).arg(d).arg(h).arg(mm).arg(s); // return QString("%1.%2.%3 %4:%5:%6").arg(y).arg(m).arg(d).arg(h).arg(mm).arg(s);
//} //}
//--------------------------------------------------------------------------------------------------
/// Internal constants
//--------------------------------------------------------------------------------------------------
#define DOUBLE_INF std::numeric_limits<double>::infinity()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -139,7 +144,7 @@ void RiaTimeHistoryCurveResampler::computeWeightedMeanValues(DateTimePeriod peri
if (oi < origDataSize) if (oi < origDataSize)
{ {
origTimeStep = origTimeSteps[oi]; origTimeStep = origTimeSteps[oi];
origValue = origValues[oi]; origValue = origValues[oi] != DOUBLE_INF ? origValues[oi] : 0.0;
} }
else else
{ {