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

riMULTXYZ: Added tolerances for CellEdge and Calculations

Browse Source
This commit is contained in:
Jacob Støren 2014-08-28 11:24:41 +02:00
parent 5377742bbc
commit edd7a671d9
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
View File

@ -150,7 +150,7 @@ void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(
double scalarValue = cellEdgeResultAccessor->cellFaceScalar(cellIndex, static_cast<cvf::StructGridInterface::FaceType>(cubeFaceIdx)); double scalarValue = cellEdgeResultAccessor->cellFaceScalar(cellIndex, static_cast<cvf::StructGridInterface::FaceType>(cubeFaceIdx));
if (scalarValue != HUGE_VAL && scalarValue != ignoredScalarValue) if (!hideScalarValue(scalarValue, ignoredScalarValue, 1e-2))
{ {
edgeColor = edgeResultScalarMapper->mapToTextureCoord(scalarValue)[0]; edgeColor = edgeResultScalarMapper->mapToTextureCoord(scalarValue)[0];
} }
@ -178,6 +178,10 @@ void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(
geo->setVertexAttribute(new cvf::FloatVertexAttribute("a_colorNegK", cellEdgeColorTextureCoordsArrays.at(5))); geo->setVertexAttribute(new cvf::FloatVertexAttribute("a_colorNegK", cellEdgeColorTextureCoordsArrays.at(5)));
} }
bool RivCellEdgeGeometryUtils::hideScalarValue(double scalarValue, double scalarValueToHide, double tolerance)
{
return (scalarValue == HUGE_VAL || abs(scalarValue - scalarValueToHide) <= scalarValueToHide*tolerance);
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -247,7 +251,7 @@ void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t tim
double scalarValue = cellEdgeResultAccessor->cellFaceScalar(cellIndex, static_cast<cvf::StructGridInterface::FaceType>(cubeFaceIdx)); double scalarValue = cellEdgeResultAccessor->cellFaceScalar(cellIndex, static_cast<cvf::StructGridInterface::FaceType>(cubeFaceIdx));
if (scalarValue != HUGE_VAL && scalarValue != ignoredScalarValue) if (!hideScalarValue(scalarValue, ignoredScalarValue, 1e-2))
{ {
edgeColor = edgeResultScalarMapper->mapToTextureCoord(scalarValue)[0]; edgeColor = edgeResultScalarMapper->mapToTextureCoord(scalarValue)[0];
} }

2
ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h
View File

@ -67,4 +67,6 @@ private:
size_t timeStepIndex, size_t timeStepIndex,
RigCaseData* eclipseCase, RigCaseData* eclipseCase,
const RigGridBase* grid); const RigGridBase* grid);
static bool hideScalarValue(double scalarValue, double scalarValueToHide, double tolerance);
}; };

15
ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
View File

@ -1104,15 +1104,16 @@ void RimReservoirCellResultsStorage::computeNncCombRiTrans()
double riMult(double transResults, double riTransResults) double riMult(double transResults, double riTransResults)
{ {
// To make 0.0 values give 1.0 in mult value // To make 0.0 values give 1.0 in mult value
// We might want a tolerance here.
if (transResults == riTransResults) if (riTransResults == 0.0)
{ {
return 1.0; if (abs (transResults) < 1e-12)
} {
else return 1.0;
{ }
return transResults / riTransResults;
} }
return transResults / riTransResults;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------