From 2ae4e483edf7fabf6cd3c2d0471492b5d292543b Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Mon, 3 Dec 2018 09:24:31 +0100 Subject: [PATCH] #3783 Guard in case of incomplete project data --- ApplicationCode/ProjectDataModel/RimSimWellInView.cpp | 11 +++++++---- .../Summary/RimSummaryPlotSourceStepping.cpp | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp index fb89640b24..fad3f8b63a 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp +++ b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp @@ -174,11 +174,14 @@ std::vector RimSimWellInView::wellPipeBranches() const this->firstAncestorOrThisOfTypeAsserted(eclipseCase); RigEclipseCaseData* caseData = eclipseCase->eclipseCaseData(); CVF_ASSERT(caseData); + if (caseData) + { + bool includeCellCenters = this->isUsingCellCenterForPipe(); + bool detectBrances = simWellCollection->isAutoDetectingBranches; - bool includeCellCenters = this->isUsingCellCenterForPipe(); - bool detectBrances = simWellCollection->isAutoDetectingBranches; - - return caseData->simulationWellBranches(this->name(), includeCellCenters, detectBrances); + return caseData->simulationWellBranches(this->name(), includeCellCenters, detectBrances); + } + return std::vector(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp index 8e83d82db3..df87a451be 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp @@ -215,8 +215,11 @@ QList RimSummaryPlotSourceStepping::calculateValueOption for (auto reader : readers) { - auto subset = RiaSummaryCurveAnalyzer::addressesForCategory(reader->allResultAddresses(), category); - quantityAnalyzer.appendAdresses(subset); + if (reader != nullptr) + { + auto subset = RiaSummaryCurveAnalyzer::addressesForCategory(reader->allResultAddresses(), category); + quantityAnalyzer.appendAdresses(subset); + } } for (const auto& quantity : quantityAnalyzer.quantities())