From: Timo Heister Date: Thu, 17 Jan 2013 19:53:17 +0000 (+0000) Subject: add some definitions and includes from Shuqiang Wang X-Git-Tag: v8.0.0~120^2~99 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4c423c60705529963885306ed34c4eff7979bce;p=dealii.git add some definitions and includes from Shuqiang Wang git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@28107 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/lac/abstract_linear_algebra.h b/deal.II/include/deal.II/lac/abstract_linear_algebra.h index a7802bcac3..575b7a0f0c 100644 --- a/deal.II/include/deal.II/lac/abstract_linear_algebra.h +++ b/deal.II/include/deal.II/lac/abstract_linear_algebra.h @@ -65,12 +65,14 @@ DEAL_II_NAMESPACE_CLOSE #ifdef DEAL_II_USE_PETSC +#include #include #include #include #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -110,6 +112,8 @@ namespace LinearAlgebraPETSc */ typedef PETScWrappers::MPI::BlockSparseMatrix BlockSparseMatrix; + typedef dealii::BlockCompressedSimpleSparsityPattern CompressedBlockSparsityPattern; + /** * Typedef for the AMG preconditioner type used for the * top left block of the Stokes matrix. @@ -139,6 +143,7 @@ DEAL_II_NAMESPACE_CLOSE #include #include +#include #include #include #include @@ -202,6 +207,8 @@ namespace LinearAlgebraTrilinos * for other blocks of the system matrix. */ typedef TrilinosWrappers::PreconditionJacobi PreconditionJacobi; + + typedef TrilinosWrappers::SolverCG SolverCG; } }