[petsc] 02/04: Transition to suitesparse 4.2.1

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository petsc.

commit 2489d5c776c38417f596e65d372745b744b6f423
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Dec 11 10:27:35 2013 +0100

    Transition to suitesparse 4.2.1
    
    + umfpack.patch: remove patch, no longer needed
    + bump build-dependency version
    
    Closes: #708398
---
 debian/control               |  2 +-
 debian/patches/series        |  1 -
 debian/patches/umfpack.patch | 29 -----------------------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/control b/debian/control
index ec71db9..9f3a899 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7.0.50), quilt, python (>= 2.2), gfortran, autotools-dev,
  libx11-dev, mpi-default-dev (>= 1.0.2),
  libblas-dev, liblapack-dev,
- libsuitesparse-dev (>= 3.1.0-2),
+ libsuitesparse-dev (>= 1:4.2.1),
  libspooles-dev (>= 2.2-6), libhypre-dev (>= 2.4.0), libptscotch-dev,
  libhdf5-mpi-dev (>= 1.8.8),
  libblacs-mpi-dev, libscalapack-mpi-dev, libmumps-dev,
diff --git a/debian/patches/series b/debian/patches/series
index fe3abec..3f8d4b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,5 +10,4 @@ clean-no-double-colon.patch
 #mumps.patch
 hypre.patch
 nocleanup.patch
-umfpack.patch
 g++-4.8.patch
diff --git a/debian/patches/umfpack.patch b/debian/patches/umfpack.patch
deleted file mode 100644
index 3b5743b..0000000
--- a/debian/patches/umfpack.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-A kludge to get PETSc to compile with SuiteSparse 3.4.0:
-replace Control[UMFPACK_ORDERING] with Info[UMFPACK_ORDERING_USED]
-
-It compiles, but runtime behavior is unpredictable at best.
-
-Index: petsc-3.4.2/src/mat/impls/aij/seq/umfpack/umfpack.c
-===================================================================
---- petsc-3.4.2.orig/src/mat/impls/aij/seq/umfpack/umfpack.c	2013-08-20 15:35:46.000000000 +0200
-+++ petsc-3.4.2/src/mat/impls/aij/seq/umfpack/umfpack.c	2013-08-20 15:35:46.000000000 +0200
-@@ -308,7 +308,7 @@
- 
-   /* mat ordering */
-   if (!lu->PetscMatOrdering) {
--    ierr = PetscViewerASCIIPrintf(viewer,"  Control[UMFPACK_ORDERING]: %s (not using the PETSc ordering)\n",UmfpackOrderingTypes[(int)lu->Control[UMFPACK_ORDERING]]);CHKERRQ(ierr);
-+    ierr = PetscViewerASCIIPrintf(viewer,"  Info[UMFPACK_ORDERING_USED]: %s (not using the PETSc ordering)\n",UmfpackOrderingTypes[(int)lu->Info[UMFPACK_ORDERING_USED]]);CHKERRQ(ierr);
-   }
-   PetscFunctionReturn(0);
- }
-@@ -427,8 +427,8 @@
-     case 2: lu->Control[UMFPACK_STRATEGY] = UMFPACK_STRATEGY_SYMMETRIC; break;
-     }
-   }
--  ierr = PetscOptionsEList("-mat_umfpack_ordering","Internal ordering method","None",UmfpackOrderingTypes,sizeof(UmfpackOrderingTypes)/sizeof(UmfpackOrderingTypes[0]),UmfpackOrderingTypes[(int)lu->Control[UMFPACK_ORDERING]],&idx,&flg);CHKERRQ(ierr);
--  if (flg) lu->Control[UMFPACK_ORDERING] = (int)idx;
-+  ierr = PetscOptionsEList("-mat_umfpack_ordering","Internal ordering method","None",UmfpackOrderingTypes,sizeof UmfpackOrderingTypes/sizeof UmfpackOrderingTypes[0],UmfpackOrderingTypes[(int)lu->Info[UMFPACK_ORDERING_USED]],&idx,&flg);CHKERRQ(ierr);
-+  if (flg) lu->Info[UMFPACK_ORDERING_USED] = (int)idx;
-   ierr = PetscOptionsReal("-mat_umfpack_dense_col","Control[UMFPACK_DENSE_COL]","None",lu->Control[UMFPACK_DENSE_COL],&lu->Control[UMFPACK_DENSE_COL],NULL);CHKERRQ(ierr);
-   ierr = PetscOptionsReal("-mat_umfpack_dense_row","Control[UMFPACK_DENSE_ROW]","None",lu->Control[UMFPACK_DENSE_ROW],&lu->Control[UMFPACK_DENSE_ROW],NULL);CHKERRQ(ierr);
-   ierr = PetscOptionsReal("-mat_umfpack_amd_dense","Control[UMFPACK_AMD_DENSE]","None",lu->Control[UMFPACK_AMD_DENSE],&lu->Control[UMFPACK_AMD_DENSE],NULL);CHKERRQ(ierr);

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