From: guido Date: Sat, 5 Oct 2002 17:01:20 +0000 (+0000) Subject: syntax errors removed X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab5148607f0fbd1022538e236b10229c03508c2a;p=dealii-svn.git syntax errors removed git-svn-id: https://svn.dealii.org/trunk@6615 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/block_sparse_matrix_ez.h b/deal.II/lac/include/lac/block_sparse_matrix_ez.h index a2a4443320..7bbfaf00e1 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix_ez.h +++ b/deal.II/lac/include/lac/block_sparse_matrix_ez.h @@ -17,8 +17,10 @@ #include #include #include +#include #include #include +#include template class BlockVector; @@ -191,7 +193,7 @@ class BlockSparseMatrixEZ : public Subscriptor */ void set (const unsigned int i, const unsigned int j, - const number value); + const Number value); /** * Add @p{value} to the element @@ -202,7 +204,7 @@ class BlockSparseMatrixEZ : public Subscriptor * non-existent fields. */ void add (const unsigned int i, const unsigned int j, - const number value); + const Number value); /** @@ -276,50 +278,50 @@ class BlockSparseMatrixEZ : public Subscriptor /*----------------------------------------------------------------------*/ -template +template inline unsigned int -BlockSparseMatrixEZ::n_block_rows () const +BlockSparseMatrixEZ::n_block_rows () const { - return row_indices.size() + return row_indices.size(); } -template +template inline unsigned int -BlockSparseMatrixEZ::n_rows () const +BlockSparseMatrixEZ::n_rows () const { - return row_indices.total_size() + return row_indices.total_size(); } -template +template inline unsigned int -BlockSparseMatrixEZ::n_block_cols () const +BlockSparseMatrixEZ::n_block_cols () const { - return column_indices.size() + return column_indices.size(); } -template +template inline unsigned int -BlockSparseMatrixEZ::n_cols () const +BlockSparseMatrixEZ::n_cols () const { - return column_indices.total_size() + return column_indices.total_size(); } -template +template inline -SparseMatrixEZ & -BlockSparseMatrixEZ::block (const unsigned int row, +SparseMatrixEZ & +BlockSparseMatrixEZ::block (const unsigned int row, const unsigned int column) { Assert (row::block (const unsigned int row, -template +template inline -const SparseMatrixEZ & -BlockSparseMatrixEZ::block (const unsigned int row, +const SparseMatrixEZ & +BlockSparseMatrixEZ::block (const unsigned int row, const unsigned int column) const { Assert (row::block (const unsigned int row, -template +template inline unsigned int -BlockSparseMatrixEZ::m () const +BlockSparseMatrixEZ::m () const { return n_rows(); }; -template +template inline unsigned int -BlockSparseMatrixEZ::n () const +BlockSparseMatrixEZ::n () const { return n_cols(); }; -template +template inline void -BlockSparseMatrixEZ::set (const unsigned int i, +BlockSparseMatrixEZ::set (const unsigned int i, const unsigned int j, - const number value) + const Number value) { const std::pair row_index = row_indices.global_to_local (i), @@ -381,12 +383,12 @@ BlockSparseMatrixEZ::set (const unsigned int i, -template +template inline void -BlockSparseMatrixEZ::add (const unsigned int i, +BlockSparseMatrixEZ::add (const unsigned int i, const unsigned int j, - const number value) + const Number value) { const std::pair row_index = row_indices.global_to_local (i), @@ -397,10 +399,10 @@ BlockSparseMatrixEZ::add (const unsigned int i, }; -template +template template void -BlockSparseMatrixEZ::vmult (BlockVector &dst, +BlockSparseMatrixEZ::vmult (BlockVector &dst, const BlockVector &src) const { Assert (dst.n_blocks() == n_block_rows(), @@ -420,11 +422,12 @@ BlockSparseMatrixEZ::vmult (BlockVector &dst, -template +template template void -BlockSparseMatrix::vmult_add (BlockVector &dst, - const BlockVector &src) const +BlockSparseMatrixEZ::vmult_add ( + BlockVector &dst, + const BlockVector &src) const { Assert (dst.n_blocks() == n_block_rows(), ExcDimensionMismatch(dst.n_blocks(), n_block_rows())); @@ -442,11 +445,12 @@ BlockSparseMatrix::vmult_add (BlockVector &dst, -template +template template void -BlockSparseMatrix::Tvmult (BlockVector &dst, - const BlockVector& src) const +BlockSparseMatrixEZ::Tvmult ( + BlockVector &dst, + const BlockVector& src) const { Assert (dst.n_blocks() == n_block_cols(), ExcDimensionMismatch(dst.n_blocks(), n_block_cols())); @@ -465,11 +469,12 @@ BlockSparseMatrix::Tvmult (BlockVector &dst, -template +template template void -BlockSparseMatrix::Tvmult_add (BlockVector &dst, - const BlockVector &src) const +BlockSparseMatrixEZ::Tvmult_add ( + BlockVector &dst, + const BlockVector &src) const { Assert (dst.n_blocks() == n_block_cols(), ExcDimensionMismatch(dst.n_blocks(), n_block_cols()));