r44488 - in /packages/getdp/trunk/debian: patches/series patches/slepc3.2.patch rules

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Tue Feb 14 14:54:31 2012
New Revision: 44488

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44488
Log:
add patch for petsc/slepc transition

Added:
    packages/getdp/trunk/debian/patches/slepc3.2.patch
Modified:
    packages/getdp/trunk/debian/patches/series
    packages/getdp/trunk/debian/rules

Modified: packages/getdp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/series?rev=44488&op=diff
==============================================================================
--- packages/getdp/trunk/debian/patches/series (original)
+++ packages/getdp/trunk/debian/patches/series Tue Feb 14 14:54:31 2012
@@ -1,2 +1,3 @@
 Makefile.diff
 configure.diff
+slepc3.2.patch

Added: packages/getdp/trunk/debian/patches/slepc3.2.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/slepc3.2.patch?rev=44488&op=file
==============================================================================
--- packages/getdp/trunk/debian/patches/slepc3.2.patch (added)
+++ packages/getdp/trunk/debian/patches/slepc3.2.patch Tue Feb 14 14:54:31 2012
@@ -1,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));

Modified: packages/getdp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/rules?rev=44488&op=diff
==============================================================================
--- packages/getdp/trunk/debian/rules (original)
+++ packages/getdp/trunk/debian/rules Tue Feb 14 14:54:31 2012
@@ -12,9 +12,9 @@
 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