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 2d555e1b67
commit d045c0aade
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,11 @@ void RicEclipsePropertyFilterFeatureImpl::setDefaults( RimEclipsePropertyFilter*
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();

35
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -1593,23 +1593,6 @@ QList<caf::PdmOptionItemInfo>
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() ) );
}
}
if ( addPerCellFaceOptionItems ) if ( addPerCellFaceOptionItems )
{ {
for ( const QString& s : cellFaceResultNames ) for ( const QString& s : cellFaceResultNames )
@@ -1623,6 +1606,24 @@ QList<caf::PdmOptionItemInfo>
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( optionList.push_front(