OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-01 03:37:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Find and evaluate dependent calculations

Browse Source
This commit is contained in:
Magne Sjaastad 2023-12-06 09:49:40 +01:00
parent 3f0b767528
commit 30807438d1
3 changed files with 70 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@ -324,7 +324,8 @@ void RimEclipseStatisticsCase::computeStatistics()
inputValueVisibilityFilter = m_gridCalculationFilterView()->currentTotalCellVisibility().p();
}
calc->calculateForCases( sourceCases, inputValueVisibilityFilter, timeStepIndices );
bool evaluateDependentCalculations = false;
calc->calculateForCases( sourceCases, inputValueVisibilityFilter, timeStepIndices, evaluateDependentCalculations );
}
}

77
ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp
View File

@ -24,16 +24,6 @@
#include "RiaPorosityModel.h"
#include "RigActiveCellInfo.h"
#include "RimEclipseCase.h"
#include "RimEclipseCaseTools.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseStatisticsCase.h"
#include "RimEclipseView.h"
#include "RimGridCalculationVariable.h"
#include "RimProject.h"
#include "RimReloadCaseTools.h"
#include "RimTools.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "RigEclipseResultAddress.h"
@ -43,6 +33,17 @@
#include "RigResultAccessorFactory.h"
#include "RigStatisticsMath.h"
#include "RimEclipseCase.h"
#include "RimEclipseCaseTools.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseStatisticsCase.h"
#include "RimEclipseView.h"
#include "RimGridCalculationCollection.h"
#include "RimGridCalculationVariable.h"
#include "RimProject.h"
#include "RimReloadCaseTools.h"
#include "RimTools.h"
#include "expressionparser/ExpressionParser.h"
#include "cafPdmUiTreeSelectionEditor.h"
@ -161,9 +162,21 @@ bool RimGridCalculation::calculate()
inputValueVisibilityFilter = m_cellFilterView()->currentTotalCellVisibility().p();
}
auto timeSteps = std::nullopt;
std::optional<std::vector<size_t>> timeSteps = std::nullopt;
return calculateForCases( outputEclipseCases(), inputValueVisibilityFilter, timeSteps );
if ( !m_selectedTimeSteps().empty() )
{
std::vector<size_t> tmp;
for ( auto t : m_selectedTimeSteps() )
{
tmp.push_back( static_cast<size_t>( t ) );
}
timeSteps = tmp;
}
bool evaluateDependentCalculations = true;
return calculateForCases( outputEclipseCases(), inputValueVisibilityFilter, timeSteps, evaluateDependentCalculations );
}
//--------------------------------------------------------------------------------------------------
@ -584,10 +597,13 @@ void RimGridCalculation::removeDependentObjects()
//--------------------------------------------------------------------------------------------------
bool RimGridCalculation::calculateForCases( const std::vector<RimEclipseCase*>& calculationCases,
cvf::UByteArray* inputValueVisibilityFilter,
std::optional<std::vector<size_t>> timeSteps )
std::optional<std::vector<size_t>> timeSteps,
bool evaluateDependentCalculations )
{
if ( calculationCases.empty() ) return true;
if ( evaluateDependentCalculations ) findAndEvaluateDependentCalculations( calculationCases, inputValueVisibilityFilter, timeSteps );
QString leftHandSideVariableName = RimGridCalculation::findLeftHandSide( m_expression );
auto [isOk, errorMessage] = validateVariables();
@ -689,8 +705,11 @@ bool RimGridCalculation::calculateForCases( const std::vector<RimEclipseCase*>&
bool useDataFromDestinationCase = ( v->eclipseCase() == m_destinationCase );
auto dataForVariable = getDataForVariable( v, tsId, porosityModel, calculationCase, useDataFromDestinationCase );
if ( inputValueVisibilityFilter )
if ( dataForVariable.empty() )
{
RiaLogging::error( QString( " No data found for variable '%1'." ).arg( v->name() ) );
}
else if ( inputValueVisibilityFilter )
{
const double defaultValue = 0.0;
replaceFilteredValuesWithDefaultValue( defaultValue, inputValueVisibilityFilter, dataForVariable, porosityModel, calculationCase );
@ -730,7 +749,7 @@ bool RimGridCalculation::calculateForCases( const std::vector<RimEclipseCase*>&
}
}
if ( m_cellFilterView() )
if ( m_cellFilterView() && !resultValues.empty() )
{
filterResults( m_cellFilterView(),
dataForAllVariables,
@ -757,7 +776,7 @@ bool RimGridCalculation::calculateForCases( const std::vector<RimEclipseCase*>&
calculationCase->updateResultAddressCollection();
}
if ( isMultipleCasesPresent )
if ( hasAggregationExpression )
{
QString txt = " " + calculationCase->caseUserDescription();
@ -795,6 +814,30 @@ bool RimGridCalculation::calculateForCases( const std::vector<RimEclipseCase*>&
return !anyErrorsDetected;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCalculation::findAndEvaluateDependentCalculations( const std::vector<RimEclipseCase*>& calculationCases,
cvf::UByteArray* inputValueVisibilityFilter,
std::optional<std::vector<size_t>> timeSteps )
{
auto proj = RimProject::current();
auto calcColl = proj->gridCalculationCollection();
auto dependentCalculations = calcColl->dependentCalculations( this );
for ( auto dependentCalc : dependentCalculations )
{
if ( dependentCalc == this ) continue;
// Propagate the settings for this calculation to the dependent calculation. This will allow changes on top level calculation to be
// propagated to dependent calculations automatically. Do not trigger findAndEvaluateDependentCalculations() recursively, as all
// dependent calculations are traversed in this function.
bool evaluateDependentCalculations = false;
dependentCalc->calculateForCases( calculationCases, inputValueVisibilityFilter, timeSteps, evaluateDependentCalculations );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

10
ApplicationLibCode/ProjectDataModel/RimGridCalculation.h
View File

@ -59,8 +59,14 @@ public:
RigEclipseResultAddress outputAddress() const;
bool calculateForCases( const std::vector<RimEclipseCase*>& calculationCases,
cvf::UByteArray* inputValueVisibilityFilter,
std::optional<std::vector<size_t>> timeSteps );
void assignEclipseCaseForNullPointers( RimEclipseCase* eclipseCase );
std::optional<std::vector<size_t>> timeSteps,
bool evaluateDependentCalculations );
void findAndEvaluateDependentCalculations( const std::vector<RimEclipseCase*>& calculationCases,
cvf::UByteArray* inputValueVisibilityFilter,
std::optional<std::vector<size_t>> timeSteps );
void assignEclipseCaseForNullPointers( RimEclipseCase* eclipseCase );
std::vector<RimEclipseCase*> inputCases() const;