From: David Wells Date: Fri, 8 Jul 2016 16:16:27 +0000 (-0400) Subject: Unify handling of ExcPetscError. X-Git-Tag: v8.5.0-rc1~900^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da6e52b60c388fb0213f5c40038a6255fb953263;p=dealii.git Unify handling of ExcPetscError. --- diff --git a/include/deal.II/lac/la_parallel_vector.templates.h b/include/deal.II/lac/la_parallel_vector.templates.h index ef0384b0fb..1c3c48237d 100644 --- a/include/deal.II/lac/la_parallel_vector.templates.h +++ b/include/deal.II/lac/la_parallel_vector.templates.h @@ -18,6 +18,7 @@ #include +#include #include #include #include diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h index acca524ec2..397a0d37d4 100644 --- a/include/deal.II/lac/petsc_matrix_base.h +++ b/include/deal.II/lac/petsc_matrix_base.h @@ -884,13 +884,6 @@ namespace PETScWrappers */ std::size_t memory_consumption() const; - /** - * Exception - */ - DeclException1 (ExcPETScError, - int, - << "An error with error number " << arg1 - << " occurred while calling a PETSc function"); /** * Exception */ diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index 42ef242a9a..938e1ddd9c 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -154,14 +154,6 @@ namespace PETScWrappers * the referenced element of the vector. */ operator PetscScalar () const; - - /** - * Exception - */ - DeclException1 (ExcPETScError, - int, - << "An error with error number " << arg1 - << " occurred while calling a PETSc function"); /** * Exception */ diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h index 3a745de513..59ce51a7c4 100644 --- a/include/deal.II/lac/read_write_vector.templates.h +++ b/include/deal.II/lac/read_write_vector.templates.h @@ -18,9 +18,11 @@ #include +#include + +#include #include #include -#include #include #ifdef DEAL_II_WITH_PETSC diff --git a/include/deal.II/lac/vector.templates.h b/include/deal.II/lac/vector.templates.h index 66fec39803..ce2a2287fc 100644 --- a/include/deal.II/lac/vector.templates.h +++ b/include/deal.II/lac/vector.templates.h @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/source/lac/petsc_full_matrix.cc b/source/lac/petsc_full_matrix.cc index 6ff013ac34..46e8b05dde 100644 --- a/source/lac/petsc_full_matrix.cc +++ b/source/lac/petsc_full_matrix.cc @@ -17,7 +17,7 @@ #ifdef DEAL_II_WITH_PETSC -# include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/petsc_matrix_base.cc b/source/lac/petsc_matrix_base.cc index 941370e3bc..0d34d31a43 100644 --- a/source/lac/petsc_matrix_base.cc +++ b/source/lac/petsc_matrix_base.cc @@ -17,6 +17,7 @@ #ifdef DEAL_II_WITH_PETSC +# include # include # include # include @@ -52,7 +53,7 @@ namespace PETScWrappers int ierr; (void)ierr; ierr = MatGetRow(*matrix, this->a_row, &ncols, &colnums, &values); - AssertThrow (ierr == 0, MatrixBase::ExcPETScError(ierr)); + AssertThrow (ierr == 0, ExcPETScError(ierr)); // copy it into our caches if the line // isn't empty. if it is, then we've @@ -66,7 +67,7 @@ namespace PETScWrappers // and finally restore the matrix ierr = MatRestoreRow(*matrix, this->a_row, &ncols, &colnums, &values); - AssertThrow (ierr == 0, MatrixBase::ExcPETScError(ierr)); + AssertThrow (ierr == 0, ExcPETScError(ierr)); } } @@ -355,7 +356,7 @@ namespace PETScWrappers //query this information from PETSc int ierr; ierr = MatGetRow(*this, row, &ncols, &colnums, &values); - AssertThrow (ierr == 0, MatrixBase::ExcPETScError(ierr)); + AssertThrow (ierr == 0, ExcPETScError(ierr)); // then restore the matrix and return the number of columns in this row as // queried previously. Starting with PETSc 3.4, MatRestoreRow actually @@ -364,7 +365,7 @@ namespace PETScWrappers // and return the saved value. const PetscInt ncols_saved = ncols; ierr = MatRestoreRow(*this, row, &ncols, &colnums, &values); - AssertThrow (ierr == 0, MatrixBase::ExcPETScError(ierr)); + AssertThrow (ierr == 0, ExcPETScError(ierr)); return ncols_saved; } @@ -644,7 +645,7 @@ namespace PETScWrappers { int ierr = MatGetRow(*this, row, &ncols, &colnums, &values); (void)ierr; - AssertThrow (ierr == 0, MatrixBase::ExcPETScError(ierr)); + AssertThrow (ierr == 0, ExcPETScError(ierr)); for (PetscInt col = 0; col < ncols; ++col) { @@ -652,7 +653,7 @@ namespace PETScWrappers } ierr = MatRestoreRow(*this, row, &ncols, &colnums, &values); - AssertThrow (ierr == 0, MatrixBase::ExcPETScError(ierr)); + AssertThrow (ierr == 0, ExcPETScError(ierr)); } AssertThrow (out, ExcIO()); diff --git a/source/lac/petsc_matrix_free.cc b/source/lac/petsc_matrix_free.cc index 9f2af4cbd2..f3027673df 100644 --- a/source/lac/petsc_matrix_free.cc +++ b/source/lac/petsc_matrix_free.cc @@ -18,6 +18,8 @@ #ifdef DEAL_II_WITH_PETSC +#include + DEAL_II_NAMESPACE_OPEN namespace PETScWrappers diff --git a/source/lac/petsc_parallel_sparse_matrix.cc b/source/lac/petsc_parallel_sparse_matrix.cc index 7ae908fddd..686346a918 100644 --- a/source/lac/petsc_parallel_sparse_matrix.cc +++ b/source/lac/petsc_parallel_sparse_matrix.cc @@ -18,6 +18,7 @@ #ifdef DEAL_II_WITH_PETSC # include +# include # include # include # include diff --git a/source/lac/petsc_precondition.cc b/source/lac/petsc_precondition.cc index 51162264de..7e2c9ca32a 100644 --- a/source/lac/petsc_precondition.cc +++ b/source/lac/petsc_precondition.cc @@ -18,7 +18,7 @@ #ifdef DEAL_II_WITH_PETSC # include -# include +# include # include # include # include diff --git a/source/lac/petsc_solver.cc b/source/lac/petsc_solver.cc index c12e7f2af3..2f342d3b95 100644 --- a/source/lac/petsc_solver.cc +++ b/source/lac/petsc_solver.cc @@ -19,6 +19,7 @@ #ifdef DEAL_II_WITH_PETSC +# include # include # include # include diff --git a/source/lac/petsc_sparse_matrix.cc b/source/lac/petsc_sparse_matrix.cc index 750f54db0b..9132bf123d 100644 --- a/source/lac/petsc_sparse_matrix.cc +++ b/source/lac/petsc_sparse_matrix.cc @@ -17,6 +17,7 @@ #ifdef DEAL_II_WITH_PETSC +# include # include # include # include diff --git a/source/lac/petsc_vector.cc b/source/lac/petsc_vector.cc index 3541efa2d3..ebcf8bb331 100644 --- a/source/lac/petsc_vector.cc +++ b/source/lac/petsc_vector.cc @@ -17,6 +17,8 @@ #ifdef DEAL_II_WITH_PETSC +#include + # include DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/petsc_vector_base.cc b/source/lac/petsc_vector_base.cc index e3191cd202..9528b6aa85 100644 --- a/source/lac/petsc_vector_base.cc +++ b/source/lac/petsc_vector_base.cc @@ -18,6 +18,7 @@ #ifdef DEAL_II_WITH_PETSC # include +# include # include # include # include