From: Denis Davydov Date: Fri, 8 Apr 2016 18:53:28 +0000 (+0200) Subject: fix compiler warnings in PArpack X-Git-Tag: v8.5.0-rc1~1123^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24d58ba7acb8ae6e0cf8cf4fdc9e668d6d0cb549;p=dealii.git fix compiler warnings in PArpack --- diff --git a/include/deal.II/lac/parpack_solver.h b/include/deal.II/lac/parpack_solver.h index 935fe0e383..27c20d5dd9 100644 --- a/include/deal.II/lac/parpack_solver.h +++ b/include/deal.II/lac/parpack_solver.h @@ -478,7 +478,7 @@ void PArpackSolver::reinit(const dealii::IndexSet &locally_owned_dof nloc = locally_owned_dofs.n_elements (); ncv = additional_data.number_of_arnoldi_vectors; - Assert (local_indices.size() == nloc, ExcInternalError() ); + Assert ((int)local_indices.size() == nloc, ExcInternalError() ); // vectors ldv = nloc; @@ -667,9 +667,9 @@ void PArpackSolver::solve const int shift_x = ipntr[0]-1; const int shift_y = ipntr[1]-1; Assert (shift_x>=0, dealii::ExcInternalError() ); - Assert (shift_x+nloc <= workd.size(), dealii::ExcInternalError() ); + Assert (shift_x+nloc <= (int)workd.size(), dealii::ExcInternalError() ); Assert (shift_y>=0, dealii::ExcInternalError() ); - Assert (shift_y+nloc <= workd.size(), dealii::ExcInternalError() ); + Assert (shift_y+nloc <= (int)workd.size(), dealii::ExcInternalError() ); src = 0.0; src.add (nloc, @@ -702,13 +702,13 @@ void PArpackSolver::solve const int shift_b_x = ipntr[2]-1; Assert (shift_x>=0, dealii::ExcInternalError() ); - Assert (shift_x+nloc <= workd.size(), dealii::ExcInternalError() ); + Assert (shift_x+nloc <= (int)workd.size(), dealii::ExcInternalError() ); Assert (shift_y>=0, dealii::ExcInternalError() ); - Assert (shift_y+nloc <= workd.size(), dealii::ExcInternalError() ); + Assert (shift_y+nloc <= (int)workd.size(), dealii::ExcInternalError() ); Assert (shift_b_x>=0, dealii::ExcInternalError() ); - Assert (shift_b_x+nloc <= workd.size(), dealii::ExcInternalError() ); + Assert (shift_b_x+nloc <= (int)workd.size(), dealii::ExcInternalError() ); Assert (shift_y>=0, dealii::ExcInternalError() ); - Assert (shift_y+nloc <= workd.size(), dealii::ExcInternalError() ); + Assert (shift_y+nloc <= (int)workd.size(), dealii::ExcInternalError() ); src = 0.0; // B*X src.add (nloc, @@ -743,9 +743,9 @@ void PArpackSolver::solve const int shift_x = ipntr[0]-1; const int shift_y = ipntr[1]-1; Assert (shift_x>=0, dealii::ExcInternalError() ); - Assert (shift_x+nloc <= workd.size(), dealii::ExcInternalError() ); + Assert (shift_x+nloc <= (int)workd.size(), dealii::ExcInternalError() ); Assert (shift_y>=0, dealii::ExcInternalError() ); - Assert (shift_y+nloc <= workd.size(), dealii::ExcInternalError() ); + Assert (shift_y+nloc <= (int)workd.size(), dealii::ExcInternalError() ); src = 0.0; src.add (nloc, @@ -838,7 +838,7 @@ void PArpackSolver::solve eigenvalues_im[i]); } - Assert (iparam[4] == n_eigenvalues, + Assert (iparam[4] == (int)n_eigenvalues, PArpackExcConvergedEigenvectors(iparam[4], n_eigenvalues)); // both PDNAUPD and PDSAUPD compute eigenpairs of inv[A - sigma*M]*M