Skip to content

#10122 Prevent default selected result variable "SOIL" when not avail… #14220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kriben merged 1 commit into from
Jun 12, 2026
+16 −6
Merged

#10122 Prevent default selected result variable "SOIL" when not avail… #14220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,18 +823,27 @@ RigEclipseResultAddress RigCaseCellResultsData::defaultResult() const
auto prefs = RiaPreferencesGrid::current();
if ( prefs->loadAndShowSoil() && m_ownerCaseData )
{
// Use the saturation result matching the available phases, but only if the result exists or can be
// computed, i.e. a result entry is present. See issue #10122.
const auto phases = m_ownerCaseData->availablePhases();
if ( phases.contains( RiaDefines::PhaseType::OIL_PHASE ) )

const RigEclipseResultAddress soilAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::soil() );
if ( phases.contains( RiaDefines::PhaseType::OIL_PHASE ) && hasResultEntry( soilAddress ) )
{
return RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::soil() );
return soilAddress;
}

if ( phases.contains( RiaDefines::PhaseType::GAS_PHASE ) )
const RigEclipseResultAddress sgasAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::sgas() );
if ( phases.contains( RiaDefines::PhaseType::GAS_PHASE ) && hasResultEntry( sgasAddress ) )
{
return RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::sgas() );
return sgasAddress;
}

return RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::swat() );
const RigEclipseResultAddress swatAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::swat() );
if ( hasResultEntry( swatAddress ) )
{
return swatAddress;
}
}

auto dynamicResult = std::find_if( allResults.begin(),
Expand All @@ -861,7 +870,8 @@ RigEclipseResultAddress RigCaseCellResultsData::defaultResult() const

if ( staticResult != allResults.end() ) return *staticResult;

return {};
// No results available, use "None"
return RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::undefinedResultName() );
}

//--------------------------------------------------------------------------------------------------
Expand Down