From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 2 Nov 2012 21:40:43 +0000 (+0000)
Subject: separate MPI and non-MPI
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdbade7fd77852621894eaa3cf7aac5476900444;p=dealii-svn.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<double> SparseMatrix;
 
-  
-  
+  typedef PreconditionSSOR<SparseMatrix > PreconditionSSOR;
   
 }
 
@@ -40,6 +39,7 @@ DEAL_II_NAMESPACE_CLOSE
 #include <deal.II/lac/petsc_vector.h>
 #include <deal.II/lac/petsc_block_vector.h>
 #include <deal.II/lac/petsc_parallel_sparse_matrix.h>
+#include <deal.II/lac/petsc_sparse_matrix.h>
 #include <deal.II/lac/petsc_parallel_block_sparse_matrix.h>
 #include <deal.II/lac/petsc_precondition.h>
 
@@ -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