mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Fix update issues related to fracture calculations
* 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:
@@ -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 );
|
||||
|
@@ -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;
|
||||
};
|
||||
|
@@ -852,6 +852,8 @@ void RivReservoirViewPartMgr::computePropertyVisibility( cvf::UByteArray*
|
||||
|
||||
if ( propertyFilter->isActive() && propertyFilter->resultDefinition()->hasResult() )
|
||||
{
|
||||
propertyFilter->resultDefinition()->loadResult();
|
||||
|
||||
const RimCellFilter::FilterModeType filterType = propertyFilter->filterMode();
|
||||
|
||||
RigEclipseCaseData* eclipseCase = propFilterColl->reservoirView()->eclipseCase()->eclipseCaseData();
|
||||
|
@@ -92,7 +92,8 @@ void RimEllipseFractureTemplate::fieldChangedByUi( const caf::PdmFieldHandle* ch
|
||||
RimFractureTemplate::fieldChangedByUi( changedField, oldValue, newValue );
|
||||
|
||||
if ( changedField == &m_halfLength || changedField == &m_height || changedField == &m_width ||
|
||||
changedField == &m_permeability || changedField == &m_scaleApplyButton )
|
||||
changedField == &m_permeability || changedField == &m_scaleApplyButton ||
|
||||
changedField == &m_wellPathDepthAtFracture )
|
||||
{
|
||||
m_scaleApplyButton = false;
|
||||
|
||||
@@ -396,7 +397,8 @@ void RimEllipseFractureTemplate::onLoadDataAndUpdateGeometryHasChanged()
|
||||
this->firstAncestorOrThisOfType( eclipseCase );
|
||||
if ( eclipseCase )
|
||||
{
|
||||
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews( eclipseCase );
|
||||
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews(
|
||||
{ eclipseCase } );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -295,7 +295,7 @@ void RimFracture::fieldChangedByUi( const caf::PdmFieldHandle* changedField, con
|
||||
if ( eclipseCase )
|
||||
{
|
||||
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews(
|
||||
eclipseCase );
|
||||
{ eclipseCase } );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -50,6 +50,8 @@ public:
|
||||
void updateDependentObjects() override;
|
||||
void removeDependentObjects() override;
|
||||
|
||||
RimEclipseCase* destinationEclipseCase() const;
|
||||
|
||||
protected:
|
||||
void onChildrenUpdated( caf::PdmChildArrayFieldHandle* childArray,
|
||||
std::vector<caf::PdmObjectHandle*>& updatedObjects ) override;
|
||||
@@ -57,7 +59,6 @@ protected:
|
||||
RimGridCalculationVariable* createVariable() override;
|
||||
std::pair<bool, QString> validateVariables();
|
||||
|
||||
RimEclipseCase* destinationEclipseCase() const;
|
||||
std::vector<RimEclipseCase*> inputCases() const;
|
||||
|
||||
std::vector<double> getInputVectorForVariable( RimGridCalculationVariable* v,
|
||||
|
@@ -1370,7 +1370,7 @@ void RimProject::reloadCompletionTypeResultsForEclipseCase( RimEclipseCase* ecli
|
||||
views[viewIdx]->scheduleCreateDisplayModelAndRedraw();
|
||||
}
|
||||
|
||||
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews( eclipseCase );
|
||||
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews( { eclipseCase } );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
@@ -1596,7 +1596,8 @@ void RimStimPlanModel::updateViewsAndPlots()
|
||||
this->firstAncestorOrThisOfType( eclipseCase );
|
||||
if ( eclipseCase )
|
||||
{
|
||||
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews( eclipseCase );
|
||||
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews(
|
||||
{ eclipseCase } );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -28,6 +28,7 @@
|
||||
#include "RiaResultNames.h"
|
||||
#include "RigAllanDiagramData.h"
|
||||
#include "RigCaseCellResultCalculator.h"
|
||||
#include "RigEclipseAllanFaultsStatCalc.h"
|
||||
#include "RigEclipseCaseData.h"
|
||||
#include "RigEclipseMultiPropertyStatCalc.h"
|
||||
#include "RigEclipseNativeStatCalc.h"
|
||||
@@ -39,6 +40,8 @@
|
||||
|
||||
#include "RimCompletionCellIntersectionCalc.h"
|
||||
#include "RimEclipseCase.h"
|
||||
#include "RimGridCalculation.h"
|
||||
#include "RimGridCalculationCollection.h"
|
||||
#include "RimProject.h"
|
||||
|
||||
#include "RifReaderEclipseOutput.h"
|
||||
@@ -49,7 +52,6 @@
|
||||
|
||||
#include <QDateTime>
|
||||
|
||||
#include "RigEclipseAllanFaultsStatCalc.h"
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
|
||||
@@ -2897,6 +2899,23 @@ void RigCaseCellResultsData::computeCompletionTypeForTimeStep( size_t timeStep )
|
||||
|
||||
if ( !eclipseCase ) return;
|
||||
|
||||
// If permeabilities are generated by calculations, make sure that generated data is calculated
|
||||
// See RicExportFractureCompletionsImpl::generateCompdatValues()
|
||||
for ( const QString& propertyName : { "PERMX", "PERMY", "PERMZ" } )
|
||||
{
|
||||
for ( auto userCalculation : RimProject::current()->gridCalculationCollection()->calculations() )
|
||||
{
|
||||
auto gridCalculation = dynamic_cast<RimGridCalculation*>( userCalculation );
|
||||
if ( gridCalculation && gridCalculation->destinationEclipseCase() != eclipseCase ) continue;
|
||||
|
||||
QString generatedPropertyName = userCalculation->findLeftHandSide( userCalculation->expression() );
|
||||
if ( generatedPropertyName == propertyName )
|
||||
{
|
||||
userCalculation->calculate();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RimCompletionCellIntersectionCalc::calculateCompletionTypeResult( eclipseCase, completionTypeResult, timeStep );
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user