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

Merge remote-tracking branch 'origin/main' into dev

Browse Source
This commit is contained in:
Magne Sjaastad 2021-12-01 16:29:57 +01:00
commit 0a8b52051d
4 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ApplicationLibCode/Application/RiaPreferencesSummary.cpp
View File

@ -53,7 +53,7 @@ void RiaPreferencesSummary::SummaryReaderModeType::setUp()
addItem( RiaPreferencesSummary::SummaryReaderMode::LIBECL, "LIBECL", "UNSMRY (libecl)" ); addItem( RiaPreferencesSummary::SummaryReaderMode::LIBECL, "LIBECL", "UNSMRY (libecl)" );
addItem( RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON, "HDF5_OPM_COMMON", "h5 (HDF5)" ); addItem( RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON, "HDF5_OPM_COMMON", "h5 (HDF5)" );
addItem( RiaPreferencesSummary::SummaryReaderMode::OPM_COMMON, "OPM_COMMON", "ESMRY (opm-common)" ); addItem( RiaPreferencesSummary::SummaryReaderMode::OPM_COMMON, "OPM_COMMON", "ESMRY (opm-common)" );
setDefault( RiaPreferencesSummary::SummaryReaderMode::OPM_COMMON ); setDefault( RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON );
} }
} // namespace caf } // namespace caf
@ -108,8 +108,8 @@ RiaPreferencesSummary::RiaPreferencesSummary()
"" ); "" );
CAF_PDM_InitField( &m_createEnhancedSummaryDataFile, CAF_PDM_InitField( &m_createEnhancedSummaryDataFile,
"createEnhancedSummaryDataFile", "createEnhancedSummaryDataFile_v01",
true, false,
"Create ESMRY Summary Files", "Create ESMRY Summary Files",
"", "",
"If not present, create summary file with extension '*.ESMRY'", "If not present, create summary file with extension '*.ESMRY'",
@ -126,23 +126,14 @@ RiaPreferencesSummary::RiaPreferencesSummary()
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useEnhancedSummaryDataFile ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useEnhancedSummaryDataFile );
CAF_PDM_InitField( &m_createH5SummaryDataFile, CAF_PDM_InitField( &m_createH5SummaryDataFile,
"createH5SummaryDataFile", "createH5SummaryDataFile_v01",
true, false,
"Create h5 Summary Files", "Create h5 Summary Files",
"", "",
"If not present, create summary file with extension '*.h5'", "If not present, create summary file with extension '*.h5'",
"" ); "" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_createH5SummaryDataFile ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_createH5SummaryDataFile );
CAF_PDM_InitField( &m_checkH5FileTimeStamp,
"checkH5FileTimeStamp",
true,
"Check File Timestamp",
"",
"Compare timestamp of h5 and SMSPEC, and recreate h5 when required",
"" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_checkH5FileTimeStamp );
CAF_PDM_InitField( &m_createH5SummaryFileThreadCount, CAF_PDM_InitField( &m_createH5SummaryFileThreadCount,
"createH5SummaryFileThreadCount", "createH5SummaryFileThreadCount",
1, 1,
@ -151,7 +142,7 @@ RiaPreferencesSummary::RiaPreferencesSummary()
"", "",
"" ); "" );
CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType", "File Format" ); CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType_v01", "File Format");
CAF_PDM_InitField( &m_showSummaryTimeAsLongString, CAF_PDM_InitField( &m_showSummaryTimeAsLongString,
"showSummaryTimeAsLongString", "showSummaryTimeAsLongString",
@ -212,14 +203,6 @@ bool RiaPreferencesSummary::createH5SummaryDataFiles() const
return m_createH5SummaryDataFile(); return m_createH5SummaryDataFile();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferencesSummary::checkH5SummaryDataTimeStamp() const
{
return m_checkH5FileTimeStamp;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -338,13 +321,15 @@ void RiaPreferencesSummary::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
if ( m_summaryReader == SummaryReaderMode::OPM_COMMON ) if ( m_summaryReader == SummaryReaderMode::OPM_COMMON )
{ {
uiOrdering.add( &m_useEnhancedSummaryDataFile ); if ( RiaApplication::instance()->enableDevelopmentFeatures() )
{
uiOrdering.add( &m_useEnhancedSummaryDataFile );
}
uiOrdering.add( &m_createEnhancedSummaryDataFile ); uiOrdering.add( &m_createEnhancedSummaryDataFile );
} }
else if ( m_summaryReader == SummaryReaderMode::HDF5_OPM_COMMON ) else if ( m_summaryReader == SummaryReaderMode::HDF5_OPM_COMMON )
{ {
uiOrdering.add( &m_createH5SummaryDataFile ); uiOrdering.add( &m_createH5SummaryDataFile );
uiOrdering.add( &m_checkH5FileTimeStamp );
if ( RiaApplication::instance()->enableDevelopmentFeatures() ) if ( RiaApplication::instance()->enableDevelopmentFeatures() )
{ {

2
ApplicationLibCode/Application/RiaPreferencesSummary.h
View File

@ -64,7 +64,6 @@ public:
bool createEnhancedSummaryDataFiles() const; bool createEnhancedSummaryDataFiles() const;
bool createH5SummaryDataFiles() const; bool createH5SummaryDataFiles() const;
bool checkH5SummaryDataTimeStamp() const;
int createH5SummaryDataThreadCount() const; int createH5SummaryDataThreadCount() const;
void appendRestartFileGroup( caf::PdmUiOrdering& uiOrdering ) const; void appendRestartFileGroup( caf::PdmUiOrdering& uiOrdering ) const;
@ -102,7 +101,6 @@ private:
caf::PdmField<bool> m_useEnhancedSummaryDataFile; caf::PdmField<bool> m_useEnhancedSummaryDataFile;
caf::PdmField<bool> m_createH5SummaryDataFile; caf::PdmField<bool> m_createH5SummaryDataFile;
caf::PdmField<bool> m_checkH5FileTimeStamp;
caf::PdmField<int> m_createH5SummaryFileThreadCount; caf::PdmField<int> m_createH5SummaryFileThreadCount;
caf::PdmField<SummaryReaderModeType> m_summaryReader; caf::PdmField<SummaryReaderModeType> m_summaryReader;

14
ApplicationLibCode/FileInterface/RifHdf5SummaryExporter.cpp
View File

@ -89,15 +89,13 @@ bool RifHdf5SummaryExporter::ensureHdf5FileIsCreated( const std::string& smspecF
{ {
bool h5FileExists = Opm::filesystem::exists( h5FileName ); bool h5FileExists = Opm::filesystem::exists( h5FileName );
if ( !h5FileExists ) exportIsRequired = true; if ( !h5FileExists )
RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
if ( prefs->checkH5SummaryDataTimeStamp() && h5FileExists )
{ {
if ( RifHdf5SummaryExporter::isFirstOlderThanSecond( h5FileName, smspecFileName ) ) exportIsRequired = true;
{ }
exportIsRequired = true; else if ( RifHdf5SummaryExporter::isFirstOlderThanSecond( h5FileName, smspecFileName ) )
} {
exportIsRequired = true;
} }
} }

2
ResInsightVersion.cmake
View File

@ -1,7 +1,7 @@
set(RESINSIGHT_MAJOR_VERSION 2021) set(RESINSIGHT_MAJOR_VERSION 2021)
set(RESINSIGHT_MINOR_VERSION 10) set(RESINSIGHT_MINOR_VERSION 10)
set(RESINSIGHT_PATCH_VERSION 1) set(RESINSIGHT_PATCH_VERSION 2)
# Opional text with no restrictions # Opional text with no restrictions
set(RESINSIGHT_VERSION_TEXT "-dev") set(RESINSIGHT_VERSION_TEXT "-dev")