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

#4375 Robustness : Make sure we handle missing data gracefully

Browse Source
This commit is contained in:
Magne Sjaastad
2019-04-26 12:50:36 +02:00
parent b35e7d9bd4
commit 11e91f5d1c
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@@ -524,7 +524,7 @@ QString Rim3dOverlayInfoConfig::caseInfoText(RimEclipseView* eclipseView)
{ {
QString infoText; QString infoText;
if (eclipseView) if (eclipseView && eclipseView->eclipseCase())
{ {
QString caseName = eclipseView->eclipseCase()->caseUserDescription(); QString caseName = eclipseView->eclipseCase()->caseUserDescription();
@@ -691,7 +691,8 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData,
if (eclipseView->cellResult()->hasDualPorFractureResult()) if (eclipseView->cellResult()->hasDualPorFractureResult())
{ {
QString porosityModelText = caf::AppEnum<RiaDefines::PorosityModelType>::uiText(eclipseView->cellResult()->porosityModel()); QString porosityModelText =
caf::AppEnum<RiaDefines::PorosityModelType>::uiText(eclipseView->cellResult()->porosityModel());
infoText += QString("<b>Dual Porosity Type:</b> %1<br>").arg(porosityModelText); infoText += QString("<b>Dual Porosity Type:</b> %1<br>").arg(porosityModelText);
} }
@@ -1103,11 +1104,14 @@ void Rim3dOverlayInfoConfig::update3DInfoIn2dViews() const
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString Rim3dOverlayInfoConfig::timeStepText(RimEclipseView* eclipseView) QString Rim3dOverlayInfoConfig::timeStepText(RimEclipseView* eclipseView)
{
QString dateTimeString;
if (eclipseView && eclipseView->currentGridCellResults())
{ {
int currTimeStepIndex = eclipseView->currentTimeStep(); int currTimeStepIndex = eclipseView->currentTimeStep();
std::vector<QDateTime> timeSteps = eclipseView->currentGridCellResults()->allTimeStepDatesFromEclipseReader(); std::vector<QDateTime> timeSteps = eclipseView->currentGridCellResults()->allTimeStepDatesFromEclipseReader();
QString dateTimeString;
if (currTimeStepIndex >= 0 && currTimeStepIndex < (int)timeSteps.size()) if (currTimeStepIndex >= 0 && currTimeStepIndex < (int)timeSteps.size())
{ {
QString dateFormat = RiaQDateTimeTools::createTimeFormatStringFromDates(timeSteps); QString dateFormat = RiaQDateTimeTools::createTimeFormatStringFromDates(timeSteps);
@@ -1117,6 +1121,7 @@ QString Rim3dOverlayInfoConfig::timeStepText(RimEclipseView* eclipseView)
dateTimeString = QString("Time Step: %1/%2 %3") dateTimeString = QString("Time Step: %1/%2 %3")
.arg(QString::number(currTimeStepIndex), QString::number(timeSteps.size() - 1), dateString); .arg(QString::number(currTimeStepIndex), QString::number(timeSteps.size() - 1), dateString);
} }
}
return QString("<p><b><center>-- %1 --</center></b>").arg(dateTimeString) + return QString("<p><b><center>-- %1 --</center></b>").arg(dateTimeString) +
QString("<center>------------------------------------------------</center>"); QString("<center>------------------------------------------------</center>");

8
ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
View File

@@ -171,11 +171,11 @@ std::vector<const RigWellPath*> RimSimWellInView::wellPipeBranches() const
this->firstAncestorOrThisOfTypeAsserted(simWellCollection); this->firstAncestorOrThisOfTypeAsserted(simWellCollection);
RimEclipseCase* eclipseCase = nullptr; RimEclipseCase* eclipseCase = nullptr;
this->firstAncestorOrThisOfTypeAsserted(eclipseCase); this->firstAncestorOrThisOfType(eclipseCase);
RigEclipseCaseData* caseData = eclipseCase->eclipseCaseData(); if (eclipseCase && eclipseCase->eclipseCaseData())
CVF_ASSERT(caseData);
if (caseData)
{ {
RigEclipseCaseData* caseData = eclipseCase->eclipseCaseData();
bool includeCellCenters = this->isUsingCellCenterForPipe(); bool includeCellCenters = this->isUsingCellCenterForPipe();
bool detectBrances = simWellCollection->isAutoDetectingBranches; bool detectBrances = simWellCollection->isAutoDetectingBranches;