From: Timo Heister Date: Mon, 25 Apr 2016 13:07:17 +0000 (+0100) Subject: Revert "update PETSc" X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bc8be87e6fe240c625915cdccd98bd073296e8d;p=candi.git Revert "update PETSc" This reverts commit c622ef17d654a3c6ad039f1565930105c7a620c0. --- diff --git a/deal.II-toolchain/packages/petsc.package b/deal.II-toolchain/packages/petsc.package index e37c706..223a466 100644 --- a/deal.II-toolchain/packages/petsc.package +++ b/deal.II-toolchain/packages/petsc.package @@ -1,14 +1,14 @@ -VERSION=3.6.4 -CHECKSUM=e7a5253621253eef8f5a19ddc03dd0d4 +VERSION=3.6.3 -NAME=petsc-lite-${VERSION} +NAME=petsc-${VERSION} SOURCE=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/ PACKING=.tar.gz -EXTRACTSTO=petsc-${VERSION} +CHECKSUM=91dd3522de5a5ef039ff8f50800db606 + BUILDCHAIN=custom -INSTALL_PATH=${INSTALL_PATH}/${EXTRACTSTO} +INSTALL_PATH=${INSTALL_PATH}/${NAME} ######################################################################### @@ -17,10 +17,9 @@ CONFOPTS=" --with-shared-libraries=1 --with-mpi=1 --with-x=0 - --with-64-bit-indices=0 " -for external_pkg in scalapack mumps hypre; do +for external_pkg in hypre; do CONFOPTS="${CONFOPTS} --download-${external_pkg}=1" done @@ -50,19 +49,6 @@ if [ ! -z "${MKL_DIR}" ]; then CONFOPTS="${CONFOPTS} --with-blas-lapack-dir=${MKL_DIR}" fi -# Add ParMETIS, if present -if [ ! -z "${PARMETIS_DIR}" ]; then - cecho ${INFO} "PETSc: configuration with ParMETIS" - CONFOPTS="\ - ${CONFOPTS} \ - --with-parmetis-dir=${PARMETIS_DIR} \ - --with-metis-dir=${PARMETIS_DIR}" - - for external_pkg in scalapack mumps; do - CONFOPTS="${CONFOPTS} --download-${external_pkg}=1" - done -fi - ######################################################################### package_specific_setup () { @@ -82,7 +68,7 @@ package_specific_register () { package_specific_conf () { # Generate configuration file - CONFIG_FILE=${CONFIGURATION_PATH}/${EXTRACTSTO} + CONFIG_FILE=${CONFIGURATION_PATH}/${NAME} rm -f $CONFIG_FILE echo " export PETSC_DIR=${INSTALL_PATH}