]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Move method that uses deprecated interface to cc file to avoid warnings in user code.
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Thu, 30 Jul 2015 10:52:29 +0000 (12:52 +0200)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Thu, 30 Jul 2015 11:54:44 +0000 (13:54 +0200)
include/deal.II/lac/trilinos_block_sparse_matrix.h
source/lac/trilinos_block_sparse_matrix.cc

index f4700f49e83d17f1e3b4b146efdd0f15a2287966..0db7629e8f33be95cd849d050fc15ddb02461634 100644 (file)
@@ -185,7 +185,7 @@ namespace TrilinosWrappers
      */
     void reinit (const std::vector<Epetra_Map>             &input_maps,
                  const ::dealii::BlockSparseMatrix<double> &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<Epetra_Map> domain_partitioner () const;
+    std::vector<Epetra_Map> 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<Epetra_Map> range_partitioner () const;
+    std::vector<Epetra_Map> range_partitioner () const DEAL_II_DEPRECATED;
 
 
     /**
@@ -430,38 +430,6 @@ namespace TrilinosWrappers
 
 
 
-  inline
-  std::vector<Epetra_Map>
-  BlockSparseMatrix::domain_partitioner () const
-  {
-    Assert (this->n_block_cols() != 0, ExcNotInitialized());
-    Assert (this->n_block_rows() != 0, ExcNotInitialized());
-
-    std::vector<Epetra_Map> 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<Epetra_Map>
-  BlockSparseMatrix::range_partitioner () const
-  {
-    Assert (this->n_block_cols() != 0, ExcNotInitialized());
-    Assert (this->n_block_rows() != 0, ExcNotInitialized());
-
-    std::vector<Epetra_Map> 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)
index ba41e6f268120f6ef36b2ab80572fa59a7a50342..fc8ebc21f6eac22ff79765cbc804356597ea7cbe 100644 (file)
@@ -380,6 +380,38 @@ namespace TrilinosWrappers
 
 
 
+  std::vector<Epetra_Map>
+  BlockSparseMatrix::domain_partitioner () const
+  {
+    Assert (this->n_block_cols() != 0, ExcNotInitialized());
+    Assert (this->n_block_rows() != 0, ExcNotInitialized());
+
+    std::vector<Epetra_Map> 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<Epetra_Map>
+  BlockSparseMatrix::range_partitioner () const
+  {
+    Assert (this->n_block_cols() != 0, ExcNotInitialized());
+    Assert (this->n_block_rows() != 0, ExcNotInitialized());
+
+    std::vector<Epetra_Map> 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 -----------------------

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.