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

#4699 Guard use of TERNARY cell result in property filters

Browse Source
This commit is contained in:
Magne Sjaastad 2019-09-11 13:31:15 +02:00
parent da47acfc1c
commit b38904d158
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp
View File

@ -118,8 +118,12 @@ void RicEclipsePropertyFilterFeatureImpl::setDefaults(RimEclipsePropertyFilter*
RimEclipseView* reservoirView = nullptr; RimEclipseView* reservoirView = nullptr;
propertyFilter->firstAncestorOrThisOfTypeAsserted(reservoirView); propertyFilter->firstAncestorOrThisOfTypeAsserted(reservoirView);
propertyFilter->resultDefinition()->setEclipseCase(reservoirView->eclipseCase()); propertyFilter->resultDefinition()->setEclipseCase( reservoirView->eclipseCase() );
propertyFilter->resultDefinition()->simpleCopy(reservoirView->cellResult());
if ( !RiaDefines::isPerCellFaceResult( reservoirView->cellResult()->resultVariable() ) )
{
propertyFilter->resultDefinition()->simpleCopy( reservoirView->cellResult() );
}
propertyFilter->resultDefinition()->loadResult(); propertyFilter->resultDefinition()->loadResult();
propertyFilter->setToDefaultValues(); propertyFilter->setToDefaultValues();

48
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -1529,39 +1529,41 @@ QList<caf::PdmOptionItemInfo>
optionList.push_back(caf::PdmOptionItemInfo(s, s)); optionList.push_back(caf::PdmOptionItemInfo(s, s));
} }
// Ternary Result if ( addPerCellFaceOptionItems )
if (ternaryEnabled)
{ {
bool hasAtLeastOneTernaryComponent = false; for ( const QString& s : cellFaceResultNames )
if (cellCenterResultNames.contains("SOIL"))
hasAtLeastOneTernaryComponent = true;
else if (cellCenterResultNames.contains("SGAS"))
hasAtLeastOneTernaryComponent = true;
else if (cellCenterResultNames.contains("SWAT"))
hasAtLeastOneTernaryComponent = true;
if (resultCatType == RiaDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent)
{ {
optionList.push_front( if ( showDerivedResultsFirst )
caf::PdmOptionItemInfo(RiaDefines::ternarySaturationResultName(), RiaDefines::ternarySaturationResultName()));
}
}
if (addPerCellFaceOptionItems)
{
for (const QString& s : cellFaceResultNames)
{
if (showDerivedResultsFirst)
{ {
optionList.push_front(caf::PdmOptionItemInfo(s, s)); optionList.push_front( caf::PdmOptionItemInfo( s, s ) );
} }
else else
{ {
optionList.push_back(caf::PdmOptionItemInfo(s, s)); optionList.push_back( caf::PdmOptionItemInfo( s, s ) );
}
}
// Ternary Result
if ( ternaryEnabled )
{
bool hasAtLeastOneTernaryComponent = false;
if ( cellCenterResultNames.contains( "SOIL" ) )
hasAtLeastOneTernaryComponent = true;
else if ( cellCenterResultNames.contains( "SGAS" ) )
hasAtLeastOneTernaryComponent = true;
else if ( cellCenterResultNames.contains( "SWAT" ) )
hasAtLeastOneTernaryComponent = true;
if ( resultCatType == RiaDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent )
{
optionList.push_front( caf::PdmOptionItemInfo( RiaDefines::ternarySaturationResultName(),
RiaDefines::ternarySaturationResultName() ) );
} }
} }
} }
optionList.push_front(caf::PdmOptionItemInfo(RiaDefines::undefinedResultName(), RiaDefines::undefinedResultName())); optionList.push_front(
caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(), RiaDefines::undefinedResultName() ) );
return optionList; return optionList;
} }