src/parallel/decompose: Add option to specify system installation directories

etc/config.csh/unset

@@ -126,12 +126,22 @@ unsetenv OPAL_PREFIX
 unsetenv ENSIGHT9_READER
 unsetenv SCOTCH_TYPE
 unsetenv SCOTCH_VERSION
+unsetenv SCOTCH_INCLUDE_DIR
+unsetenv SCOTCH_LIB_DIR
+unsetenv PTSCOTCH_INCLUDE_DIR
+unsetenv PTSCOTCH_LIB_DIR
 unsetenv METIS_TYPE
 unsetenv METIS_VERSION
+unsetenv METIS_INCLUDE_DIR
+unsetenv METIS_LIB_DIR
 unsetenv PARMETIS_TYPE
 unsetenv PARMETIS_VERSION
+unsetenv PARMETIS_INCLUDE_DIR
+unsetenv PARMETIS_LIB_DIR
 unsetenv ZOLTAN_TYPE
 unsetenv ZOLTAN_VERSION
+unsetenv ZOLTAN_INCLUDE_DIR
+unsetenv ZOLTAN_LIB_DIR
 unsetenv ParaView_TYPE
 unsetenv ParaView_DIR
 unsetenv ParaView_INCLUDE_DIR

etc/config.sh/unset

@@ -122,12 +122,22 @@ fi
 unset ENSIGHT9_READER
 unset SCOTCH_TYPE
 unset SCOTCH_VERSION
+unset SCOTCH_INCLUDE_DIR
+unset SCOTCH_LIB_DIR
+unset PTSCOTCH_INCLUDE_DIR
+unset PTSCOTCH_LIB_DIR
 unset METIS_TYPE
 unset METIS_VERSION
+unset METIS_INCLUDE_DIR
+unset METIS_LIB_DIR
 unset PARMETIS_TYPE
 unset PARMETIS_VERSION
+unset PARMETIS_INCLUDE_DIR
+unset PARMETIS_LIB_DIR
 unset ZOLTAN_TYPE
 unset ZOLTAN_VERSION
+unset ZOLTAN_INCLUDE_DIR
+unset ZOLTAN_LIB_DIR
 unset ParaView_TYPE
 unset ParaView_DIR
 unset ParaView_INCLUDE_DIR

src/parallel/decompose/metis/Make/options

@@ -1,6 +1,9 @@
 EXE_INC = \
     -I$(METIS_ARCH_PATH)/include \
+    $(if $(METIS_INCLUDE_DIR),-I$(METIS_INCLUDE_DIR)) \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(METIS_ARCH_PATH)/lib -lmetis
+    -L$(METIS_ARCH_PATH)/lib \
+    $(if $(METIS_LIB_DIR),-L$(METIS_LIB_DIR)) \
+    -lmetis

src/parallel/decompose/parMetis/Make/options

@@ -4,7 +4,11 @@ EXE_INC = \
     $(PFLAGS) $(PINC) \
     -I$(FOAM_SRC)/Pstream/mpi/lnInclude \
     -I$(PARMETIS_ARCH_PATH)/include \
+    $(if $(PARMETIS_INCLUDE_DIR),-I$(PARMETIS_INCLUDE_DIR)) \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS =  \
-    -L$(PARMETIS_ARCH_PATH)/lib -lparmetis
+    -L$(PARMETIS_ARCH_PATH)/lib \
+    $(if $(PARMETIS_LIB_DIR),-L$(PARMETIS_LIB_DIR)) \
+    -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \
+    -lparmetis

src/parallel/decompose/ptscotch/Make/options

@@ -1,3 +1,6 @@
+# Note including of mplib compilation rules.
+# This is purely to avoid pscotch.h including mpicxx.h, which causes problems.
+
 -include $(GENERAL_RULES)/mplibType
 
 EXE_INC = \
@@ -5,11 +8,12 @@ EXE_INC = \
     -I$(FOAM_SRC)/Pstream/mpi/lnInclude \
     -I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \
     -I$(SCOTCH_ARCH_PATH)/include \
-    -I/usr/include/scotch \
+    -I$(or $(PTSCOTCH_INCLUDE_DIR),/usr/include/scotch) \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
     -L$(SCOTCH_ARCH_PATH)/lib \
+    $(if $(PTSCOTCH_LIB_DIR),-L$(PTSCOTCH_LIB_DIR)) \
     -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \
     -lptscotch \
     -lptscotcherrexit \

src/parallel/decompose/scotch/Make/options

@@ -6,11 +6,12 @@
 EXE_INC = \
     $(PFLAGS) $(PINC) \
     -I$(SCOTCH_ARCH_PATH)/include \
-    -I/usr/include/scotch \
+    -I$(or $(SCOTCH_INCLUDE_DIR),/usr/include/scotch) \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
     -L$(SCOTCH_ARCH_PATH)/lib \
+    $(if $(SCOTCH_LIB_DIR),-L$(SCOTCH_LIB_DIR)) \
     -L$(FOAM_EXT_LIBBIN) \
     -lscotch \
     -lscotcherrexit \

src/parallel/decompose/zoltan/Make/options

@@ -4,7 +4,11 @@ EXE_INC = \
     $(PFLAGS) $(PINC) \
     -I$(FOAM_SRC)/Pstream/mpi/lnInclude \
     -I$(ZOLTAN_ARCH_PATH)/include \
+    $(if $(ZOLTAN_INCLUDE_DIR),-I$(ZOLTAN_INCLUDE_DIR)) \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(ZOLTAN_ARCH_PATH)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lzoltan
+    -L$(ZOLTAN_ARCH_PATH)/lib \
+    $(if $(ZOLTAN_LIB_DIR),-L$(ZOLTAN_LIB_DIR)) \
+    -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \
+    -lzoltan