OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-27 15:41:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add nullptr guards to avoid crash when trying to use well allocation plot with an ensemble

Browse Source
This commit is contained in:
jonjenssen authored and Magne Sjaastad committed 2025-06-10 10:52:18 +02:00
1 parent d7d18ce9ab
commit 55a4bad0fb
6 files changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Commands/FlowCommands/RicSelectViewUI.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ void RicSelectViewUI::setView( RimEclipseView* currentView )
{
m_currentView = currentView;
m_currentCase = m_currentView->firstAncestorOrThisOfTypeAsserted<RimEclipseResultCase>();
m_currentCase = m_currentView->firstAncestorOrThisOfType<RimEclipseResultCase>();
m_selectedView = m_currentView;
}
ApplicationLibCode/Commands/RicSelectOrCreateViewFeatureImpl.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ RimEclipseView* RicSelectOrCreateViewFeatureImpl::getDefaultSelectedView( RimEcl
dynamic_cast<RimEclipseView*>( caf::PdmReferenceHelper::objectFromReference( RimProject::current(), lastUsedViewRef ) );
if ( lastUsedView )
{
RimEclipseResultCase* lastUsedViewResultCase = lastUsedView->firstAncestorOrThisOfTypeAsserted<RimEclipseResultCase>();
RimEclipseResultCase* lastUsedViewResultCase = lastUsedView->firstAncestorOrThisOfType<RimEclipseResultCase>();
if ( lastUsedViewResultCase == resultCase )
{
@@ -114,7 +114,7 @@ RimEclipseView* RicSelectOrCreateViewFeatureImpl::getDefaultSelectedView( RimEcl
RimEclipseView* activeView = dynamic_cast<RimEclipseView*>( RiaApplication::instance()->activeReservoirView() );
if ( activeView )
{
RimEclipseResultCase* activeViewResultCase = activeView->firstAncestorOrThisOfTypeAsserted<RimEclipseResultCase>();
RimEclipseResultCase* activeViewResultCase = activeView->firstAncestorOrThisOfType<RimEclipseResultCase>();
if ( activeViewResultCase == resultCase )
{
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationOverTimePlot.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ void RimWellAllocationOverTimePlot::setFromSimulationWell( RimSimWellInView* sim
// Use the active flow diagnostics solutions, or the first one as default
m_flowDiagSolution = eclView->cellResult()->flowDiagSolution();
if ( !m_flowDiagSolution )
if ( ( m_flowDiagSolution == nullptr ) && ( m_case != nullptr ) )
{
m_flowDiagSolution = m_case->defaultFlowDiagSolution();
}
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
+1 -1
View File
@@ -181,7 +181,7 @@ void RimWellAllocationPlot::setFromSimulationWell( RimSimWellInView* simWell )
// Use the active flow diag solutions, or the first one as default
m_flowDiagSolution = eclView->cellResult()->flowDiagSolution();
if ( !m_flowDiagSolution )
if ( ( m_flowDiagSolution == nullptr ) && ( m_case != nullptr ) )
{
m_flowDiagSolution = m_case->defaultFlowDiagSolution();
}
ApplicationLibCode/ProjectDataModel/Flow/RimWellConnectivityTable.cpp
+1 -1
View File
@@ -236,7 +236,7 @@ void RimWellConnectivityTable::setFromSimulationWell( RimSimWellInView* simWell
if ( eclView )
{
m_flowDiagSolution = eclView->cellResult()->flowDiagSolution();
if ( !m_flowDiagSolution )
if ( ( m_flowDiagSolution == nullptr ) && ( m_case != nullptr ) )
{
m_flowDiagSolution = m_case->defaultFlowDiagSolution();
}
ApplicationLibCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.cpp
+1
View File
@@ -42,6 +42,7 @@ RigTofAccumulatedPhaseFractionsCalculator::RigTofAccumulatedPhaseFractionsCalcul
QString wellname,
size_t timestep )
{
if ( caseToApply == nullptr ) return;
RigEclipseCaseData* eclipseCaseData = caseToApply->eclipseCaseData();
if ( !eclipseCaseData ) return;