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

Add optional support for using visible cells as filter for grid statistics

Browse Source
This commit is contained in:
Magne Sjaastad 2023-11-10 11:05:03 +01:00
parent 1046bcbb94
commit 860f086af6
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@ -20,6 +20,7 @@
#include "RimEclipseStatisticsCase.h"
#include "RiaOptionItemFactory.h"
#include "RiaResultNames.h"
#include "RicNewViewFeature.h"
@ -93,6 +94,7 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase()
CAF_PDM_InitFieldNoDefault( &m_dataSourceForStatistics, "DataSourceForStatistics", "Data Source" );
CAF_PDM_InitFieldNoDefault( &m_gridCalculation, "GridCalculation", "Grid Calculation" );
CAF_PDM_InitFieldNoDefault( &m_gridCalculationFilterView, "GridCalculationFilterView", "Filter By View" );
CAF_PDM_InitScriptableFieldNoDefault( &m_selectedTimeSteps, "SelectedTimeSteps", "Time Step Selection" );
m_selectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
@ -424,7 +426,7 @@ void RimEclipseStatisticsCase::computeStatistics()
stat.useZeroAsValueForInActiveCellsBasedOnUnionOfActiveCells();
}
stat.evaluateForResults( resultSpecification );
stat.evaluateForResults( resultSpecification, m_gridCalculationFilterView() );
}
//--------------------------------------------------------------------------------------------------
///
@ -506,6 +508,7 @@ void RimEclipseStatisticsCase::defineUiOrdering( QString uiConfigName, caf::PdmU
if ( m_dataSourceForStatistics() == DataSourceType::GRID_CALCULATION )
{
group->add( &m_gridCalculation );
group->add( &m_gridCalculationFilterView );
}
else
{
@ -622,6 +625,20 @@ QList<caf::PdmOptionItemInfo> RimEclipseStatisticsCase::calculateValueOptions( c
return options;
}
if ( &m_gridCalculationFilterView == fieldNeedingOptions )
{
QList<caf::PdmOptionItemInfo> options;
options.push_back( caf::PdmOptionItemInfo( nullptr, "None" ) );
for ( const auto& view : views() )
{
RiaOptionItemFactory::appendOptionItemFromViewNameAndCaseName( view, &options );
}
return options;
}
if ( &m_selectedDynamicProperties == fieldNeedingOptions )
{
QStringList varList =

1
ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h
View File

@ -110,6 +110,7 @@ private:
caf::PdmField<caf::AppEnum<DataSourceType>> m_dataSourceForStatistics;
caf::PdmPtrField<RimGridCalculation*> m_gridCalculation;
caf::PdmPtrField<RimEclipseView*> m_gridCalculationFilterView;
caf::PdmField<std::vector<int>> m_selectedTimeSteps;

12
ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp
View File

@ -29,6 +29,7 @@
#include "RigResultModifierFactory.h"
#include "RigStatisticsMath.h"
#include "RimEclipseView.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimReservoirCellResultsStorage.h"
@ -103,7 +104,7 @@ QString createResultNamePVal( const QString& resultName, double pValPos )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseStatisticsCaseEvaluator::evaluateForResults( const QList<ResSpec>& resultSpecification )
void RimEclipseStatisticsCaseEvaluator::evaluateForResults( const QList<ResSpec>& resultSpecification, RimEclipseView* filterView )
{
CVF_ASSERT( m_destinationCase );
@ -198,11 +199,20 @@ void RimEclipseStatisticsCaseEvaluator::evaluateForResults( const QList<ResSpec>
auto cellCount = static_cast<int>( grid->cellCount() );
cvf::ref<cvf::UByteArray> visibility;
if ( filterView )
{
visibility = filterView->currentTotalCellVisibility();
}
// Loop over the cells in the grid, get the case values, and calculate the cell statistics
#pragma omp parallel for schedule( dynamic ) firstprivate( statParams, values )
for ( int cellIdx = 0; cellIdx < cellCount; cellIdx++ )
{
size_t reservoirCellIndex = grid->reservoirCellIndex( cellIdx );
if ( visibility.notNull() && !visibility->val( reservoirCellIndex ) ) continue;
if ( m_destinationCase->activeCellInfo( poroModel )->isActive( reservoirCellIndex ) )
{
// Extract the cell values from each of the cases and assemble them into one vector

2
ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h
View File

@ -81,7 +81,7 @@ public:
void useZeroAsValueForInActiveCellsBasedOnUnionOfActiveCells();
void evaluateForResults( const QList<ResSpec>& resultSpecification );
void evaluateForResults( const QList<ResSpec>& resultSpecification, RimEclipseView* filterView );
private:
void addNamedResults( const QList<ResSpec>& resultSpecification );