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

riTRAN/MULT :Improved handling of invalid operations 0/0 etc.

Browse Source
This commit is contained in:
Jacob Støren 2014-09-09 15:21:09 +02:00
parent c9065eeed9
commit 74f927e13f
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
View File

@ -734,7 +734,14 @@ namespace RigTransmissibilityCalcTools
//--------------------------------------------------------------------------------------------------
double newtran(double cdarchy, double mult, double halfCellTrans, double neighborHalfCellTrans)
{
return cdarchy * mult / ((1 / halfCellTrans) + (1 / neighborHalfCellTrans));
if (cvf::Math::abs(halfCellTrans) < 1e-15 || cvf::Math::abs(neighborHalfCellTrans) < 1e-15)
{
return 0.0;
}
double result = cdarchy * mult / ((1 / halfCellTrans) + (1 / neighborHalfCellTrans));
CVF_TIGHT_ASSERT(result == result);
return result;
}
//--------------------------------------------------------------------------------------------------
@ -923,7 +930,7 @@ void RimReservoirCellResultsStorage::computeRiTransComponent(const QString& riTr
neighborHalfCellTrans = halfCellTransmissibility(perm, ntg, centerToFace, -faceAreaVec);
}
riTransResults[tranResIdx] = newtran(cdarchy, 1.0, halfCellTrans, neighborHalfCellTrans);;
riTransResults[tranResIdx] = newtran(cdarchy, 1.0, halfCellTrans, neighborHalfCellTrans);
}
}
@ -1094,17 +1101,23 @@ void RimReservoirCellResultsStorage::computeNncCombRiTrans()
double riMult(double transResults, double riTransResults)
{
// To make 0.0 values give 1.0 in mult value
if (transResults == HUGE_VAL || riTransResults == HUGE_VAL) return HUGE_VAL;
if (riTransResults == 0.0)
// To make 0.0 values give 1.0 in mult value
if (cvf::Math::abs (riTransResults) < 1e-12)
{
if (cvf::Math::abs (transResults) < 1e-12)
{
return 1.0;
}
return HUGE_VAL;
}
return transResults / riTransResults;
double result = transResults / riTransResults;
return result;
}
//--------------------------------------------------------------------------------------------------