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

#4035 System : Remove term souring from cmake and UI

Browse Source 
Use general term HDF5 when required
This commit is contained in:
Magne Sjaastad
2020-04-24 09:00:42 +02:00
parent 72fefb4db5
commit 616af75df3
5 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/CMakeLists.txt
View File

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

2
ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp
View File

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

4
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

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

4
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

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

5
CMakeLists.txt
View File

@@ -186,10 +186,6 @@ if(MSVC)
set(RESINSIGHT_HDF5_DIR "" CACHE PATH "Windows Only: Optional path to HDF5 libraries on Windows") set(RESINSIGHT_HDF5_DIR "" CACHE PATH "Windows Only: Optional path to HDF5 libraries on Windows")
endif() 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 "") if(NOT ${RESINSIGHT_HDF5_DIR} EQUAL "")
list(APPEND EXTERNAL_LINK_LIBRARIES list(APPEND EXTERNAL_LINK_LIBRARIES
@@ -222,7 +218,6 @@ if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
message( WARNING "Use of HDF5 is enabled, but no HDF5 is found." ) message( WARNING "Use of HDF5 is enabled, but no HDF5 is found." )
endif() # HDF5_FOUND endif() # HDF5_FOUND
endif() # MSVC endif() # MSVC
endif() # RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING
################################################################################ ################################################################################