mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-26 15:10:22 -05:00
Adjustments for release
* Make sure RFT curve settings are restored correctly, use three numbers to identify project version string to compare with. * Increases dialog window sizes for summary template operations * Move improved summary import setting to Summary tab * #12838 Use discrete linear as default legend for CNV_* result names * Bump version to 2025.04.4-dev.10
This commit is contained in:
1 parent
83ae9fb7ac
commit
b8fc3df6f5
10 files changed
+33
-43
No files matched your search
@@ -159,6 +159,15 @@ RiaPreferencesSummary::RiaPreferencesSummary()
|
||||
|
||||
CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType_v01", "File Format" );
|
||||
|
||||
CAF_PDM_InitField( &m_useImprovedSummaryImport,
|
||||
"useImprovedSummaryImport",
|
||||
true,
|
||||
"Use Improved Summary Import",
|
||||
"",
|
||||
"For ensemble import, skip metadata import for individual realizations. This reduces file operations and can "
|
||||
"significantly speed up the import process." );
|
||||
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useImprovedSummaryImport );
|
||||
|
||||
CAF_PDM_InitField( &m_showSummaryTimeAsLongString,
|
||||
"showSummaryTimeAsLongString",
|
||||
false,
|
||||
@@ -331,6 +340,14 @@ bool RiaPreferencesSummary::summaryRestartFilesShowImportDialog() const
|
||||
return m_summaryRestartFilesShowImportDialog;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RiaPreferencesSummary::useImprovedSummaryImport() const
|
||||
{
|
||||
return m_useImprovedSummaryImport;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -403,6 +420,7 @@ RiaPreferencesSummary::SummaryHistoryCurveStyleMode RiaPreferencesSummary::defau
|
||||
void RiaPreferencesSummary::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
|
||||
{
|
||||
uiOrdering.add( &m_useMultipleThreadsWhenLoadingSummaryCases );
|
||||
uiOrdering.add( &m_useImprovedSummaryImport );
|
||||
uiOrdering.add( &m_summaryReader );
|
||||
|
||||
if ( m_summaryReader == SummaryReaderMode::OPM_COMMON )
|
||||
|
||||
@@ -99,6 +99,7 @@ public:
|
||||
bool showSummaryTimeAsLongString() const;
|
||||
bool useMultipleThreadsWhenLoadingSummaryData() const;
|
||||
bool summaryRestartFilesShowImportDialog() const;
|
||||
bool useImprovedSummaryImport() const;
|
||||
|
||||
SummaryRestartFilesImportMode summaryImportMode() const;
|
||||
SummaryRestartFilesImportMode gridImportMode() const;
|
||||
@@ -149,6 +150,7 @@ private:
|
||||
caf::PdmField<int> m_createH5SummaryFileThreadCount;
|
||||
|
||||
caf::PdmField<SummaryReaderModeType> m_summaryReader;
|
||||
caf::PdmField<bool> m_useImprovedSummaryImport;
|
||||
|
||||
caf::PdmField<ColumnCountEnum> m_defaultColumnCount;
|
||||
caf::PdmField<RowCountEnum> m_defaultRowsPerPage;
|
||||
|
||||
@@ -80,15 +80,6 @@ RiaPreferencesSystem::RiaPreferencesSystem()
|
||||
CAF_PDM_InitField( &m_showPdfExportDialog, "showPdfExportDialog", true, "Show PDF Export Dialog" );
|
||||
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showPdfExportDialog );
|
||||
|
||||
CAF_PDM_InitField( &m_useImprovedSummaryImport, "useImprovedSummaryImport", false, "Use Improved Summary Import" );
|
||||
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useImprovedSummaryImport );
|
||||
|
||||
CAF_PDM_InitField( &m_useMultiThreadingForSummary_TEMPORARY,
|
||||
"useMultiThreadingForSummary",
|
||||
true,
|
||||
"Use Multithreading for Summary Import (TEMPORARY)" );
|
||||
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useMultiThreadingForSummary_TEMPORARY );
|
||||
|
||||
CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)" );
|
||||
CAF_PDM_InitField( &m_exportScalingFactor, "exportScalingFactor", -1.0, "Export Scaling Factor (<0 disable)" );
|
||||
|
||||
@@ -236,22 +227,6 @@ double RiaPreferencesSystem::exportPdfScalingFactor() const
|
||||
return m_exportScalingFactor();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RiaPreferencesSystem::useImprovedSummaryImport() const
|
||||
{
|
||||
return m_useImprovedSummaryImport();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RiaPreferencesSystem::useMultiThreadingForSummaryImport() const
|
||||
{
|
||||
return m_useMultiThreadingForSummary_TEMPORARY();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -332,12 +307,6 @@ void RiaPreferencesSystem::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd
|
||||
group->add( &m_gtestFilter );
|
||||
}
|
||||
|
||||
{
|
||||
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Summary Settings - July 2025" );
|
||||
group->add( &m_useImprovedSummaryImport );
|
||||
group->add( &m_useMultiThreadingForSummary_TEMPORARY );
|
||||
}
|
||||
|
||||
uiOrdering.add( &m_maximumNumberOfThreads );
|
||||
}
|
||||
|
||||
|
||||
@@ -57,9 +57,6 @@ public:
|
||||
bool showPdfExportDialog() const;
|
||||
double exportPdfScalingFactor() const;
|
||||
|
||||
bool useImprovedSummaryImport() const;
|
||||
bool useMultiThreadingForSummaryImport() const;
|
||||
|
||||
std::optional<int> threadCount() const;
|
||||
|
||||
bool logToFile() const;
|
||||
@@ -90,9 +87,6 @@ private:
|
||||
caf::PdmField<bool> m_showPdfExportDialog;
|
||||
caf::PdmField<double> m_exportScalingFactor;
|
||||
|
||||
caf::PdmField<bool> m_useImprovedSummaryImport;
|
||||
caf::PdmField<bool> m_useMultiThreadingForSummary_TEMPORARY;
|
||||
|
||||
caf::PdmField<bool> m_showProgressBar;
|
||||
caf::PdmField<QString> m_gtestFilter;
|
||||
|
||||
|
||||
@@ -446,7 +446,7 @@ QString RicSummaryPlotTemplateTools::selectPlotTemplatePath()
|
||||
RicSelectPlotTemplateUi ui;
|
||||
|
||||
caf::PdmUiPropertyViewDialog propertyDialog( plotwindow, &ui, "Select Plot Template", "" );
|
||||
propertyDialog.resize( QSize( 400, 600 ) );
|
||||
propertyDialog.resize( QSize( 600, 800 ) );
|
||||
|
||||
if ( propertyDialog.exec() == QDialog::Accepted && !ui.selectedPlotTemplates().empty() )
|
||||
{
|
||||
|
||||
@@ -87,6 +87,8 @@ void RicSaveMultiPlotTemplateFeature::onActionTriggered( bool isChecked )
|
||||
settings.setName( templateCandidateName );
|
||||
|
||||
caf::PdmUiPropertyViewDialog propertyDialog( RiuPlotMainWindow::instance(), &settings, "Export Plot Template", "" );
|
||||
propertyDialog.resize( QSize( 600, 400 ) );
|
||||
|
||||
if ( propertyDialog.exec() != QDialog::Accepted ) return;
|
||||
|
||||
auto plot = selectedSummaryPlot();
|
||||
|
||||
@@ -141,7 +141,7 @@ void RimWellRftEnsembleCurveSet::clearEnsembleStatistics()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimWellRftEnsembleCurveSet::initAfterRead()
|
||||
{
|
||||
if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2025.04" ) )
|
||||
if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2025.04.3" ) )
|
||||
{
|
||||
m_appearance->setColorMode( m_ensembleColorMode_OBSOLETE() );
|
||||
m_appearance->setEnsembleParameter( m_ensembleParameter_OBSOLETE() );
|
||||
|
||||
@@ -1221,6 +1221,13 @@ void RimRegularLegendConfig::setDefaultConfigForResultName( int caseId, const QS
|
||||
colorRangeType = RimRegularLegendConfig::ColorRangesType::NORMAL;
|
||||
}
|
||||
|
||||
if ( resultName.startsWith( "CNV_" ) )
|
||||
{
|
||||
mappingType = MappingType::LINEAR_DISCRETE;
|
||||
rangeType = RimLegendConfig::RangeModeType::AUTOMATIC_ALLTIMESTEPS;
|
||||
numberFormat = RiaNumberFormat::NumberFormatType::FIXED;
|
||||
}
|
||||
|
||||
resetUserDefinedValues();
|
||||
setRangeMode( rangeType );
|
||||
setMappingMode( mappingType );
|
||||
|
||||
@@ -520,7 +520,7 @@ void RimSummaryCaseMainCollection::loadFileSummaryCaseData( const std::vector<Ri
|
||||
#endif
|
||||
|
||||
RifEnsembleImportConfig importState;
|
||||
if ( extractStateFromFirstCase && !RiaPreferencesSystem::current()->useImprovedSummaryImport() )
|
||||
if ( !RiaPreferencesSummary::current()->useImprovedSummaryImport() )
|
||||
{
|
||||
extractStateFromFirstCase = false;
|
||||
}
|
||||
@@ -558,8 +558,6 @@ void RimSummaryCaseMainCollection::loadFileSummaryCaseData( const std::vector<Ri
|
||||
[[maybe_unused]] bool canUseMultipleThreads =
|
||||
( prefs->summaryDataReader() != RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON );
|
||||
|
||||
canUseMultipleThreads = canUseMultipleThreads && RiaPreferencesSystem::current()->useMultiThreadingForSummaryImport();
|
||||
|
||||
#pragma omp parallel for schedule( dynamic ) if ( canUseMultipleThreads )
|
||||
for ( int cIdx = 0; cIdx < static_cast<int>( fileSummaryCases.size() ); ++cIdx )
|
||||
{
|
||||
|
||||
@@ -12,7 +12,7 @@ set(RESINSIGHT_VERSION_TEXT "-dev")
|
||||
# Must be unique and increasing within one combination of major/minor/patch version
|
||||
# The uniqueness of this text is independent of RESINSIGHT_VERSION_TEXT
|
||||
# Format of text must be ".xx"
|
||||
set(RESINSIGHT_DEV_VERSION ".09")
|
||||
set(RESINSIGHT_DEV_VERSION ".10")
|
||||
|
||||
# https://github.com/CRAVA/crava/tree/master/libs/nrlib
|
||||
set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f")
|
||||
|
||||
Reference in new issue
Block a user