From: turcksin Date: Mon, 25 Mar 2013 14:11:54 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7952ad38cf887e42f278c1ba8ef193a4402e792d;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29024 0785d39b-7218-0410-832d-ea1e28bc413d --- 7952ad38cf887e42f278c1ba8ef193a4402e792d diff --cc deal.II/include/deal.II/base/index_set.h index 587e440e80,c0cf5a1ddd..9a4a09006c --- a/deal.II/include/deal.II/base/index_set.h +++ b/deal.II/include/deal.II/base/index_set.h @@@ -244,9 -244,19 +244,19 @@@ public * index set with the interval, shifted * to the range [0, * end-begin). + * + * In other words, the result of this operation is the + * intersection of the set represented by the current object + * and the interval [begin, end), as seen + * within the interval [begin, end) by + * shifting the result of the intersection operation to + * the left by begin. This corresponds to the notion + * of a view: The interval [begin, end) is + * a window through which we see the set represented + * by the current object. */ - IndexSet get_view (const unsigned int begin, - const unsigned int end) const; + IndexSet get_view (const types::global_dof_index begin, + const types::global_dof_index end) const; /** diff --cc deal.II/include/deal.II/lac/slepc_solver.h index a76a1ba299,1f95532381..c843c90ebf --- a/deal.II/include/deal.II/lac/slepc_solver.h +++ b/deal.II/include/deal.II/lac/slepc_solver.h @@@ -641,9 -654,12 +658,12 @@@ namespace SLEPcWrapper SolverBase::solve (const PETScWrappers::MatrixBase &A, std::vector &kr, std::vector &vr, - const unsigned int n_eigenvectors = 1) + const size_type n_eigenvectors = 1) { + // Panic if no eigenpairs are wanted. + AssertThrow (n_eigenvectors != 0, ExcSLEPcWrappersUsageError()); + - unsigned int n_converged = 0; + size_type n_converged = 0; // Set the matrices of the problem set_matrices (A); @@@ -670,9 -686,12 +690,12 @@@ const PETScWrappers::MatrixBase &B, std::vector &kr, std::vector &vr, - const unsigned int n_eigenvectors = 1) + const size_type n_eigenvectors = 1) { + // Panic if no eigenpairs are wanted. + AssertThrow (n_eigenvectors != 0, ExcSLEPcWrappersUsageError()); + - unsigned int n_converged = 0; + size_type n_converged = 0; // Set the matrices of the problem set_matrices (A, B); diff --cc deal.II/source/lac/petsc_sparse_matrix.cc index 65ee384621,e77038d6cd..d1a747ec91 --- a/deal.II/source/lac/petsc_sparse_matrix.cc +++ b/deal.II/source/lac/petsc_sparse_matrix.cc @@@ -250,26 -247,17 +247,16 @@@ namespace PETScWrapper // class. if (preset_nonzero_locations == true) { - #ifdef PETSC_USE_64BIT_INDICES - std::vector - #else - std::vector - #endif - row_entries; + std::vector row_entries; std::vector row_values; - - for (unsigned int i=0; i n_entries_per_row(last_row-first_row); + std::vector n_entries_per_row(last_row-first_row); - for (unsigned int row=first_row; row