From: heister Date: Fri, 31 May 2013 17:54:06 +0000 (+0000) Subject: merge from mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a0d4a6d172aff7ba6f40789118cf66668bd7de5;p=dealii-svn.git merge from mainline git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@29691 0785d39b-7218-0410-832d-ea1e28bc413d --- 6a0d4a6d172aff7ba6f40789118cf66668bd7de5 diff --cc deal.II/include/deal.II/lac/petsc_parallel_block_vector.h index ba37ef1af7,70c3606c64..4a0e6c801a --- a/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 ¶llel_partitioning, const MPI_Comm &communicator); + /** + * Same as above but include ghost entries. + */ + void reinit (const std::vector ¶llel_partitioning, + const std::vector &ghost_entries, + const MPI_Comm &communicator); ++ + /** + * Change the number of blocks to + * num_blocks. 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 collect_sizes + * afterwards. + */ + void reinit (const unsigned int num_blocks); + /** * Return a reference to the MPI * communicator object in use with