From 958e9597e58e348d48ca218491121ff96eee27a7 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 8 Mar 2012 19:04:03 +0000 Subject: [PATCH] Revert r25212 and 25217 for the moment since it doesn't compile on the autotester. git-svn-id: https://svn.dealii.org/trunk@25223 0785d39b-7218-0410-832d-ea1e28bc413d --- .../lac/petsc_parallel_sparse_matrix.cc | 55 +++++-------------- 1 file changed, 13 insertions(+), 42 deletions(-) diff --git a/deal.II/source/lac/petsc_parallel_sparse_matrix.cc b/deal.II/source/lac/petsc_parallel_sparse_matrix.cc index 8681dc0438..8c5838729c 100644 --- a/deal.II/source/lac/petsc_parallel_sparse_matrix.cc +++ b/deal.II/source/lac/petsc_parallel_sparse_matrix.cc @@ -193,26 +193,12 @@ namespace PETScWrappers // use the call sequence indicating only // a maximal number of elements per row // for all rows globally - int ierr; - -#ifdef DEAL_II_PETSC_VERSION_DEV - ierr - = MatCreateAIJ (communicator, - local_rows, local_columns, - m, n, - n_nonzero_per_row, 0, 0, 0, - &matrix); - AssertThrow (ierr == 0, ExcPETScError(ierr)); - - ierr = MatSetOption (matrix, MAT_NEW_NONZERO_ALLOCATION_ERR, PETSC_FALSE); -#else - ierr - = MatCreateMPIAIJ (communicator, - local_rows, local_columns, - m, n, - n_nonzero_per_row, 0, 0, 0, - &matrix); -#endif + const int ierr + = MatCreateMPIAIJ(communicator, + local_rows, local_columns, + m, n, + n_nonzero_per_row, 0, 0, 0, + &matrix); AssertThrow (ierr == 0, ExcPETScError(ierr)); // set symmetric flag, if so requested @@ -248,7 +234,7 @@ namespace PETScWrappers // For the case that // local_columns is smaller // than one of the row lengths - // MatCreate(MPI)AIJ throws an + // MatCreateMPIAIJ throws an // error. In this case use a // PETScWrappers::SparseMatrix for (unsigned int i=0; i