OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Spock

Browse Source
This commit is contained in:
Mark Berrill 2021-11-03 11:06:15 -04:00
commit db323d8e91
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -135,6 +135,7 @@ ENDIF()
IF ( NOT ONLY_BUILD_DOCS ) IF ( NOT ONLY_BUILD_DOCS )
CONFIGURE_MPI() # MPI must be before other libraries CONFIGURE_MPI() # MPI must be before other libraries
CONFIGURE_MIC() CONFIGURE_MIC()
CONFIGURE_HDF5()
CONFIGURE_NETCDF() CONFIGURE_NETCDF()
CONFIGURE_SILO() CONFIGURE_SILO()
CONFIGURE_LBPM() CONFIGURE_LBPM()

2
IO/HDF5Writer.cpp
View File

@ -274,7 +274,7 @@ std::vector<IO::MeshDatabase> writeMeshesHDF5( const std::vector<IO::MeshDataStr
std::vector<IO::MeshDatabase> writeMeshesHDF5( std::vector<IO::MeshDatabase> writeMeshesHDF5(
const std::vector<IO::MeshDataStruct> &, const std::string &, IO::FileFormat, int ); const std::vector<IO::MeshDataStruct> &, const std::string &, IO::FileFormat, int )
{ {
return std::vector<IO::MeshDatabase>(); return std::vector<IO::MeshDatabase>();
} }

4
IO/SiloWriter.cpp
View File

@ -245,7 +245,9 @@ std::vector<IO::MeshDatabase> writeMeshesSilo(
{ {
return std::vector<IO::MeshDatabase>(); return std::vector<IO::MeshDatabase>();
} }
void writeSiloSummary( const std::vector<IO::MeshDatabase> &, const std::string & ); void writeSiloSummary( const std::vector<IO::MeshDatabase> &, const std::string & )
{
}
#endif #endif

12
cmake/libraries.cmake
View File

@ -103,12 +103,12 @@ ENDMACRO()
# Macro to find and configure hdf5 # Macro to find and configure hdf5
MACRO ( CONFIGURE_HDF5 ) MACRO ( CONFIGURE_HDF5 )
CHECK_ENABLE_FLAG( USE_HDF5 0 ) CHECK_ENABLE_FLAG( USE_HDF5 0 )
IF ( USE_HDF5 ) IF ( USE_HDF5 AND NOT FOUND_HDF5 )
# Check if we specified the silo directory # Check if we specified the hdf5 directory
IF ( HDF5_DIRECTORY ) IF ( HDF5_DIRECTORY )
VERIFY_PATH ( ${HDF5_DIRECTORY} ) VERIFY_PATH ( ${HDF5_DIRECTORY} )
INCLUDE_DIRECTORIES ( ${HDF5_DIRECTORY}/include ) INCLUDE_DIRECTORIES ( ${HDF5_DIRECTORY}/include )
SET ( HDF5_INCLUDE ${HDF5_DIRECTORY}/include ) SET( HDF5_INCLUDE ${HDF5_DIRECTORY}/include )
FIND_LIBRARY ( HDF5_LIB NAMES hdf5 PATHS ${HDF5_DIRECTORY}/lib NO_DEFAULT_PATH ) FIND_LIBRARY ( HDF5_LIB NAMES hdf5 PATHS ${HDF5_DIRECTORY}/lib NO_DEFAULT_PATH )
FIND_LIBRARY ( HDF5_HL_LIB NAMES hdf5_hl PATHS ${HDF5_DIRECTORY}/lib NO_DEFAULT_PATH ) FIND_LIBRARY ( HDF5_HL_LIB NAMES hdf5_hl PATHS ${HDF5_DIRECTORY}/lib NO_DEFAULT_PATH )
ELSE() ELSE()
@ -118,6 +118,8 @@ MACRO ( CONFIGURE_HDF5 )
${HDF5_HL_LIB} ${HDF5_HL_LIB}
${HDF5_LIB} ${HDF5_LIB}
) )
SET( FOUND_HDF5 TRUE )
SET( EXTERNAL_LIBS ${HDF5_LIBS} ${EXTERNAL_LIBS} )
ADD_DEFINITIONS ( -DUSE_HDF5 ) ADD_DEFINITIONS ( -DUSE_HDF5 )
MESSAGE( "Using hdf5" ) MESSAGE( "Using hdf5" )
MESSAGE( " ${HDF5_LIB}" ) MESSAGE( " ${HDF5_LIB}" )
@ -151,7 +153,7 @@ MACRO( CONFIGURE_NETCDF )
ELSE() ELSE()
MESSAGE( FATAL_ERROR "Default search for netcdf is not yet supported. Use -D NETCDF_DIRECTORY=" ) MESSAGE( FATAL_ERROR "Default search for netcdf is not yet supported. Use -D NETCDF_DIRECTORY=" )
ENDIF() ENDIF()
SET( EXTERNAL_LIBS ${NETCDF_LIBS} ${HDF5_LIBS} ${EXTERNAL_LIBS} ) SET( EXTERNAL_LIBS ${NETCDF_LIBS} ${EXTERNAL_LIBS} )
ADD_DEFINITIONS ( -DUSE_NETCDF ) ADD_DEFINITIONS ( -DUSE_NETCDF )
MESSAGE( "Using netcdf" ) MESSAGE( "Using netcdf" )
MESSAGE( " ${NETCDF_LIBS}" ) MESSAGE( " ${NETCDF_LIBS}" )
@ -179,7 +181,7 @@ MACRO ( CONFIGURE_SILO )
SET ( SILO_LIBS SET ( SILO_LIBS
${SILO_LIB} ${SILO_LIB}
) )
SET( EXTERNAL_LIBS ${SILO_LIBS} ${HDF5_LIBS} ${EXTERNAL_LIBS} ) SET( EXTERNAL_LIBS ${SILO_LIBS} ${EXTERNAL_LIBS} )
ADD_DEFINITIONS ( -DUSE_SILO ) ADD_DEFINITIONS ( -DUSE_SILO )
MESSAGE( "Using silo" ) MESSAGE( "Using silo" )
MESSAGE( " ${SILO_LIB}" ) MESSAGE( " ${SILO_LIB}" )