mirror of
https://github.com/OPM/ResInsight.git
synced 2026-08-27 05:37:21 -05:00
Always use opm_common to skip inactive cells in grid ensemble stats
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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 );
|
||||
|
||||
|
||||
@@ -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 );
|
||||
|
||||
Reference in New Issue
Block a user