From: Wolfgang Bangerth Date: Mon, 9 Mar 2015 22:18:18 +0000 (-0500) Subject: Reindent. X-Git-Tag: v8.3.0-rc1~380^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=196de34a70f6cccfcf5c7bdfe01332b19e3c59dc;p=dealii.git Reindent. --- diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h index 52e3c4b52f..8e62eb0181 100644 --- a/include/deal.II/lac/sparse_matrix.h +++ b/include/deal.II/lac/sparse_matrix.h @@ -1354,61 +1354,61 @@ public: */ //@{ - /** - * Return an iterator pointing to the first element of the matrix. - * - * Note the discussion in the general documentation of this class about the - * order in which elements are accessed. - */ - const_iterator begin () const; + /** + * Return an iterator pointing to the first element of the matrix. + * + * Note the discussion in the general documentation of this class about the + * order in which elements are accessed. + */ + const_iterator begin () const; - /** - * Like the function above, but for non-const matrices. - */ - iterator begin (); - - /** - * Return an iterator pointing the element past the last one of - * this matrix. - */ - const_iterator end () const; + /** + * Like the function above, but for non-const matrices. + */ + iterator begin (); - /** - * Like the function above, but for non-const matrices. - */ - iterator end (); - - /** - * Return an iterator pointing to the first element of row @p r. - * - * Note that if the given row is empty, i.e. does not contain any - * nonzero entries, then the iterator returned by this function - * equals end(r). The returned iterator may not be - * dereferencable in that case if neither row @p r nor any of the - * following rows contain any nonzero entries. - */ - const_iterator begin (const size_type r) const; + /** + * Return an iterator pointing the element past the last one of + * this matrix. + */ + const_iterator end () const; - /** - * Like the function above, but for non-const matrices. - */ - iterator begin (const size_type r); + /** + * Like the function above, but for non-const matrices. + */ + iterator end (); - /** - * Return an iterator pointing the element past the last one of - * row @p r , or past the end of the entire sparsity pattern if - * none of the rows after @p r contain any entries at all. - * - * Note that the end iterator is not necessarily dereferencable. This is - * in particular the case if it is the end iterator for the last row of a - * matrix. - */ - const_iterator end (const size_type r) const; + /** + * Return an iterator pointing to the first element of row @p r. + * + * Note that if the given row is empty, i.e. does not contain any + * nonzero entries, then the iterator returned by this function + * equals end(r). The returned iterator may not be + * dereferencable in that case if neither row @p r nor any of the + * following rows contain any nonzero entries. + */ + const_iterator begin (const size_type r) const; - /** - * Like the function above, but for non-const matrices. - */ - iterator end (const size_type r); + /** + * Like the function above, but for non-const matrices. + */ + iterator begin (const size_type r); + + /** + * Return an iterator pointing the element past the last one of + * row @p r , or past the end of the entire sparsity pattern if + * none of the rows after @p r contain any entries at all. + * + * Note that the end iterator is not necessarily dereferencable. This is + * in particular the case if it is the end iterator for the last row of a + * matrix. + */ + const_iterator end (const size_type r) const; + + /** + * Like the function above, but for non-const matrices. + */ + iterator end (const size_type r); //@} /** * @name Input/Output diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index b0ec65344f..6e7614c588 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -1719,7 +1719,7 @@ namespace TrilinosWrappers * Like the function above, but for non-const matrices. */ iterator begin (); - + /** * Return an iterator pointing the element past the last one of * this matrix. @@ -1730,7 +1730,7 @@ namespace TrilinosWrappers * Like the function above, but for non-const matrices. */ iterator end (); - + /** * Return an iterator pointing to the first element of row @p r. * @@ -2147,8 +2147,8 @@ namespace TrilinosWrappers while ((accessor.a_row < accessor.matrix->m()) && ((accessor.matrix->in_local_range (accessor.a_row) == false) - || - (accessor.matrix->row_length(accessor.a_row) == 0))) + || + (accessor.matrix->row_length(accessor.a_row) == 0))) ++accessor.a_row; accessor.visit_present_row(); @@ -2257,8 +2257,8 @@ namespace TrilinosWrappers { Assert (r < m(), ExcIndexRange(r, 0, m())); if (in_local_range (r) - && - (row_length(r) > 0)) + && + (row_length(r) > 0)) return const_iterator(this, r, 0); else return end (r); @@ -2277,8 +2277,8 @@ namespace TrilinosWrappers // matrix for (size_type i=r+1; i 0)) + && + (row_length(i) > 0)) return const_iterator(this, i, 0); // if there is no such line, then take the @@ -2312,8 +2312,8 @@ namespace TrilinosWrappers { Assert (r < m(), ExcIndexRange(r, 0, m())); if (in_local_range (r) - && - (row_length(r) > 0)) + && + (row_length(r) > 0)) return iterator(this, r, 0); else return end (r); @@ -2332,8 +2332,8 @@ namespace TrilinosWrappers // matrix for (size_type i=r+1; i 0)) + && + (row_length(i) > 0)) return iterator(this, i, 0); // if there is no such line, then take the diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc index 78b09270d6..01b51235e6 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -121,8 +121,8 @@ namespace TrilinosWrappers // owned. this is simply going to make non-locally owned rows // look like they're empty if ((this->a_row == matrix->m()) - || - (matrix->in_local_range (this->a_row) == false)) + || + (matrix->in_local_range (this->a_row) == false)) { colnum_cache.reset (); value_cache.reset ();