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

Merge remote-tracking branch 'origin/2018.01.01-patch' into dev

Browse Source
This commit is contained in:
Rebecca Cox 2018-01-25 18:24:40 +01:00
commit 4078002770
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
View File

@ -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();

8
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -458,7 +458,13 @@ QList<caf::PdmOptionItemInfo> 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 */