From 60c3f60146d74a9780932fcdf3344e0fc1543fd5 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 22 Mar 2019 08:21:43 +0100 Subject: [PATCH] #4178 Ensemble Diff : When well is present in only one ensemble, diff causes crash --- .../Summary/RimDerivedEnsembleCase.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp index e4218405df..7d6538b846 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp @@ -18,6 +18,7 @@ #include "RimDerivedEnsembleCase.h" +#include "RiaLogging.h" #include "RiaSummaryTools.h" #include "RiaTimeHistoryCurveMerger.h" @@ -133,6 +134,16 @@ void RimDerivedEnsembleCase::calculate(const RifEclipseSummaryAddress& address) RifSummaryReaderInterface* reader2 = m_summaryCase2 ? m_summaryCase2->summaryReader() : nullptr; if (!reader1 || !reader2 || !parentEnsemble()) return; + if (!reader1->hasAddress(address) || !reader2->hasAddress(address)) + { + std::string text = address.uiText(); + + RiaLogging::warning("Derived Ensemble : At least one of the ensembles does not contain the summary address : " + + QString::fromStdString(text)); + + return; + } + RiaTimeHistoryCurveMerger merger; std::vector values1; std::vector values2;