]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
add some definitions and includes from Shuqiang Wang
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 17 Jan 2013 19:53:17 +0000 (19:53 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 17 Jan 2013 19:53:17 +0000 (19:53 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@28107 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/lac/abstract_linear_algebra.h

index a7802bcac3363412e324c6b5e95bee77cd292543..575b7a0f0cd89b25cd8d07c8dffa4e1fa56dbb6b 100644 (file)
@@ -65,12 +65,14 @@ DEAL_II_NAMESPACE_CLOSE
 
 #ifdef DEAL_II_USE_PETSC
 
+#include <deal.II/lac/block_sparsity_pattern.h>
 #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>
+#include <deal.II/lac/petsc_solver.h>
 
 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 <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/trilinos_block_vector.h>
+#include <deal.II/lac/trilinos_block_sparse_matrix.h>
 #include <deal.II/lac/trilinos_sparse_matrix.h>
 #include <deal.II/lac/trilinos_precondition.h>
 #include <deal.II/lac/block_sparsity_pattern.h>
@@ -202,6 +207,8 @@ namespace LinearAlgebraTrilinos
      * for other blocks of the system matrix.
      */
     typedef TrilinosWrappers::PreconditionJacobi PreconditionJacobi;
+
+    typedef TrilinosWrappers::SolverCG SolverCG;
   }
 
 }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.