From: Timo Heister <timo.heister@gmail.com>
Date: Fri, 20 Dec 2019 21:41:46 +0000 (-0500)
Subject: update trilinos version
X-Git-Tag: v9.2.0-r1~9^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5365a67888a86ee31eccd6fd4b8cea9506af8ad;p=candi.git

update trilinos version
---

diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
index e1a716f..5e07f88 100644
--- a/deal.II-toolchain/packages/trilinos.package
+++ b/deal.II-toolchain/packages/trilinos.package
@@ -16,8 +16,11 @@ if [ ${TRILINOS_MAJOR_VERSION} = "DEV" ];then
     PACKING=git
     SOURCE=https://github.com/trilinos/
 elif [ ${TRILINOS_MAJOR_VERSION} = "12" ]; then
-    VERSION=12-14-1
-    CHECKSUM=de912cca43c2ca3b74aa08528ac39dbd
+    VERSION=12-18-1
+    CHECKSUM=9c1d151169949bca6cf203831e4d6aee
+
+    #VERSION=12-14-1
+    #CHECKSUM=de912cca43c2ca3b74aa08528ac39dbd
 
     #VERSION=12-12-1
     #CHECKSUM=ecd4606fa332212433c98bf950a69cc7
@@ -87,7 +90,7 @@ if [ ! -z "${LAPACK_DIR}" ]; then
 fi
 
 # Set intel MKL options
-if [ ${MKL} = "ON" ]; then
+if [ "${MKL}" = "ON" ]; then
     cecho ${INFO} "trilinos: configuration with MKL"
     if [ -z "${BLAS_DIR}" ] && [ -z "${LAPACK_DIR}" ]; then
         cecho ${INFO} "trilinos: configuration with BLAS_DIR=${MKL_DIR}"