From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Thu, 29 Oct 2015 19:05:03 +0000 (+0100)
Subject: deal.II: apply Trilinos 11 Amesos/SuperLU patch
X-Git-Tag: v0.7~6^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d84dff25c0a82f876c8144c0dbec855bb5d4839;p=candi.git

deal.II: apply Trilinos 11 Amesos/SuperLU patch
---

diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index 2cae467..f20d5ef 100644
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -115,6 +115,15 @@ CONFOPTS="${TRILINOS_CONFOPTS} \
           -D Trilinos_VERBOSE_CONFIGURE:BOOL=FALSE \
           -D BUILD_SHARED_LIBS:BOOL=ON"
 
+package_specific_setup() {
+    # Apply Amesos patch for Trilinos v11
+    if [ ${TRILINOS_MAJOR_VERSION} = "11" ] && [ ! -z "${SuperLUDist}" ] && [ ${SuperLUDist} = "ON" ]; then
+        # Apply patch to let Trilinos/Amesos work with SuperLUDist
+        cd ${UNPACK_PATH}/${EXTRACTSTO}/packages/amesos/src
+        patch --forward Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Trilinos-v11-Amesos_Superludist.cpp.patch || true
+    fi
+}
+
 package_specific_register () {
     export TRILINOS_DIR=${INSTALL_PATH}
 }
diff --git a/deal.II/patches/Trilinos-v11-Amesos_Superludist.cpp.patch b/deal.II/patches/Trilinos-v11-Amesos_Superludist.cpp.patch
new file mode 100644
index 0000000..be38fd7
--- /dev/null
+++ b/deal.II/patches/Trilinos-v11-Amesos_Superludist.cpp.patch
@@ -0,0 +1,6 @@
+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;