Commit 5a5a08f0 authored by Mark Olesen's avatar Mark Olesen
Browse files

COMP: handle kahip .so version, and openmp dependency

parent b34fdcec
......@@ -6,5 +6,6 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude
EXE_LIBS = \
-ldecompose \
-ldecompositionMethods \
-lregionModels
......@@ -42,7 +42,7 @@
# An Int64 OpenFOAM version can use it, but the mesh size is limited
# 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
#
#------------------------------------------------------------------------------
......@@ -53,7 +53,7 @@ export KAHIP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$KAHIP
# Adjust as required
# export KAHIP_COMP_FLAGS="-fopenmp"
# export KAHIP_LINK_FLAGS="-lgomp"
export KAHIP_LINK_FLAGS="-lgomp"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
......@@ -58,8 +58,11 @@ hasKahip()
# Library
[ "${KAHIP_ARCH_PATH##*-}" = system ] || \
findFirstFile \
$FOAM_EXT_LIBBIN/libkahip.so \
$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.so \
> /dev/null || {
echo "$warning (missing library)"
return 2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment