#3783 Guard in case of incomplete project data

This commit is contained in:
Gaute Lindkvist 2018-12-03 09:24:31 +01:00 committed by Magne Sjaastad
parent 3a31199365
commit 2ae4e483ed
2 changed files with 12 additions and 6 deletions

View File

@ -174,11 +174,14 @@ std::vector<const RigWellPath*> RimSimWellInView::wellPipeBranches() const
this->firstAncestorOrThisOfTypeAsserted(eclipseCase); this->firstAncestorOrThisOfTypeAsserted(eclipseCase);
RigEclipseCaseData* caseData = eclipseCase->eclipseCaseData(); RigEclipseCaseData* caseData = eclipseCase->eclipseCaseData();
CVF_ASSERT(caseData); CVF_ASSERT(caseData);
if (caseData)
{
bool includeCellCenters = this->isUsingCellCenterForPipe();
bool detectBrances = simWellCollection->isAutoDetectingBranches;
bool includeCellCenters = this->isUsingCellCenterForPipe(); return caseData->simulationWellBranches(this->name(), includeCellCenters, detectBrances);
bool detectBrances = simWellCollection->isAutoDetectingBranches; }
return std::vector<const RigWellPath*>();
return caseData->simulationWellBranches(this->name(), includeCellCenters, detectBrances);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -215,8 +215,11 @@ QList<caf::PdmOptionItemInfo> RimSummaryPlotSourceStepping::calculateValueOption
for (auto reader : readers) for (auto reader : readers)
{ {
auto subset = RiaSummaryCurveAnalyzer::addressesForCategory(reader->allResultAddresses(), category); if (reader != nullptr)
quantityAnalyzer.appendAdresses(subset); {
auto subset = RiaSummaryCurveAnalyzer::addressesForCategory(reader->allResultAddresses(), category);
quantityAnalyzer.appendAdresses(subset);
}
} }
for (const auto& quantity : quantityAnalyzer.quantities()) for (const auto& quantity : quantityAnalyzer.quantities())