From: young Date: Mon, 7 Apr 2014 19:41:26 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91d60c804db30b71d0498daac5b25d81533f3511;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32728 0785d39b-7218-0410-832d-ea1e28bc413d --- 91d60c804db30b71d0498daac5b25d81533f3511 diff --cc deal.II/source/numerics/matrix_tools.cc index 0c98dc8b09,6a726729c1..b2bd2e4371 --- a/deal.II/source/numerics/matrix_tools.cc +++ b/deal.II/source/numerics/matrix_tools.cc @@@ -2350,19 -2350,19 +2350,20 @@@ namespace MatrixTool // entry from within the part of the // matrix that we can see. if we can't // find such an entry, take one - PetscScalar average_nonzero_diagonal_entry = 1; - for (types::global_dof_index i=local_range.first; i constrained_rows; for (std::map::const_iterator -- dof = boundary_values.begin(); ++ dof = boundary_values.begin(); dof != boundary_values.end(); ++dof) if ((dof->first >= local_range.first) &&