From: Martin Kronbichler Date: Thu, 30 Jul 2015 10:52:29 +0000 (+0200) Subject: Move method that uses deprecated interface to cc file to avoid warnings in user code. X-Git-Tag: v8.4.0-rc2~699^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae3424349915a840da403e63ea889d071c330791;p=dealii.git Move method that uses deprecated interface to cc file to avoid warnings in user code. --- diff --git a/include/deal.II/lac/trilinos_block_sparse_matrix.h b/include/deal.II/lac/trilinos_block_sparse_matrix.h index f4700f49e8..0db7629e8f 100644 --- a/include/deal.II/lac/trilinos_block_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_block_sparse_matrix.h @@ -185,7 +185,7 @@ namespace TrilinosWrappers */ void reinit (const std::vector &input_maps, const ::dealii::BlockSparseMatrix &deal_ii_sparse_matrix, - const double drop_tolerance=1e-13); + const double drop_tolerance=1e-13) DEAL_II_DEPRECATED; /** * This function initializes the Trilinos matrix using the deal.II sparse @@ -229,7 +229,7 @@ namespace TrilinosWrappers * partitioning of the individual block vectors this matrix has to be * multiplied with. */ - std::vector domain_partitioner () const; + std::vector domain_partitioner () const DEAL_II_DEPRECATED; /** * Return a vector of the underlying Trilinos Epetra_Map that sets the @@ -237,7 +237,7 @@ namespace TrilinosWrappers * partitioning of the individual block vectors that are the result from * matrix-vector products. */ - std::vector range_partitioner () const; + std::vector range_partitioner () const DEAL_II_DEPRECATED; /** @@ -430,38 +430,6 @@ namespace TrilinosWrappers - inline - std::vector - BlockSparseMatrix::domain_partitioner () const - { - Assert (this->n_block_cols() != 0, ExcNotInitialized()); - Assert (this->n_block_rows() != 0, ExcNotInitialized()); - - std::vector domain_partitioner; - for (size_type c = 0; c < this->n_block_cols(); ++c) - domain_partitioner.push_back(this->sub_objects[0][c]->domain_partitioner()); - - return domain_partitioner; - } - - - - inline - std::vector - BlockSparseMatrix::range_partitioner () const - { - Assert (this->n_block_cols() != 0, ExcNotInitialized()); - Assert (this->n_block_rows() != 0, ExcNotInitialized()); - - std::vector range_partitioner; - for (size_type r = 0; r < this->n_block_rows(); ++r) - range_partitioner.push_back(this->sub_objects[r][0]->range_partitioner()); - - return range_partitioner; - } - - - inline BlockSparseMatrix & BlockSparseMatrix::operator = (const double d) diff --git a/source/lac/trilinos_block_sparse_matrix.cc b/source/lac/trilinos_block_sparse_matrix.cc index ba41e6f268..fc8ebc21f6 100644 --- a/source/lac/trilinos_block_sparse_matrix.cc +++ b/source/lac/trilinos_block_sparse_matrix.cc @@ -380,6 +380,38 @@ namespace TrilinosWrappers + std::vector + BlockSparseMatrix::domain_partitioner () const + { + Assert (this->n_block_cols() != 0, ExcNotInitialized()); + Assert (this->n_block_rows() != 0, ExcNotInitialized()); + + std::vector domain_partitioner; + for (size_type c = 0; c < this->n_block_cols(); ++c) + domain_partitioner.push_back(this->sub_objects[0][c]->domain_partitioner()); + + return domain_partitioner; + } + + + + std::vector + BlockSparseMatrix::range_partitioner () const + { + Assert (this->n_block_cols() != 0, ExcNotInitialized()); + Assert (this->n_block_rows() != 0, ExcNotInitialized()); + + std::vector range_partitioner; + for (size_type r = 0; r < this->n_block_rows(); ++r) + range_partitioner.push_back(this->sub_objects[r][0]->range_partitioner()); + + return range_partitioner; + } + + + + + // -------------------- explicit instantiations -----------------------