From: Timo Heister Date: Fri, 2 Nov 2012 21:40:43 +0000 (+0000) Subject: separate MPI and non-MPI X-Git-Tag: v8.0.0~120^2~133 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3969dfe2a03943c1637a667dc25179c432ecc1a8;p=dealii.git separate MPI and non-MPI git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@27324 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/lac/parallel_linear_algebra.h b/deal.II/include/deal.II/lac/parallel_linear_algebra.h index d9e7e615dd..2f66b9d23e 100644 --- a/deal.II/include/deal.II/lac/parallel_linear_algebra.h +++ b/deal.II/include/deal.II/lac/parallel_linear_algebra.h @@ -26,8 +26,7 @@ namespace LinearAlgebraDealII typedef SparseMatrix SparseMatrix; - - + typedef PreconditionSSOR PreconditionSSOR; } @@ -40,6 +39,7 @@ DEAL_II_NAMESPACE_CLOSE #include #include #include +#include #include #include @@ -49,6 +49,16 @@ DEAL_II_NAMESPACE_OPEN { using namespace dealii; + typedef PETScWrappers::Vector Vector; + typedef PETScWrappers::BlockVector BlockVector; + + typedef PETScWrappers::SparseMatrix SparseMatrix; + typedef PETScWrappers::PreconditionSSOR PreconditionSSOR; + + + namespace MPI + { + /** * Typedef for the vector type used. */ @@ -88,6 +98,8 @@ DEAL_II_NAMESPACE_OPEN * for other blocks of the system matrix. */ typedef PETScWrappers::PreconditionILU PreconditionILU; + } + } DEAL_II_NAMESPACE_CLOSE @@ -106,7 +118,9 @@ DEAL_II_NAMESPACE_OPEN namespace LinearAlgebraTrilinos { using namespace dealii; - + namespace MPI + { + /** * Typedef for the vector type used. */ @@ -146,6 +160,8 @@ DEAL_II_NAMESPACE_OPEN * for other blocks of the system matrix. */ typedef TrilinosWrappers::PreconditionILU PreconditionILU; + } + } DEAL_II_NAMESPACE_CLOSE