From: turcksin Date: Wed, 3 Apr 2013 20:15:44 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4508c9d865ed07824b03119b39bedbc5728b0485;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29166 0785d39b-7218-0410-832d-ea1e28bc413d --- 4508c9d865ed07824b03119b39bedbc5728b0485 diff --cc deal.II/include/deal.II/lac/slepc_solver.h index c843c90ebf,5554e5ffe6..d8c5ebad0d --- a/deal.II/include/deal.II/lac/slepc_solver.h +++ b/deal.II/include/deal.II/lac/slepc_solver.h @@@ -147,7 -143,7 +147,7 @@@ namespace SLEPcWrapper solve (const PETScWrappers::MatrixBase &A, std::vector &kr, std::vector &vr, - const size_type n_eigenvectors); - const unsigned int n_eigenvectors = 1); ++ const size_type n_eigenvectors = 1); /** * Same as above, but here a composite method for solving the @@@ -159,7 -155,7 +159,7 @@@ const PETScWrappers::MatrixBase &B, std::vector &kr, std::vector &vr, - const size_type n_eigenvectors); - const unsigned int n_eigenvectors = 1); ++ const size_type n_eigenvectors = 1); /** * Initialize solver for the linear system $Ax=\lambda x$. (Note: @@@ -658,7 -654,7 +658,7 @@@ SolverBase::solve (const PETScWrappers::MatrixBase &A, std::vector &kr, std::vector &vr, - const size_type n_eigenvectors = 1) - const unsigned int n_eigenvectors) ++ const size_type n_eigenvectors) { // Panic if no eigenpairs are wanted. AssertThrow (n_eigenvectors != 0, ExcSLEPcWrappersUsageError()); @@@ -690,7 -686,7 +690,7 @@@ const PETScWrappers::MatrixBase &B, std::vector &kr, std::vector &vr, - const size_type n_eigenvectors = 1) - const unsigned int n_eigenvectors) ++ const size_type n_eigenvectors) { // Panic if no eigenpairs are wanted. AssertThrow (n_eigenvectors != 0, ExcSLEPcWrappersUsageError());