From ff3f9d6278cfdda1409001f9642eb5b94ee19a49 Mon Sep 17 00:00:00 2001 From: young Date: Sat, 5 Oct 2013 03:53:29 +0000 Subject: [PATCH] Mark changes in CHANGES (and merge from trunk). git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@31140 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CHANGES | 13 +++++++++++++ deal.II/source/lac/petsc_parallel_sparse_matrix.cc | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 deal.II/CHANGES diff --git a/deal.II/CHANGES b/deal.II/CHANGES new file mode 100644 index 0000000000..e77a0aeddc --- /dev/null +++ b/deal.II/CHANGES @@ -0,0 +1,13 @@ +? CHANGES +? build +M include/deal.II/algorithms/operator.templates.h +M include/deal.II/lac/block_vector_base.h +M include/deal.II/lac/constraint_matrix.templates.h +M include/deal.II/lac/petsc_vector_base.h +M include/deal.II/numerics/vector_tools.templates.h +M source/fe/fe_tools_interpolate.cc +M source/fe/fe_values.cc +M source/grid/grid_refinement.cc +M source/numerics/data_out_dof_data.cc +M source/numerics/matrix_tools.cc +M source/numerics/point_value_history.cc diff --git a/deal.II/source/lac/petsc_parallel_sparse_matrix.cc b/deal.II/source/lac/petsc_parallel_sparse_matrix.cc index 6e91035df7..f514ad7d72 100644 --- a/deal.II/source/lac/petsc_parallel_sparse_matrix.cc +++ b/deal.II/source/lac/petsc_parallel_sparse_matrix.cc @@ -45,11 +45,14 @@ namespace PETScWrappers SparseMatrix::~SparseMatrix () { + int ierr; + #if DEAL_II_PETSC_VERSION_LT(3,2,0) - const int ierr = MatDestroy (matrix); + ierr = MatDestroy (matrix); #else - const int ierr = MatDestroy (&matrix); + ierr = MatDestroy (&matrix); #endif + AssertThrow (ierr == 0, ExcPETScError(ierr)); } SparseMatrix::SparseMatrix (const MPI_Comm &communicator, -- 2.39.5