zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: handle kahip .so version, and openmp dependency

Browse Source
This commit is contained in:
Mark Olesen
2017-10-11 18:41:28 +02:00
parent c60627686a
commit 5f98600b53
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/test/checkDecomposePar/Make/options
View File

@ -6,5 +6,6 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude -I$(LIB_SRC)/regionModels/regionModel/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ldecompose \
-ldecompositionMethods \ -ldecompositionMethods \
-lregionModels -lregionModels

4
etc/config.sh/kahip
View File

@ -42,7 +42,7 @@
# An Int64 OpenFOAM version can use it, but the mesh size is limited # An Int64 OpenFOAM version can use it, but the mesh size is limited
# accordingly. # accordingly.
# #
# If KaHIP was compiled with openmp, you may need to add in additional # If KaHIP was compiled with openmp, you may need additional
# compile or link flags in KAHIP_COMP_FLAGS KAHIP_LINK_FLAGS # compile or link flags in KAHIP_COMP_FLAGS KAHIP_LINK_FLAGS
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -53,7 +53,7 @@ export KAHIP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$KAHIP
# Adjust as required # Adjust as required
# export KAHIP_COMP_FLAGS="-fopenmp" # export KAHIP_COMP_FLAGS="-fopenmp"
# export KAHIP_LINK_FLAGS="-lgomp" export KAHIP_LINK_FLAGS="-lgomp"
# END OF (NORMAL) USER EDITABLE PART # END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

3
src/parallel/decompose/Allwmake
View File

@ -58,8 +58,11 @@ hasKahip()
# Library # Library
[ "${KAHIP_ARCH_PATH##*-}" = system ] || \ [ "${KAHIP_ARCH_PATH##*-}" = system ] || \
findFirstFile \ findFirstFile \
$FOAM_EXT_LIBBIN/libkahip.so \
$KAHIP_ARCH_PATH/lib/libkahip.a \ $KAHIP_ARCH_PATH/lib/libkahip.a \
$KAHIP_ARCH_PATH/lib/libkahip.so \
$KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libkahip.a \ $KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libkahip.a \
$KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libkahip.so \
> /dev/null || { > /dev/null || {
echo "$warning (missing library)" echo "$warning (missing library)"
return 2 return 2