From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Thu, 29 Oct 2015 10:40:29 +0000 (+0100)
Subject: deal.II: ParMETIS, SuperLU_Dist + Trilinos: fixes some small errors.
X-Git-Tag: v0.7~6^2~4
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0566110f5cfdf8be6339923c5b740cefeef569e;p=candi.git

deal.II: ParMETIS, SuperLU_Dist + Trilinos: fixes some small errors.
---

diff --git a/deal.II/packages/dealii-prepare.package b/deal.II/packages/dealii-prepare.package
index 8af6ce6..7a64083 100644
--- a/deal.II/packages/dealii-prepare.package
+++ b/deal.II/packages/dealii-prepare.package
@@ -5,24 +5,27 @@ BUILDCHAIN=ignore
 ### DO NOT MODIFY THE CODE BELOW ###
 ####################################
 
+ParMETIS=ON
+SuperLUDist=ON
+
 #########################################################################
 # Loop over the options in DEAL_CONFOPTS and if the package is turned off, add
 # it to the PACKAGES_OFF list.
 for PACKAGE in ${DEAL_CONFOPTS[@]}; do
-  case ${PACKAGE} in
-      *DEAL_II_WITH*:BOOL=OFF)
-      PACKAGE_NAME=${PACKAGE##*WITH_};
-      PACKAGE_NAME=${PACKAGE_NAME%%:BOOL*};
-      PACKAGES_OFF=${PACKAGE_NAME}' '${PACKAGES_OFF};;
-  esac
+    case ${PACKAGE} in
+        *DEAL_II_WITH*:BOOL=OFF)
+        PACKAGE_NAME=${PACKAGE##*WITH_};
+        PACKAGE_NAME=${PACKAGE_NAME%%:BOOL*};
+        PACKAGES_OFF=${PACKAGE_NAME}' '${PACKAGES_OFF};;
+    esac
 done
 
 # Turn off ParMETIS and SuperLU_dist if metis is off.
 if [[ ${PACKAGES_OFF} =~ 'METIS' ]]; then
-  PACKAGES_OFF=${PACKAGES_OFF}' PARMETIS';
-  PACKAGES_OFF=${PACKAGES_OFF}' SUPERLU_DIST';
-  ParMetis=OFF
-  SuperLUDist=OFF
+    PACKAGES_OFF=${PACKAGES_OFF}' PARMETIS';
+    PACKAGES_OFF=${PACKAGES_OFF}' SUPERLU_DIST';
+    ParMETIS=OFF
+    SuperLUDist=OFF
 fi
 
 # Transform upper case to lower case.
diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index 2e8ac0d..2cae467 100644
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -78,6 +78,24 @@ CONFOPTS="${CONFOPTS} \
           -D CMAKE_FORTRAN_FLAGS:STRING=-g -O5 \
           -D Trilinos_EXTRA_LINK_FLAGS:STRING=-lgfortran"
 
+# Add ParMETIS, if present
+if [ ! -z "${ParMETIS}" ] && [ ${ParMETIS} = "ON" ]; then
+    CONFOPTS="\
+        ${CONFOPTS} \
+        -D TPL_ENABLE_ParMETIS:BOOL=${ParMETIS} \
+        -D TPL_ParMETIS_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libparmetis.so"
+fi
+
+# Add SuperLU_dist, if present
+if [ ! -z "${SuperLUDist}" ] && [ ${SuperLUDist} = "ON" ]; then
+    CONFOPTS="\
+        ${CONFOPTS} \
+          -D TPL_ENABLE_SuperLUDist:BOOL=${SuperLUDist} \
+          -D TPL_SuperLUDist_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libsuperlu_dist.so \
+          -D SuperLUDist_INCLUDE_DIRS:PATH=${INSTALL_PATH}/include/superlu \
+          -D HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG:BOOL=ON"
+fi
+
 #########################################################################
 # General Trilinos configuration
 
@@ -92,12 +110,6 @@ CONFOPTS="${TRILINOS_CONFOPTS} \
           -D Trilinos_ENABLE_Belos:BOOL=ON \
           -D Trilinos_ENABLE_MueLu:BOOL=ON \
           -D Trilinos_ENABLE_Amesos2:BOOL=ON \
-          -D TPL_ENABLE_ParMETIS:BOOL=${ParMETIS} \
-          -D TPL_ParMETIS_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libparmetis.so \
-          -D TPL_ENABLE_SuperLUDist:BOOL=${SuperLUDist} \
-          -D TPL_SuperLUDist_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libsuperlu_dist.so \
-          -D SuperLUDist_INCLUDE_DIRS:PATH=${INSTALL_PATH}/include/superlu \
-          -D HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG:BOOL=ON \
           -D CMAKE_BUILD_TYPE:STRING=RELEASE \
           -D CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE \
           -D Trilinos_VERBOSE_CONFIGURE:BOOL=FALSE \