#8339 Summary Preferences : Adjust default settings

OPM · Dec 1, 2021 · 1559d72 · 1559d72
1 parent 72ee0d6
commit 1559d72
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 35 deletions.
diff --git a/ApplicationLibCode/Application/RiaPreferencesSummary.cpp b/ApplicationLibCode/Application/RiaPreferencesSummary.cpp
@@ -53,7 +53,7 @@ void RiaPreferencesSummary::SummaryReaderModeType::setUp()
     addItem( RiaPreferencesSummary::SummaryReaderMode::LIBECL, "LIBECL", "UNSMRY (libecl)" );
     addItem( RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON, "HDF5_OPM_COMMON", "h5 (HDF5)" );
     addItem( RiaPreferencesSummary::SummaryReaderMode::OPM_COMMON, "OPM_COMMON", "ESMRY (opm-common)" );
-    setDefault( RiaPreferencesSummary::SummaryReaderMode::OPM_COMMON );
+    setDefault( RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON );
 }
 } // namespace caf
 
@@ -111,8 +111,8 @@ RiaPreferencesSummary::RiaPreferencesSummary()
                        "" );
 
     CAF_PDM_InitField( &m_createEnhancedSummaryDataFile,
-                       "createEnhancedSummaryDataFile",
-                       true,
+                       "createEnhancedSummaryDataFile_v01",
+                       false,
                        "Create ESMRY Summary Files",
                        "",
                        "If not present, create summary file with extension '*.ESMRY'",
@@ -129,23 +129,14 @@ RiaPreferencesSummary::RiaPreferencesSummary()
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useEnhancedSummaryDataFile );
 
     CAF_PDM_InitField( &m_createH5SummaryDataFile,
-                       "createH5SummaryDataFile",
-                       true,
+                       "createH5SummaryDataFile_v01",
+                       false,
                        "Create h5 Summary Files",
                        "",
                        "If not present, create summary file with extension '*.h5'",
                        "" );
     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,
                        "createH5SummaryFileThreadCount",
                        1,
@@ -154,7 +145,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,
                        "showSummaryTimeAsLongString",
@@ -215,14 +206,6 @@ bool RiaPreferencesSummary::createH5SummaryDataFiles() const
     return m_createH5SummaryDataFile();
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferencesSummary::checkH5SummaryDataTimeStamp() const
-{
-    return m_checkH5FileTimeStamp;
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -341,13 +324,15 @@ void RiaPreferencesSummary::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
 
     if ( m_summaryReader == SummaryReaderMode::OPM_COMMON )
     {
-        uiOrdering.add( &m_useEnhancedSummaryDataFile );
+        if ( RiaApplication::instance()->enableDevelopmentFeatures() )
+        {
+            uiOrdering.add( &m_useEnhancedSummaryDataFile );
+        }
         uiOrdering.add( &m_createEnhancedSummaryDataFile );
     }
     else if ( m_summaryReader == SummaryReaderMode::HDF5_OPM_COMMON )
     {
         uiOrdering.add( &m_createH5SummaryDataFile );
-        uiOrdering.add( &m_checkH5FileTimeStamp );
 
         if ( RiaApplication::instance()->enableDevelopmentFeatures() )
         {

diff --git a/ApplicationLibCode/Application/RiaPreferencesSummary.h b/ApplicationLibCode/Application/RiaPreferencesSummary.h
@@ -64,7 +64,6 @@ class RiaPreferencesSummary : public caf::PdmObject
     bool              createEnhancedSummaryDataFiles() const;
 
     bool createH5SummaryDataFiles() const;
-    bool checkH5SummaryDataTimeStamp() const;
     int  createH5SummaryDataThreadCount() const;
 
     void appendRestartFileGroup( caf::PdmUiOrdering& uiOrdering ) const;
@@ -102,7 +101,6 @@ class RiaPreferencesSummary : public caf::PdmObject
     caf::PdmField<bool> m_useEnhancedSummaryDataFile;
 
     caf::PdmField<bool> m_createH5SummaryDataFile;
-    caf::PdmField<bool> m_checkH5FileTimeStamp;
     caf::PdmField<int>  m_createH5SummaryFileThreadCount;
 
     caf::PdmField<SummaryReaderModeType> m_summaryReader;

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