#4035 System : Remove term souring from cmake and UI

Use general term HDF5 when required

ApplicationCode/CMakeLists.txt

@@ -274,11 +274,6 @@ if (RESINSIGHT_FOUND_HDF5)
     endif() # MSVC
 
     source_group( "FileInterface" FILES FileInterface/RifHdf5Reader.h FileInterface/RifHdf5Reader.cpp )
-
-endif()
-
-if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
-    add_definitions(-DENABLE_SOURING)
 endif()
 
 #############################################################################
@@ -840,10 +835,6 @@ if(NOT ${OCTAVE_VERSION_STRING} EQUAL "")
     set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_oct-${OCTAVE_VERSION_STRING}")
 endif()
 
-if(RESINSIGHT_FOUND_HDF5)
-    set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_souring")
-endif()
-
 if(RESINSIGHT_BUNDLE_OPENSSL AND OPENSSL_FOUND)
     set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_openssl")
 endif()

ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp

@@ -76,7 +76,7 @@ void RicHelpAboutFeature::onActionTriggered( bool isChecked )
     activeFeatures += "  Geomech";
 #endif
 #ifdef USE_HDF5
-    activeFeatures += "  Souring";
+    activeFeatures += "  HDF5";
 #endif
 
     if ( !activeFeatures.isEmpty() )

ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -647,7 +647,7 @@ QList<caf::PdmOptionItemInfo>
 
         bool enableSouring = false;
 
-#ifdef ENABLE_SOURING
+#ifdef USE_HDF5
         if ( m_eclipseCase.notNull() )
         {
             RigCaseCellResultsData* cellResultsData = m_eclipseCase->results( this->porosityModel() );
@@ -657,7 +657,7 @@ QList<caf::PdmOptionItemInfo>
                 enableSouring = true;
             }
         }
-#endif /* ENABLE_SOURING */
+#endif /* USE_HDF5 */
 
         RimGridTimeHistoryCurve* timeHistoryCurve;
         this->firstAncestorOrThisOfType( timeHistoryCurve );

ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp

@@ -1189,10 +1189,10 @@ public:
         resTypeNames.push_back( "Generated" );
         resTypes.push_back( RiaDefines::ResultCatType::INPUT_PROPERTY );
         resTypeNames.push_back( "Input" );
-#ifdef ENABLE_SOURING
+#ifdef USE_HDF5
         resTypes.push_back( RiaDefines::ResultCatType::INJECTION_FLOODING );
         resTypeNames.push_back( "Injection Flooding" );
-#endif /* ENABLE_SOURING */
+#endif /* USE_HDF5 */
 
         for ( size_t rtIdx = 0; rtIdx < resTypes.size(); ++rtIdx )
         {

CMakeLists.txt

@@ -186,11 +186,7 @@ if(MSVC)
     set(RESINSIGHT_HDF5_DIR "" CACHE PATH "Windows Only: Optional path to HDF5 libraries on Windows")
 endif()
 
-option (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING "Enable prototype feature Souring (requires third party library HDF5)" ON)
-mark_as_advanced(FORCE RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING) 
-
-if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
-    if(MSVC)
+if(MSVC)
     if(NOT ${RESINSIGHT_HDF5_DIR} EQUAL "")
 	    list(APPEND EXTERNAL_LINK_LIBRARIES
             ${RESINSIGHT_HDF5_DIR}/lib/hdf5.lib
@@ -202,7 +198,7 @@ if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
     else()
 	    message( WARNING "Use of HDF5 is enabled, but RESINSIGHT_HDF5_DIR is empty. Specify RESINSIGHT_HDF5_DIR to be able to use HDF5" )
     endif()
-    else()
+else()
     find_package(HDF5 COMPONENTS CXX)
     if (HDF5_FOUND)
 		list(APPEND EXTERNAL_LINK_LIBRARIES
@@ -221,8 +217,7 @@ if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
     else()
         message( WARNING "Use of HDF5 is enabled, but no HDF5 is found." )
     endif() # HDF5_FOUND
-    endif() # MSVC
-endif() # RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING
+endif() # MSVC
 
 
 ################################################################################