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

This commit is contained in:
Rebecca Cox
2018-01-25 18:24:40 +01:00
2 changed files with 7 additions and 17 deletions

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 */