From 83ed95a311a5be9aeb8b7d2ae22522721aeacf80 Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Thu, 25 Jan 2018 18:24:12 +0100 Subject: [PATCH] #2328 Water flooded PV: Remove warning. Remove injection flooding option if no fluxes are available --- .../ProjectDataModel/RimEclipseCellColors.cpp | 16 ---------------- .../RimEclipseResultDefinition.cpp | 8 +++++++- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp index 891798e060..db6bf8bf95 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp @@ -277,22 +277,6 @@ void RimEclipseCellColors::updateLegendData(size_t currentTimeStep) { if (this->isFlowDiagOrInjectionFlooding()) { - RimEclipseCase* rimEclipseCase = nullptr; - this->firstAncestorOrThisOfType(rimEclipseCase); - CVF_ASSERT(rimEclipseCase); - if (!rimEclipseCase) return; - - RigEclipseCaseData* eclipseCase = rimEclipseCase->eclipseCaseData(); - CVF_ASSERT(eclipseCase); - if (!eclipseCase) return; - RigCaseCellResultsData* cellResultsData = eclipseCase->results(this->porosityModel()); - - if (!cellResultsData->hasFlowDiagUsableFluxes()) - { - QMessageBox::warning(RiuMainWindow::instance(), "Injection Flooding", "Cannot calculate any injection flooding properties, since no fluxes are available"); - return; - } - double globalMin, globalMax; double globalPosClosestToZero, globalNegClosestToZero; RigFlowDiagResults* flowResultsData = this->flowDiagSolution()->flowDiagResults(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 52bdcbcbd1..6ed05507c9 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -458,7 +458,13 @@ QList RimEclipseResultDefinition::calculateValueOptions( bool enableSouring = false; #ifdef ENABLE_SOURING - enableSouring = true; + RigCaseCellResultsData* cellResultsData = m_eclipseCase->results(this->porosityModel()); + + if (cellResultsData->hasFlowDiagUsableFluxes()) + { + enableSouring = true; + } + #endif /* ENABLE_SOURING */