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

#2125 Curve Calculations : Extract isValidValue

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-16 13:11:10 +01:00
parent 503c7bf37c
commit 827cee6093
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ApplicationCode/ReservoirDataModel/RigCurveDataTools.cpp
View File

@@ -19,7 +19,7 @@
#include "RigCurveDataTools.h" #include "RigCurveDataTools.h"
#include <cmath> #include <cmath> // Needed for HUGE_VAL on Linux
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -35,20 +35,9 @@ void RigCurveDataTools::calculateIntervalsOfValidValues(const std::vector<double
size_t valueCount = values.size(); size_t valueCount = values.size();
while (vIdx < valueCount) while (vIdx < valueCount)
{ {
double value = values[vIdx]; bool isValid = RigCurveDataTools::isValidValue(values[vIdx], removeNegativeValues);
bool isInvalidValueDetected = false; if (!isValid)
if (value == HUGE_VAL || value == -HUGE_VAL || value != value)
{
isInvalidValueDetected = true;
}
if (removeNegativeValues && value <= 0.0)
{
isInvalidValueDetected = true;
}
if (isInvalidValueDetected)
{ {
if (startIdx >= 0) if (startIdx >= 0)
{ {
@@ -92,3 +81,20 @@ void RigCurveDataTools::computePolyLineStartStopIndices(const std::vector< std::
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RigCurveDataTools::isValidValue(double value, bool removeNegativeValues)
{
if (value == HUGE_VAL || value == -HUGE_VAL || value != value)
{
return false;
}
if (removeNegativeValues && std::signbit(value))
{
return false;
}
return true;
}

3
ApplicationCode/ReservoirDataModel/RigCurveDataTools.h
View File

@@ -53,4 +53,7 @@ public:
static void computePolyLineStartStopIndices(const std::vector< std::pair<size_t, size_t> >& intervals, static void computePolyLineStartStopIndices(const std::vector< std::pair<size_t, size_t> >& intervals,
std::vector< std::pair<size_t, size_t> >* filteredIntervals); std::vector< std::pair<size_t, size_t> >* filteredIntervals);
private:
static bool isValidValue(double value, bool removeNegativeValues);
}; };