From 5ecc43d49f640e17e3e1028b50e5a456a28361b8 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 9 Nov 2023 07:59:45 +0100
Subject: [PATCH] Always release memory during statistics of grid calculations

---
 .../ProjectDataModel/RimEclipseStatisticsCase.cpp      | 10 ++--------
 .../ProjectDataModel/RimEclipseStatisticsCase.h        |  1 -
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
index 4b21ae13a0..8e5062b0e8 100644
--- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
@@ -93,7 +93,6 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase()
     CAF_PDM_InitFieldNoDefault( &m_dataSourceForStatistics, "DataSourceForStatistics", "Data Source" );
 
     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" );
     m_selectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
@@ -413,12 +412,8 @@ void RimEclipseStatisticsCase::computeStatistics()
                                                                                 calculationName ) );
     }
 
-    RimEclipseStatisticsCaseEvaluator stat( sourceCases,
-                                            timeStepIndices,
-                                            statisticsConfig,
-                                            resultCase,
-                                            gridCaseGroup,
-                                            m_clearGridCalculationMemory() );
+    bool clearGridCalculationMemory = m_dataSourceForStatistics() == DataSourceType::GRID_CALCULATION;
+    RimEclipseStatisticsCaseEvaluator stat( sourceCases, timeStepIndices, statisticsConfig, resultCase, gridCaseGroup, clearGridCalculationMemory );
 
     if ( m_useZeroAsInactiveCellValue )
     {
@@ -507,7 +502,6 @@ void RimEclipseStatisticsCase::defineUiOrdering( QString uiConfigName, caf::PdmU
         if ( m_dataSourceForStatistics() == DataSourceType::GRID_CALCULATION )
         {
             group->add( &m_gridCalculation );
-            group->add( &m_clearGridCalculationMemory );
         }
         else
         {
diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h
index 91eba7bb7d..7c08e30a57 100644
--- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h
+++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h
@@ -110,7 +110,6 @@ private:
     caf::PdmField<caf::AppEnum<DataSourceType>> m_dataSourceForStatistics;
 
     caf::PdmPtrField<RimGridCalculation*> m_gridCalculation;
-    caf::PdmField<bool>                   m_clearGridCalculationMemory;
 
     caf::PdmField<std::vector<int>> m_selectedTimeSteps;