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

Always release memory during statistics of grid calculations

Browse Source
This commit is contained in:
Magne Sjaastad 2023-11-09 07:59:45 +01:00
parent 69f132ffa5
commit 5ecc43d49f
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@ -93,7 +93,6 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase()
CAF_PDM_InitFieldNoDefault( &m_dataSourceForStatistics, "DataSourceForStatistics", "Data Source" ); CAF_PDM_InitFieldNoDefault( &m_dataSourceForStatistics, "DataSourceForStatistics", "Data Source" );
CAF_PDM_InitFieldNoDefault( &m_gridCalculation, "GridCalculation", "Grid Calculation" ); CAF_PDM_InitFieldNoDefault( &m_gridCalculation, "GridCalculation", "Grid Calculation" );
CAF_PDM_InitField( &m_clearGridCalculationMemory, "ClearGridCalculationMemory", true, "Clear Grid Calculation Memory" );
CAF_PDM_InitScriptableFieldNoDefault( &m_selectedTimeSteps, "SelectedTimeSteps", "Time Step Selection" ); CAF_PDM_InitScriptableFieldNoDefault( &m_selectedTimeSteps, "SelectedTimeSteps", "Time Step Selection" );
m_selectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
@ -413,12 +412,8 @@ void RimEclipseStatisticsCase::computeStatistics()
calculationName ) ); calculationName ) );
} }
RimEclipseStatisticsCaseEvaluator stat( sourceCases, bool clearGridCalculationMemory = m_dataSourceForStatistics() == DataSourceType::GRID_CALCULATION;
timeStepIndices, RimEclipseStatisticsCaseEvaluator stat( sourceCases, timeStepIndices, statisticsConfig, resultCase, gridCaseGroup, clearGridCalculationMemory );
statisticsConfig,
resultCase,
gridCaseGroup,
m_clearGridCalculationMemory() );
if ( m_useZeroAsInactiveCellValue ) if ( m_useZeroAsInactiveCellValue )
{ {
@ -507,7 +502,6 @@ void RimEclipseStatisticsCase::defineUiOrdering( QString uiConfigName, caf::PdmU
if ( m_dataSourceForStatistics() == DataSourceType::GRID_CALCULATION ) if ( m_dataSourceForStatistics() == DataSourceType::GRID_CALCULATION )
{ {
group->add( &m_gridCalculation ); group->add( &m_gridCalculation );
group->add( &m_clearGridCalculationMemory );
} }
else else
{ {

1
ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h
View File

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