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

#7334 Contour maps: Filter out both positive and negative inf values

Browse Source
This commit is contained in:
Magne Sjaastad 2021-02-05 10:26:35 +01:00
parent fdb465fe6d
commit b77da64b6d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp
View File

@ -464,7 +464,7 @@ double RimContourMapProjection::calculateValueInMapCell( uint i, uint j, const s
{
size_t cellIdx = cellIdxAndWeight.first;
double cellValue = gridCellValues[cellIdx];
if ( cellValue != std::numeric_limits<double>::infinity() )
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
{
return cellValue;
}
@ -477,7 +477,7 @@ double RimContourMapProjection::calculateValueInMapCell( uint i, uint j, const s
for ( auto [cellIdx, weight] : matchingCells )
{
double cellValue = gridCellValues[cellIdx];
if ( cellValue != std::numeric_limits<double>::infinity() )
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
{
calculator.addValueAndWeight( cellValue, weight );
}
@ -494,12 +494,12 @@ double RimContourMapProjection::calculateValueInMapCell( uint i, uint j, const s
for ( auto [cellIdx, weight] : matchingCells )
{
double cellValue = gridCellValues[cellIdx];
if ( cellValue < 1.0e-8 )
{
return 0.0;
}
if ( cellValue != std::numeric_limits<double>::infinity() )
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
{
if ( cellValue < 1.0e-8 )
{
return 0.0;
}
calculator.addValueAndWeight( cellValue, weight );
}
}
@ -520,7 +520,7 @@ double RimContourMapProjection::calculateValueInMapCell( uint i, uint j, const s
{
return 0.0;
}
if ( cellValue != std::numeric_limits<double>::infinity() )
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
{
calculator.addValueAndWeight( cellValue, cellIdxAndWeight.second );
}
@ -538,7 +538,7 @@ double RimContourMapProjection::calculateValueInMapCell( uint i, uint j, const s
{
size_t cellIdx = cellIdxAndWeight.first;
double cellValue = gridCellValues[cellIdx];
if ( cellValue != std::numeric_limits<double>::infinity() )
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
{
maxValue = std::max( maxValue, cellValue );
}
@ -571,7 +571,7 @@ double RimContourMapProjection::calculateValueInMapCell( uint i, uint j, const s
{
size_t cellIdx = cellIdxAndWeight.first;
double cellValue = gridCellValues[cellIdx];
if ( cellValue != std::numeric_limits<double>::infinity() )
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
{
sum += cellValue * cellIdxAndWeight.second;
}