r46352 - in /packages/fenics/dolfin/trunk/debian: changelog patches/ patches/petsc-slepc-3.4.2.patch patches/series

[sebastien at users.alioth.debian.org]

Author: sebastien
Date: Sat Oct 26 04:02:57 2013
New Revision: 46352

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46352
Log:
petsc-slepc-3.4.2.patch: new patch to adapt for the new PETSC/SLEPC

Added:
    packages/fenics/dolfin/trunk/debian/patches/
    packages/fenics/dolfin/trunk/debian/patches/petsc-slepc-3.4.2.patch
    packages/fenics/dolfin/trunk/debian/patches/series
Modified:
    packages/fenics/dolfin/trunk/debian/changelog

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=46352&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Sat Oct 26 04:02:57 2013
@@ -3,6 +3,7 @@
   * Team upload.
   * Update (build-)dependencies to libpetsc3.4.2-dev and
     libslepc3.4.2-dev.
+  * petsc-slepc-3.4.2.patch: new patch to adapt for the new PETSC/SLEPC.
 
  -- Sébastien Villemot <sebastien at debian.org>  Sat, 26 Oct 2013 04:33:36 +0200
 

Added: packages/fenics/dolfin/trunk/debian/patches/petsc-slepc-3.4.2.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/petsc-slepc-3.4.2.patch?rev=46352&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/petsc-slepc-3.4.2.patch	(added)
+++ packages/fenics/dolfin/trunk/debian/patches/petsc-slepc-3.4.2.patch	Sat Oct 26 04:02:57 2013
@@ -0,0 +1,86 @@
+Description: Make dolfin compile against PETSC / SLEPC 3.4.2
+ This patch just removes a few const qualifiers.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2013-10-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/dolfin/la/SLEPcEigenSolver.cpp
++++ b/dolfin/la/SLEPcEigenSolver.cpp
+@@ -164,7 +164,7 @@
+   dolfin::la_index num_iterations = 0;
+   EPSGetIterationNumber(eps, &num_iterations);
+ 
+-  const EPSType eps_type = 0;
++  EPSType eps_type = 0;
+   EPSGetType(eps, &eps_type);
+   log(PROGRESS, "Eigenvalue solver (%s) converged in %d iterations.",
+       eps_type, num_iterations);
+--- a/dolfin/la/PETScKrylovSolver.cpp
++++ b/dolfin/la/PETScKrylovSolver.cpp
+@@ -528,13 +528,8 @@
+ {
+   // Get name of solver and preconditioner
+   PC pc;
+-  #if PETSC_VERSION_RELEASE
+-  const KSPType ksp_type;
+-  const PCType pc_type;
+-  #else
+   KSPType ksp_type;
+   PCType pc_type;
+-  #endif
+   KSPGetType(*_ksp, &ksp_type);
+   KSPGetPC(*_ksp, &pc);
+   PCGetType(pc, &pc_type);
+@@ -542,13 +537,8 @@
+   // If using additive Schwarz or block Jacobi, get 'sub' method which is
+   // applied to each block
+   const std::string pc_type_str = pc_type;
+-  #if PETSC_VERSION_RELEASE
+-  const KSPType sub_ksp_type;
+-  const PCType sub_pc_type;
+-  #else
+   KSPType sub_ksp_type;
+   PCType sub_pc_type;
+-  #endif
+   PC sub_pc;
+   KSP* sub_ksp = NULL;
+   if (pc_type_str == PCASM || pc_type_str == PCBJACOBI)
+--- a/dolfin/la/PETScVector.cpp
++++ b/dolfin/la/PETScVector.cpp
+@@ -158,11 +158,7 @@
+   dolfin_assert(_x);
+ 
+   // Get type
+-  #if PETSC_VERSION_RELEASE
+-  const VecType petsc_type;
+-  #else
+   VecType petsc_type;
+-  #endif
+   VecGetType(*_x, &petsc_type);
+ 
+   // Return type
+@@ -680,11 +676,7 @@
+   if (verbose)
+   {
+     // Get vector type
+-    #if PETSC_VERSION_RELEASE
+-    const VecType petsc_type;
+-    #else
+     VecType petsc_type;
+-    #endif
+     dolfin_assert(_x);
+     VecGetType(*_x, &petsc_type);
+ 
+@@ -714,11 +706,7 @@
+   PETScVector& _y = as_type<PETScVector>(y);
+ 
+   // Check that y is a local vector
+-  #if PETSC_VERSION_RELEASE
+-  const VecType petsc_type;
+-  #else
+   VecType petsc_type;
+-  #endif
+   VecGetType(*(_y.vec()), &petsc_type);
+ 
+   #ifndef HAS_PETSC_CUSP

Added: packages/fenics/dolfin/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/series?rev=46352&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/series	(added)
+++ packages/fenics/dolfin/trunk/debian/patches/series	Sat Oct 26 04:02:57 2013
@@ -0,0 +1 @@
+petsc-slepc-3.4.2.patch