merge from mainline

git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@29691 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/include/deal.II/lac/petsc_parallel_block_vector.h
index ba37ef1af76237ec9afb8f98f541f6e52554c04b,70c3606c64ca84e6b8d0a9e087ff183999727cab..4a0e6c801af23c9ae559fdb14ce05659faab5a13
--- 1/deal.II/include/deal.II/lac/petsc_parallel_block_vector.h
--- 2/deal.II/include/deal.II/lac/petsc_parallel_block_vector.h
+++ b/deal.II/include/deal.II/lac/petsc_parallel_block_vector.h
@@@ -288,12 -279,19 +288,26 @@@ namespace PETScWrapper
        void reinit (const std::vector<IndexSet> &parallel_partitioning,
                     const MPI_Comm              &communicator);
  
 +      /**
 +       * Same as above but include ghost entries.
 +       */
 +      void reinit (const std::vector<IndexSet> &parallel_partitioning,
 +                   const std::vector<IndexSet> &ghost_entries,
 +                   const MPI_Comm              &communicator);
++      
+       /**
+        * Change the number of blocks to
+        * <tt>num_blocks</tt>. The individual
+        * blocks will get initialized with
+        * zero size, so it is assumed that
+        * the user resizes the
+        * individual blocks by herself
+        * in an appropriate way, and
+        * calls <tt>collect_sizes</tt>
+        * afterwards.
+        */
+       void reinit (const unsigned int num_blocks);
+ 
        /**
         * Return a reference to the MPI
         * communicator object in use with

diff --cc deal.II/include/deal.II/lac/trilinos_vector_base.h
Simple merge