debug output for MGTransferPrebuilt

remove deprecated function call in mg_block_smoother.h

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

diff --git a/deal.II/include/deal.II/multigrid/mg_block_smoother.h b/deal.II/include/deal.II/multigrid/mg_block_smoother.h
index 6c5b41768b3e230e27ef17c1b68cc7d1ff06cd1c..688bfdf78b272221e45ec213057c3e72a6a1781a 100644 (file)
--- a/deal.II/include/deal.II/multigrid/mg_block_smoother.h
+++ b/deal.II/include/deal.II/multigrid/mg_block_smoother.h
@@ -287,7 +287,7 @@ MGSmootherBlock<MATRIX, RELAX, number>::smooth(
 {
   deallog.push("Smooth");
 
-  unsigned int maxlevel = matrices.get_maxlevel();
+  unsigned int maxlevel = matrices.max_level();
   unsigned int steps2 = steps;
 
   if (variable)

diff --git a/deal.II/include/deal.II/multigrid/mg_transfer.h b/deal.II/include/deal.II/multigrid/mg_transfer.h
index 612424573b9d71d29bcb1e74c2786f4f85ebe499..d938dab05a7c2552a5d2ed3151157e42814f23ab 100644 (file)
--- a/deal.II/include/deal.II/multigrid/mg_transfer.h
+++ b/deal.II/include/deal.II/multigrid/mg_transfer.h
@@ -217,14 +217,12 @@ public:
   set_component_to_block_map (const std::vector<unsigned int> &map);
 
   /**
-   * Finite element does not
-   * provide prolongation matrices.
+   * Finite element does not provide prolongation matrices.
    */
   DeclException0(ExcNoProlongation);
 
   /**
-   * Call @p build_matrices
-   * function first.
+   * You have to call build_matrices() before using this object.
    */
   DeclException0(ExcMatricesNotBuilt);
 
@@ -232,7 +230,11 @@ public:
    * Memory used by this object.
    */
   std::size_t memory_consumption () const;
-
+  
+  /**
+   * Print all the matrices for debugging purposes.
+   */
+  void print_matrices(std::ostream& os) const;
 
 private:
 

diff --git a/deal.II/source/multigrid/mg_transfer_prebuilt.cc b/deal.II/source/multigrid/mg_transfer_prebuilt.cc
index 754fc2158502b16e415fb37710dce283d7e52a87..4415dc60fdc3da81f92ca5696a82cd54d6689a16 100644 (file)
--- a/deal.II/source/multigrid/mg_transfer_prebuilt.cc
+++ b/deal.II/source/multigrid/mg_transfer_prebuilt.cc
@@ -336,6 +336,17 @@ void MGTransferPrebuilt<VECTOR>::build_matrices (
 }
 
 
+template <class VECTOR>
+void
+MGTransferPrebuilt<VECTOR>::print_matrices (std::ostream& os) const
+{
+  for (unsigned int level = 0;level<prolongation_matrices.size();++level)
+    {
+      os << "Level " << level << std::endl;
+      prolongation_matrices[level]->print(os);
+      os << std::endl;
+    }
+}
 
 
 // explicit instantiation