From: turcksin Date: Thu, 21 Feb 2013 15:56:11 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=032d191d0ce6402859dfa815dc895afb9c47d071;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28510 0785d39b-7218-0410-832d-ea1e28bc413d --- 032d191d0ce6402859dfa815dc895afb9c47d071 diff --cc deal.II/include/deal.II/dofs/dof_accessor.h index 066915fba1,55735bd088..03f0d9e59d --- a/deal.II/include/deal.II/dofs/dof_accessor.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.h @@@ -2137,7 -2140,8 +2137,8 @@@ public * * @deprecated Currently, this function can also be called for non-active cells, if all degrees of freedom of the FiniteElement are located in vertices. This functionality will vanish in a future release. */ - void get_dof_indices (std::vector &dof_indices) const; + void get_dof_indices (std::vector &dof_indices) const; + /** * @deprecated Use get_active_or_mg_dof_indices() with level_cell_iterator returned from begin_mg(). * diff --cc deal.II/include/deal.II/lac/arpack_solver.h index b675d0e70d,fd3abf17c2..5ab4430dfb --- a/deal.II/include/deal.II/lac/arpack_solver.h +++ b/deal.II/include/deal.II/lac/arpack_solver.h @@@ -495,11 -489,9 +495,9 @@@ void ArpackSolver::solve AssertDimension (eigenvalues.size(), eigenvalues_real.size()); AssertDimension (eigenvalues.size(), eigenvalues_im.size()); - for (unsigned int i=0; i (eigenvalues_real[i], + eigenvalues_im[i]); } } diff --cc deal.II/include/deal.II/lac/petsc_parallel_block_vector.h index 88192e1ae7,3c5587a6ab..92586f5ed6 --- a/deal.II/include/deal.II/lac/petsc_parallel_block_vector.h +++ b/deal.II/include/deal.II/lac/petsc_parallel_block_vector.h @@@ -122,10 -122,17 +122,17 @@@ namespace PETScWrapper * local_elements[i] * elements on the present process. */ - BlockVector (const std::vector &block_sizes, - const MPI_Comm &communicator, - const std::vector &local_elements); + BlockVector (const std::vector &block_sizes, + const MPI_Comm &communicator, + const std::vector &local_elements); + /** + * Create a BlockVector with parallel_partitioning.size() blocks, + * each initialized with the given IndexSet. + */ + explicit BlockVector (const std::vector ¶llel_partitioning, + const MPI_Comm &communicator = MPI_COMM_WORLD); + /** * Destructor. Clears memory */ diff --cc deal.II/include/deal.II/lac/trilinos_block_vector.h index a707d97f2f,a6b8a92cbe..489d5f37a7 --- a/deal.II/include/deal.II/lac/trilinos_block_vector.h +++ b/deal.II/include/deal.II/lac/trilinos_block_vector.h @@@ -146,7 -146,7 +146,7 @@@ namespace TrilinosWrapper * fill appropriate data using a * reinit of the blocks. */ - BlockVector (const size_type num_blocks); - explicit BlockVector (const unsigned int num_blocks); ++ explicit BlockVector (const size_type num_blocks); /** * Constructor. Set the number of @@@ -156,7 -156,7 +156,7 @@@ * * References BlockVector.reinit(). */ - BlockVector (const std::vector &N); - explicit BlockVector (const std::vector &N); ++ explicit BlockVector (const std::vector &N); /** * Constructor. Set the number of diff --cc deal.II/include/deal.II/lac/trilinos_parallel_block_vector.h index 8ad150cebc,7d7309d29d..12ca9794db --- a/deal.II/include/deal.II/lac/trilinos_parallel_block_vector.h +++ b/deal.II/include/deal.II/lac/trilinos_parallel_block_vector.h @@@ -140,7 -140,7 +140,7 @@@ namespace TrilinosWrapper * fill appropriate data using a * reinit of the blocks. */ - BlockVector (const size_type num_blocks); - explicit BlockVector (const unsigned int num_blocks); ++ explicit BlockVector (const size_type num_blocks); /** * Destructor. Clears memory