From: Uwe Köcher Date: Tue, 10 Nov 2015 20:57:10 +0000 (+0100) Subject: deal.II: removed special variables for superlu and parmetis X-Git-Tag: v0.8.1~6 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bad7ed7b69adf4350d88408586566037848b24a;p=candi.git deal.II: removed special variables for superlu and parmetis --- diff --git a/deal.II-toolchain/packages/dealii-prepare.package b/deal.II-toolchain/packages/dealii-prepare.package index 89c3285..30e13f5 100644 --- a/deal.II-toolchain/packages/dealii-prepare.package +++ b/deal.II-toolchain/packages/dealii-prepare.package @@ -19,14 +19,6 @@ unset PACKAGE_NAME if [[ ${PACKAGES_OFF} =~ 'METIS' ]]; then PACKAGES_OFF=${PACKAGES_OFF}' PARMETIS'; PACKAGES_OFF=${PACKAGES_OFF}' SUPERLU_DIST'; - ParMETIS=OFF - SuperLUDist=OFF -fi - -# Turn on SuperLUDist and ParMETIS, if nothing else is specified so far. -if [ -z "${SuperLUDist}" ]; then - ParMETIS=ON - SuperLUDist=ON fi # Transform upper case to lower case. diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package index 027874f..701e3e7 100644 --- a/deal.II-toolchain/packages/trilinos.package +++ b/deal.II-toolchain/packages/trilinos.package @@ -19,7 +19,8 @@ elif [ ${TRILINOS_MAJOR_VERSION} = "11" ]; then #Note: This issue is resolved by setting # -D HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG # for Trilinos v12; this is neglegted by Trilinos v11 since it is unknown. - SuperLUDist=OFF + cecho ${BAD} "trilinos: warning: forcing unset SUPERLU_DIR (not supported)" + unset SUPERLU_DIR else cecho ${BAD} "Unknown Trilinos version ${TRILINOS_MAJOR_VERSION} forced, please use AUTO|12|11." @@ -98,7 +99,7 @@ CONFOPTS="${CONFOPTS} \ -D Trilinos_EXTRA_LINK_FLAGS:STRING=-lgfortran" # Add ParMETIS, if present -if [ ! -z "${PARMETIS_DIR}" ] && [ ! -z "${ParMETIS}" ]; then +if [ ! -z "${PARMETIS_DIR}" ]; then cecho ${INFO} "trilinos: configuration with ParMETIS" CONFOPTS="\ ${CONFOPTS} \ @@ -108,7 +109,7 @@ if [ ! -z "${PARMETIS_DIR}" ] && [ ! -z "${ParMETIS}" ]; then fi # Add SuperLU_dist, if present -if [ ! -z "${SUPERLU_DIR}" ] && [ ! -z "${SuperLUDist}" ]; then +if [ ! -z "${SUPERLU_DIR}" ]; then cecho ${INFO} "trilinos: configuration with SuperLU_dist" CONFOPTS="\ ${CONFOPTS} \