MatrixFreeTools::compute_diagonal(): do not initialize vector

diff --git a/doc/news/changes/incompatibilities/20220201SchreterMunch b/doc/news/changes/incompatibilities/20220201SchreterMunch
new file mode 100644 (file)
index 0000000..1069f24
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20220201SchreterMunch
@@ -0,0 +1,7 @@
+Changed: The function MatrixFreeTools::compute_diagonal()
+does not initialize the output vector anymore. Users
+need to call MatrixFree:initialize_dof_vector() themselves.
+This change is required to be able to also support block
+vectors.
+<br>
+(Magdalena Schreter, Peter Munch, 2022/02/01)

diff --git a/include/deal.II/matrix_free/tools.h b/include/deal.II/matrix_free/tools.h
index ef1a1c5e1afc36cdf0bbcaac81a9cacec2de95b7..b8e608b08355fbababf4b741d9f9a05d8ceae6c8 100644 (file)
--- a/include/deal.II/matrix_free/tools.h
+++ b/include/deal.II/matrix_free/tools.h
@@ -795,9 +795,6 @@ namespace MatrixFreeTools
   {
     using VectorType = LinearAlgebra::distributed::Vector<Number>;
 
-    // initialize vector
-    matrix_free.initialize_dof_vector(diagonal_global, dof_no);
-
     int dummy = 0;
 
     matrix_free.template cell_loop<VectorType, int>(

diff --git a/tests/matrix_free/compute_diagonal_util.h b/tests/matrix_free/compute_diagonal_util.h
index 9f64e13871b4e2ff51d72c3f773d843a904f688d..e0da7eb7938f25034785ca5e8787b48e65a6d830 100644 (file)
--- a/tests/matrix_free/compute_diagonal_util.h
+++ b/tests/matrix_free/compute_diagonal_util.h
@@ -101,6 +101,7 @@ public:
     double error_local_1, error_local_2, error_global;
 
     {
+      matrix_free.initialize_dof_vector(diagonal_global);
       MatrixFreeTools::compute_diagonal<dim,
                                         fe_degree,
                                         n_points,
@@ -118,6 +119,7 @@ public:
 
     {
       VectorType diagonal_global;
+      matrix_free.initialize_dof_vector(diagonal_global);
       MatrixFreeTools::compute_diagonal(matrix_free,
                                         diagonal_global,
                                         &Test::cell_function,