Remove a few deprecation warnings.

git-svn-id: https://svn.dealii.org/trunk@28233 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/source/lac/block_sparsity_pattern.cc b/deal.II/source/lac/block_sparsity_pattern.cc
index c8cdd9d5fef90d56d3ae5046be33f936f23c47d2..f4fbb0d9e868c94d9a60b3581aa9422031721ec0 100644 (file)
--- a/deal.II/source/lac/block_sparsity_pattern.cc
+++ b/deal.II/source/lac/block_sparsity_pattern.cc
@@ -372,7 +372,7 @@ BlockSparsityPattern::reinit(
 
         if (row_lengths[j].size()==1)
           block(i,j).reinit(rows.block_size(i),
-                            cols.block_size(j), row_lengths[j][0], i==j);
+                            cols.block_size(j), row_lengths[j][0]);
         else
           {
             VectorSlice<const std::vector<unsigned int> >

diff --git a/deal.II/source/lac/trilinos_sparse_matrix.cc b/deal.II/source/lac/trilinos_sparse_matrix.cc
index f869eaa15a203e6b8645778e93c6fd674ad57a64..821d2fbac49e575002790267c5a11b057670d56b 100644 (file)
--- a/deal.II/source/lac/trilinos_sparse_matrix.cc
+++ b/deal.II/source/lac/trilinos_sparse_matrix.cc
@@ -614,12 +614,9 @@ namespace TrilinosWrappers
           typename ::dealii::SparseMatrix<number>::const_iterator it =
             dealii_sparse_matrix.begin(row);
           unsigned int col = 0;
-          if (sparsity_pattern.optimize_diagonal())
+          if (sparsity_pattern.n_rows() == sparsity_pattern.n_cols())
             {
-              Assert(dealii_sparse_matrix.get_sparsity_pattern().optimize_diagonal(),
-                     ExcMessage("If the manual sparsity pattern optimizes the "
-                                "diagonal, the deal.II matrix must optimize it,"
-                                " too. And vice versa."));
+              // optimized diagonal
               AssertDimension(it->column(), row);
               if (std::fabs(it->value()) > drop_tolerance)
                {