deal.II: Trilinos: updated to current stable version 12.0.1

- patched the Amesos interface to SuperLU_Dist
- disabled Amesos2 package due to problems with SuperLU_Dist
- enabled MueLu by default for deal.II v8.3.0 and above

diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index e6748c467191eb11ca63e466c113af944e2b22bf..189c40c097f22ffa9bbe21fbf3035850728675fc 100644 (file)
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -1,10 +1,8 @@
-VERSION=11.12.1
+VERSION=12.0.1
 NAME=trilinos-${VERSION}-Source
 SOURCE=http://trilinos.org/oldsite/download/files/
 PACKING=.tar.gz
-CHECKSUM=26a07a4fe43e49a8208953dea5ab2652
-# 11.8.1  CHECKSUM=3c9465b6d63d824e9dc0365ca73c3370
-# 11.10.2 CHECKSUM=37bbbb30756e9cb2d35c092954d2f1eb
+CHECKSUM=bd99741d047471e127b8296b2ec08017
 BUILDCHAIN=cmake
 
 CONFOPTS="${TRILINOS_CONFOPTS} \
@@ -14,7 +12,8 @@ CONFOPTS="${TRILINOS_CONFOPTS} \
           -D Trilinos_ENABLE_Sacado:BOOL=ON \
           -D Trilinos_ENABLE_Stratimikos:BOOL=ON \
           -D Trilinos_ENABLE_Belos:BOOL=ON \
-          -D Trilinos_ENABLE_MueLu:BOOL=OFF \
+          -D Trilinos_ENABLE_MueLu:BOOL=ON \
+          -D Trilinos_ENABLE_Amesos2:BOOL=OFF \
           -D TPL_ENABLE_ParMETIS:BOOL=${ParMETIS} \
           -D TPL_ParMETIS_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libparmetis.so \
           -D TPL_ENABLE_SuperLUDist:BOOL=${SuperLUDist} \

diff --git a/deal.II/patches/Amesos_Superludist.cpp.patch b/deal.II/patches/Amesos_Superludist.cpp.patch
index 768094505a77dc858a289cb8ff72b7f7ae94626c..cd27da7abc50b8fdb8a967bf655031a590ffff91 100644 (file)
--- a/deal.II/patches/Amesos_Superludist.cpp.patch
+++ b/deal.II/patches/Amesos_Superludist.cpp.patch
@@ -1,7 +1,2 @@
-476,477c476,477
-<     else if( IterRefine_ == "DOUBLE" ) PrivateSuperluData_->options_.IterRefine = DOUBLE;
-<     else if( IterRefine_ == "EXTRA" ) PrivateSuperluData_->options_.IterRefine = EXTRA;
----
->     else if( IterRefine_ == "DOUBLE" ) PrivateSuperluData_->options_.IterRefine = SLU_DOUBLE;
->     else if( IterRefine_ == "EXTRA" ) PrivateSuperluData_->options_.IterRefine = SLU_EXTRA;
-
+444a445
+> #define HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG