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

Merge pull request #5822 from OPM/tensor-plot-for-fluxes-5583

Browse Source 
Tensor plot for fluxes 5583
This commit is contained in:
Magne Sjaastad
2020-04-22 22:10:27 +02:00
committed by GitHub
parent 12a4419a38 c464664c40
commit e8068d7b60
12 changed files with 1046 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -51,6 +51,7 @@
#include "RimEclipsePropertyFilter.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseResultDefinition.h"
#include "RimElementVectorResult.h"
#include "RimExtrudedCurveIntersection.h"
#include "RimFaultInViewCollection.h"
#include "RimFlowCharacteristicsPlot.h"
@@ -145,6 +146,15 @@ RimEclipseView::RimEclipseView()
m_cellEdgeResult = new RimCellEdgeColors();
m_cellEdgeResult.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_elementVectorResult,
"ElementVectorResult",
"Element Vector Result",
":/CellResult.png",
"",
"" );
m_elementVectorResult = new RimElementVectorResult;
m_elementVectorResult.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_faultResultSettings, "FaultResultSettings", "Separate Fault Result", "", "", "" );
m_faultResultSettings = new RimEclipseFaultColors();
m_faultResultSettings.uiCapability()->setUiHidden( true );
@@ -210,6 +220,7 @@ RimEclipseView::~RimEclipseView()
delete this->faultResultSettings();
delete this->cellResult();
delete this->cellEdgeResult();
delete this->elementVectorResult();
delete m_propertyFilterCollection;
delete wellCollection();
@@ -237,6 +248,14 @@ RimCellEdgeColors* RimEclipseView::cellEdgeResult() const
return m_cellEdgeResult;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimElementVectorResult* RimEclipseView::elementVectorResult() const
{
return m_elementVectorResult;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -656,6 +675,8 @@ void RimEclipseView::onUpdateDisplayModelForCurrentTimeStep()
appendWellsAndFracturesToModel();
appendElementVectorResultToModel();
m_overlayInfoConfig()->update3DInfo();
// Invisible Wells are marked as read only when "show wells intersecting visible cells" is enabled
@@ -909,6 +930,37 @@ void RimEclipseView::appendWellsAndFracturesToModel()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseView::appendElementVectorResultToModel()
{
if ( nativeOrOverrideViewer() )
{
cvf::Scene* frameScene = nativeOrOverrideViewer()->frame( m_currentTimeStep, isUsingOverrideViewer() );
if ( frameScene )
{
// Element Vector Results
cvf::String name = "ElementVectorModelMod";
this->removeModelByName( frameScene, name );
cvf::ref<cvf::ModelBasicList> frameParts = new cvf::ModelBasicList;
frameParts->setName( name );
m_reservoirGridPartManager->appendElementVectorResultDynamicGeometryPartsToModel( frameParts.p(),
PROPERTY_FILTERED,
m_currentTimeStep );
// TODO: should this be ACTIVE?
m_reservoirGridPartManager->appendElementVectorResultDynamicGeometryPartsToModel( frameParts.p(),
PROPERTY_FILTERED_WELL_CELLS,
m_currentTimeStep );
frameScene->addModel( frameParts.p() );
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -1323,6 +1375,12 @@ void RimEclipseView::onUpdateLegends()
}
}
if ( this->elementVectorResult()->showResult() )
{
this->elementVectorResult()->updateLegendRangesTextAndVisibility( nativeOrOverrideViewer(),
isUsingOverrideViewer() );
}
{
bool hasAnyVisibleFractures = false;
{
@@ -1775,6 +1833,7 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
uiTreeOrdering.add( cellResult() );
uiTreeOrdering.add( cellEdgeResult() );
uiTreeOrdering.add( elementVectorResult() );
uiTreeOrdering.add( faultResultSettings() );
uiTreeOrdering.add( &m_intersectionResultDefCollection );
uiTreeOrdering.add( &m_surfaceResultDefCollection );