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

#1322 Use HUGE_VAL if no results are available

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-24 08:21:24 +01:00
parent 17dbb179d9
commit 40ecdc5a7b
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp
View File

@ -19,14 +19,12 @@
#include "RigTimeHistoryResultAccessor.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "RigGridBase.h"
#include "RigResultAccessor.h"
#include "RigResultAccessorFactory.h"
#include "RimEclipseCellColors.h"
#include "RigEclipseCaseData.h"
#include "RigGridBase.h"
#include <cmath> // Needed for HUGE_VAL on Linux
//#include <cmath> // Needed for HUGE_VAL on Linux
//--------------------------------------------------------------------------------------------------
///
@ -35,11 +33,22 @@ std::vector<double> RigTimeHistoryResultAccessor::timeHistoryValues(RigEclipseCa
{
std::vector<double> values;
RigHugeValResultAccessor hugeVal;
for (size_t i = 0; i < timeStepCount; i++)
{
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultDefinition(eclipseCaseData, gridIndex, i, resultDefinition);
// TODO: Consider rewrite RigResultAccessorFactory::createFromResultDefinition so the function always returns a valid
// result accessor. Use hugeVal result accessor if no valid result is found
values.push_back(resultAccessor->cellScalar(cellIndex));
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultDefinition(eclipseCaseData, gridIndex, i, resultDefinition);
if (resultAccessor.notNull())
{
values.push_back(resultAccessor->cellScalar(cellIndex));
}
else
{
values.push_back(hugeVal.cellScalar(cellIndex));
}
}
return values;