diff --git a/ApplicationLibCode/Application/RiaPreferencesGrid.cpp b/ApplicationLibCode/Application/RiaPreferencesGrid.cpp index a961af4c84..6e89a69fab 100644 --- a/ApplicationLibCode/Application/RiaPreferencesGrid.cpp +++ b/ApplicationLibCode/Application/RiaPreferencesGrid.cpp @@ -317,3 +317,19 @@ void RiaPreferencesGrid::setGridModelReaderOverride( const std::string& readerNa m_gridModelReaderOverride = readerType; } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RiaPreferencesGrid::setGridModelReaderOverride( const RiaDefines::GridModelReader readerType ) +{ + m_gridModelReaderOverride = readerType; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RiaDefines::GridModelReader RiaPreferencesGrid::gridModelReaderOverride() const +{ + return m_gridModelReaderOverride; +} diff --git a/ApplicationLibCode/Application/RiaPreferencesGrid.h b/ApplicationLibCode/Application/RiaPreferencesGrid.h index c748e6ce54..8e95831dc8 100644 --- a/ApplicationLibCode/Application/RiaPreferencesGrid.h +++ b/ApplicationLibCode/Application/RiaPreferencesGrid.h @@ -58,7 +58,10 @@ public: bool invalidateLongThinCells() const; RiaDefines::GridModelReader gridModelReader() const; + void setGridModelReaderOverride( const std::string& readerName ); + void setGridModelReaderOverride( const RiaDefines::GridModelReader readerType ); + RiaDefines::GridModelReader gridModelReaderOverride() const; void appendItems( caf::PdmUiOrdering& uiOrdering ); diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp index 989fea936f..8620ccf41c 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp @@ -533,8 +533,11 @@ void RimStatisticsContourMap::computeStatistics() caf::ProgressInfo progInfo( nCases, QString( "Reading Eclipse Ensemble" ) ); - auto readerSettings = RiaPreferencesGrid::current()->gridOnlyReaderSettings(); - auto casesInViews = ensemble->casesInViews(); + auto readerSettings = RiaPreferencesGrid::current()->gridOnlyReaderSettings(); + readerSettings.onlyLoadActiveCells = true; + auto casesInViews = ensemble->casesInViews(); + auto oldReaderType = RiaPreferencesGrid::current()->gridModelReaderOverride(); + RiaPreferencesGrid::current()->setGridModelReaderOverride( RiaDefines::GridModelReader::OPM_COMMON ); int i = 1; for ( RimEclipseCase* eCase : ensemble->cases() ) @@ -591,6 +594,8 @@ void RimStatisticsContourMap::computeStatistics() } } + RiaPreferencesGrid::current()->setGridModelReaderOverride( oldReaderType ); + m_contourMapGrid = std::move( contourMapGrid ); doStatisticsCalculation( timestep_results );