[getdp] 23/30: add patch for petsc/slepc transition

[Matteo F. Vescovi]

This is an automated email from the git hooks/post-receive script.

mfv pushed a commit to tag 2.2.0-1
in repository getdp.

commit b7cd9e80691c0bd8a0c2c6198fc502d6eb0c6389
Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
Date:   Tue Feb 14 14:54:31 2012 +0000

    add patch for petsc/slepc transition
---
 patches/series         |  1 +
 patches/slepc3.2.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 rules                  |  4 ++--
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/patches/series b/patches/series
index 30a6920..c0d8fb7 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1,3 @@
 Makefile.diff
 configure.diff
+slepc3.2.patch
diff --git a/patches/slepc3.2.patch b/patches/slepc3.2.patch
new file mode 100644
index 0000000..dcc7062
--- /dev/null
+++ b/patches/slepc3.2.patch
@@ -0,0 +1,53 @@
+Index: getdp-2.1.2~beta2~svn2274/Legacy/EigenSolve.cpp
+===================================================================
+--- getdp-2.1.2~beta2~svn2274.orig/Legacy/EigenSolve.cpp	2012-02-14 15:42:55.000000000 +0100
++++ getdp-2.1.2~beta2~svn2274/Legacy/EigenSolve.cpp	2012-02-14 15:42:56.000000000 +0100
+@@ -7,7 +7,7 @@
+ #include "Message.h"
+ #include "EigenSolve.h"
+ 
+-#if (PETSC_VERSION_RELEASE == 0) // petsc-dev
++#if (PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // // petsc-dev
+ #define PetscTruth PetscBool
+ #define PetscOptionsGetTruth PetscOptionsGetBool
+ #endif
+Index: getdp-2.1.2~beta2~svn2274/Legacy/EigenSolve_SLEPC.cpp
+===================================================================
+--- getdp-2.1.2~beta2~svn2274.orig/Legacy/EigenSolve_SLEPC.cpp	2012-02-14 15:42:55.000000000 +0100
++++ getdp-2.1.2~beta2~svn2274/Legacy/EigenSolve_SLEPC.cpp	2012-02-14 15:46:10.000000000 +0100
+@@ -162,7 +162,7 @@
+     Current.TimeImag = im;
+   }
+ 
+-#if (PETSC_VERSION_RELEASE == 0) // petsc-dev
++#if (PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // petsc-dev
+   _try(VecDestroy(&xr));
+   _try(VecDestroy(&xi));
+ #else
+@@ -258,7 +258,7 @@
+     Message::Error("SLEPc diverged after %d iterations", its);
+   else if(reason == EPS_DIVERGED_BREAKDOWN)
+     Message::Error("SLEPc generic breakdown in method");
+-#if !(PETSC_VERSION_RELEASE == 0) // petsc-dev
++#if !(PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // petsc-dev
+   else if(reason == EPS_DIVERGED_NONSYMMETRIC)
+     Message::Error("The operator is nonsymmetric");
+ #endif
+@@ -274,7 +274,7 @@
+   // print eigenvalues and store eigenvectors in DofData
+   _storeEigenVectors(DofData_P, nconv, eps, PETSC_NULL);
+   
+-#if (PETSC_VERSION_RELEASE == 0) // petsc-dev
++#if (PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // petsc-dev
+   _try(EPSDestroy(&eps));
+ #else
+   _try(EPSDestroy(eps));
+@@ -389,7 +389,7 @@
+   // print eigenvalues and store eigenvectors in DofData
+   _storeEigenVectors(DofData_P, nconv, PETSC_NULL, qep);
+   
+-#if (PETSC_VERSION_RELEASE == 0) // petsc-dev
++#if (PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // petsc-dev
+   _try(QEPDestroy(&qep));
+ #else
+   _try(QEPDestroy(qep));
diff --git a/rules b/rules
index c511c7e..c3a288a 100755
--- a/rules
+++ b/rules
@@ -12,9 +12,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # PETSC_DIR is the location of PETSc.
-export PETSC_DIR=/usr/lib/petscdir/3.1
+export PETSC_DIR=/usr/lib/petscdir/3.2
 export PETSC_ARCH=linux-gnu-c-opt
-export SLEPC_DIR=/usr/lib/slepcdir/3.1
+export SLEPC_DIR=/usr/lib/slepcdir/3.2
 
 #DEB_MAKE_ENVVARS               := -j2
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getdp.git