OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix update issues related to fracture calculations

Browse Source 
* Make sure property filter is updated when completion type is cleared
* Clear geometry cache in views to make sure geometry is recreated
* Calculate required input parameters to completion type calculations
* Recompute values when depth changes
This commit is contained in:
Magne Sjaastad
2022-11-18 12:50:04 +01:00
committed by GitHub
parent e7c864c6d8
commit 6a859e0860
9 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp
+20 -23
View File
@@ -24,9 +24,7 @@
#include "RigEclipseCaseData.h"
#include "RimEclipseCase.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseView.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RiuMainWindow.h"
@@ -55,19 +53,7 @@ RiaCompletionTypeCalculationScheduler* RiaCompletionTypeCalculationScheduler::in
//--------------------------------------------------------------------------------------------------
void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAndRedrawAllViews()
{
std::vector<RimEclipseCase*> eclipseCases =
RimProject::current()->activeOilField()->analysisModels->cases().children();
scheduleRecalculateCompletionTypeAndRedrawAllViews( eclipseCases );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAndRedrawAllViews( RimEclipseCase* eclipseCase )
{
std::vector<RimEclipseCase*> eclipseCases;
eclipseCases.push_back( eclipseCase );
auto eclipseCases = RimProject::current()->eclipseCases();
scheduleRecalculateCompletionTypeAndRedrawAllViews( eclipseCases );
}
@@ -93,10 +79,23 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd
//--------------------------------------------------------------------------------------------------
void RiaCompletionTypeCalculationScheduler::clearCompletionTypeResultsInAllCases()
{
std::vector<RimEclipseCase*> eclipseCases =
RimProject::current()->activeOilField()->analysisModels->cases().children();
auto eclipseCases = RimProject::current()->eclipseCases();
clearCompletionTypeResults( eclipseCases );
// Clear geometry cache in views to recreate potential property filter geometry
for ( auto eclipseCase : eclipseCases )
{
if ( !eclipseCase ) continue;
for ( auto view : eclipseCase->views() )
{
if ( auto eclipseView = dynamic_cast<RimEclipseView*>( view ) )
{
eclipseView->scheduleReservoirGridGeometryRegen();
}
}
}
}
//--------------------------------------------------------------------------------------------------
@@ -124,18 +123,15 @@ void RiaCompletionTypeCalculationScheduler::performScheduledUpdates()
{
std::set<RimEclipseCase*> uniqueCases( m_eclipseCasesToRecalculate.begin(), m_eclipseCasesToRecalculate.end() );
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
for ( RimEclipseCase* eclipseCase : uniqueCases )
{
if ( eclipseCase )
{
for ( const auto& w : eclipseCase->views() )
for ( auto view : eclipseCase->views() )
{
RimEclipseView* eclView = dynamic_cast<RimEclipseView*>( w );
if ( eclView )
if ( auto eclipseView = dynamic_cast<RimEclipseView*>( view ) )
{
eclView->calculateCompletionTypeAndRedrawIfRequired();
eclipseView->calculateCompletionTypeAndRedrawIfRequired();
}
}
}
@@ -146,6 +142,7 @@ void RiaCompletionTypeCalculationScheduler::performScheduledUpdates()
// Recalculation of completion type causes active view to be set to potentially a different view
// Also current index in project tree is changed. Restore both to initial state.
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if ( activeView && activeView->viewer() )
{
RiaApplication::instance()->setActiveReservoirView( activeView );
ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.h
+1 -3
View File
@@ -38,7 +38,7 @@ public:
void scheduleRecalculateCompletionTypeAndRedrawAllViews();
void clearCompletionTypeResultsInAllCases();
void scheduleRecalculateCompletionTypeAndRedrawAllViews( RimEclipseCase* eclipseCase );
void scheduleRecalculateCompletionTypeAndRedrawAllViews( const std::vector<RimEclipseCase*>& eclipseCases );
void clearCompletionTypeResults( const std::vector<RimEclipseCase*>& eclipseCases );
void performScheduledUpdates() override;
@@ -50,8 +50,6 @@ private:
RiaCompletionTypeCalculationScheduler( const RiaCompletionTypeCalculationScheduler& o ) = delete;
void operator=( const RiaCompletionTypeCalculationScheduler& o ) = delete;
void scheduleRecalculateCompletionTypeAndRedrawAllViews( const std::vector<RimEclipseCase*>& eclipseCases );
private:
std::vector<caf::PdmPointer<RimEclipseCase>> m_eclipseCasesToRecalculate;
};