From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Mon, 11 Jun 2018 16:50:31 +0000 (+0200)
Subject: Move helper functions into anonymous namespace
X-Git-Tag: v9.1.0-rc1~1050^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6742%2Fhead;p=dealii.git

Move helper functions into anonymous namespace
---

diff --git a/include/deal.II/lac/block_linear_operator.h b/include/deal.II/lac/block_linear_operator.h
index 6161d63049..f1b88f3965 100644
--- a/include/deal.II/lac/block_linear_operator.h
+++ b/include/deal.II/lac/block_linear_operator.h
@@ -347,216 +347,218 @@ public:
 
 
 
-namespace internal
+namespace
 {
-  namespace BlockLinearOperatorImplementation
+  // A helper function to apply a given vmult, or Tvmult to a vector with
+  // intermediate storage, similar to the corresponding helper
+  // function for LinearOperator. Here, two operators are used.
+  // The first one takes care of the first "column" and typically doesn't add.
+  // On the other hand, the second operator is normally an adding one.
+  template <typename Function1,
+            typename Function2,
+            typename Range,
+            typename Domain>
+  void
+  apply_with_intermediate_storage(const Function1 &first_op,
+                                  const Function2 &loop_op,
+                                  Range &          v,
+                                  const Domain &   u,
+                                  bool             add)
   {
-    // A helper function to apply a given vmult, or Tvmult to a vector with
-    // intermediate storage, similar to the corresponding helper
-    // function for LinearOperator. Here, two operators are used.
-    // The first one takes care of the first "column" and typically doesn't add.
-    // On the other hand, the second operator is normally an adding one.
-    template <typename Function1,
-              typename Function2,
-              typename Range,
-              typename Domain>
-    void
-    apply_with_intermediate_storage(const Function1 &first_op,
-                                    const Function2 &loop_op,
-                                    Range &          v,
-                                    const Domain &   u,
-                                    bool             add)
-    {
-      GrowingVectorMemory<Range> vector_memory;
+    GrowingVectorMemory<Range> vector_memory;
+
+    typename VectorMemory<Range>::Pointer tmp(vector_memory);
+    tmp->reinit(v, /*bool omit_zeroing_entries =*/true);
 
-      typename VectorMemory<Range>::Pointer tmp(vector_memory);
-      tmp->reinit(v, /*bool omit_zeroing_entries =*/true);
+    const unsigned int n = u.n_blocks();
+    const unsigned int m = v.n_blocks();
 
-      const unsigned int n = u.n_blocks();
-      const unsigned int m = v.n_blocks();
+    for (unsigned int i = 0; i < m; ++i)
+      {
+        first_op(*tmp, u, i, 0);
+        for (unsigned int j = 1; j < n; ++j)
+          loop_op(*tmp, u, i, j);
+      }
 
+    if (add)
+      v += *tmp;
+    else
+      v = *tmp;
+  }
+
+  // Populate the LinearOperator interfaces with the help of the
+  // BlockLinearOperator functions
+  template <typename Range, typename Domain, typename BlockPayload>
+  inline void
+  populate_linear_operator_functions(
+    dealii::BlockLinearOperator<Range, Domain, BlockPayload> &op)
+  {
+    op.reinit_range_vector = [=](Range &v, bool omit_zeroing_entries) {
+      const unsigned int m = op.n_block_rows();
+
+      // Reinitialize the block vector to m blocks:
+      v.reinit(m);
+
+      // And reinitialize every individual block with reinit_range_vectors:
       for (unsigned int i = 0; i < m; ++i)
+        op.block(i, 0).reinit_range_vector(v.block(i), omit_zeroing_entries);
+
+      v.collect_sizes();
+    };
+
+    op.reinit_domain_vector = [=](Domain &v, bool omit_zeroing_entries) {
+      const unsigned int n = op.n_block_cols();
+
+      // Reinitialize the block vector to n blocks:
+      v.reinit(n);
+
+      // And reinitialize every individual block with reinit_domain_vectors:
+      for (unsigned int i = 0; i < n; ++i)
+        op.block(0, i).reinit_domain_vector(v.block(i), omit_zeroing_entries);
+
+      v.collect_sizes();
+    };
+
+    op.vmult = [&op](Range &v, const Domain &u) {
+      const unsigned int m = op.n_block_rows();
+      const unsigned int n = op.n_block_cols();
+      Assert(v.n_blocks() == m, ExcDimensionMismatch(v.n_blocks(), m));
+      Assert(u.n_blocks() == n, ExcDimensionMismatch(u.n_blocks(), n));
+
+      if (PointerComparison::equal(&v, &u))
+        {
+          const auto first_op = [&op](Range &            v,
+                                      const Domain &     u,
+                                      const unsigned int i,
+                                      const unsigned int j) {
+            op.block(i, j).vmult(v.block(i), u.block(j));
+          };
+
+          const auto loop_op = [&op](Range &            v,
+                                     const Domain &     u,
+                                     const unsigned int i,
+                                     const unsigned int j) {
+            op.block(i, j).vmult_add(v.block(i), u.block(j));
+          };
+
+          apply_with_intermediate_storage(first_op, loop_op, v, u, false);
+        }
+      else
         {
-          first_op(*tmp, u, i, 0);
-          for (unsigned int j = 1; j < n; ++j)
-            loop_op(*tmp, u, i, j);
+          for (unsigned int i = 0; i < m; ++i)
+            {
+              op.block(i, 0).vmult(v.block(i), u.block(0));
+              for (unsigned int j = 1; j < n; ++j)
+                op.block(i, j).vmult_add(v.block(i), u.block(j));
+            }
         }
+    };
 
-      if (add)
-        v += *tmp;
+    op.vmult_add = [&op](Range &v, const Domain &u) {
+      const unsigned int m = op.n_block_rows();
+      const unsigned int n = op.n_block_cols();
+      Assert(v.n_blocks() == m, ExcDimensionMismatch(v.n_blocks(), m));
+      Assert(u.n_blocks() == n, ExcDimensionMismatch(u.n_blocks(), n));
+
+      if (PointerComparison::equal(&v, &u))
+        {
+          const auto first_op = [&op](Range &            v,
+                                      const Domain &     u,
+                                      const unsigned int i,
+                                      const unsigned int j) {
+            op.block(i, j).vmult(v.block(i), u.block(j));
+          };
+
+          const auto loop_op = [&op](Range &            v,
+                                     const Domain &     u,
+                                     const unsigned int i,
+                                     const unsigned int j) {
+            op.block(i, j).vmult_add(v.block(i), u.block(j));
+          };
+
+          apply_with_intermediate_storage(first_op, loop_op, v, u, true);
+        }
       else
-        v = *tmp;
-    }
-
-    // Populate the LinearOperator interfaces with the help of the
-    // BlockLinearOperator functions
-    template <typename Range, typename Domain, typename BlockPayload>
-    inline void
-    populate_linear_operator_functions(
-      dealii::BlockLinearOperator<Range, Domain, BlockPayload> &op)
-    {
-      op.reinit_range_vector = [=](Range &v, bool omit_zeroing_entries) {
-        const unsigned int m = op.n_block_rows();
-
-        // Reinitialize the block vector to m blocks:
-        v.reinit(m);
-
-        // And reinitialize every individual block with reinit_range_vectors:
-        for (unsigned int i = 0; i < m; ++i)
-          op.block(i, 0).reinit_range_vector(v.block(i), omit_zeroing_entries);
-
-        v.collect_sizes();
-      };
-
-      op.reinit_domain_vector = [=](Domain &v, bool omit_zeroing_entries) {
-        const unsigned int n = op.n_block_cols();
-
-        // Reinitialize the block vector to n blocks:
-        v.reinit(n);
-
-        // And reinitialize every individual block with reinit_domain_vectors:
-        for (unsigned int i = 0; i < n; ++i)
-          op.block(0, i).reinit_domain_vector(v.block(i), omit_zeroing_entries);
-
-        v.collect_sizes();
-      };
-
-      op.vmult = [&op](Range &v, const Domain &u) {
-        const unsigned int m = op.n_block_rows();
-        const unsigned int n = op.n_block_cols();
-        Assert(v.n_blocks() == m, ExcDimensionMismatch(v.n_blocks(), m));
-        Assert(u.n_blocks() == n, ExcDimensionMismatch(u.n_blocks(), n));
-
-        if (PointerComparison::equal(&v, &u))
-          {
-            const auto first_op = [&op](Range &            v,
-                                        const Domain &     u,
-                                        const unsigned int i,
-                                        const unsigned int j) {
-              op.block(i, j).vmult(v.block(i), u.block(j));
-            };
-
-            const auto loop_op = [&op](Range &            v,
-                                       const Domain &     u,
-                                       const unsigned int i,
-                                       const unsigned int j) {
-              op.block(i, j).vmult_add(v.block(i), u.block(j));
-            };
-
-            apply_with_intermediate_storage(first_op, loop_op, v, u, false);
-          }
-        else
-          {
-            for (unsigned int i = 0; i < m; ++i)
-              {
-                op.block(i, 0).vmult(v.block(i), u.block(0));
-                for (unsigned int j = 1; j < n; ++j)
-                  op.block(i, j).vmult_add(v.block(i), u.block(j));
-              }
-          }
-      };
-
-      op.vmult_add = [&op](Range &v, const Domain &u) {
-        const unsigned int m = op.n_block_rows();
-        const unsigned int n = op.n_block_cols();
-        Assert(v.n_blocks() == m, ExcDimensionMismatch(v.n_blocks(), m));
-        Assert(u.n_blocks() == n, ExcDimensionMismatch(u.n_blocks(), n));
-
-        if (PointerComparison::equal(&v, &u))
-          {
-            const auto first_op = [&op](Range &            v,
-                                        const Domain &     u,
-                                        const unsigned int i,
-                                        const unsigned int j) {
-              op.block(i, j).vmult(v.block(i), u.block(j));
-            };
-
-            const auto loop_op = [&op](Range &            v,
-                                       const Domain &     u,
-                                       const unsigned int i,
-                                       const unsigned int j) {
+        {
+          for (unsigned int i = 0; i < m; ++i)
+            for (unsigned int j = 0; j < n; ++j)
               op.block(i, j).vmult_add(v.block(i), u.block(j));
-            };
-
-            apply_with_intermediate_storage(first_op, loop_op, v, u, true);
-          }
-        else
-          {
-            for (unsigned int i = 0; i < m; ++i)
-              for (unsigned int j = 0; j < n; ++j)
-                op.block(i, j).vmult_add(v.block(i), u.block(j));
-          }
-      };
-
-      op.Tvmult = [&op](Domain &v, const Range &u) {
-        const unsigned int n = op.n_block_cols();
-        const unsigned int m = op.n_block_rows();
-        Assert(v.n_blocks() == n, ExcDimensionMismatch(v.n_blocks(), n));
-        Assert(u.n_blocks() == m, ExcDimensionMismatch(u.n_blocks(), m));
-
-        if (PointerComparison::equal(&v, &u))
-          {
-            const auto first_op = [&op](Range &            v,
-                                        const Domain &     u,
-                                        const unsigned int i,
-                                        const unsigned int j) {
-              op.block(j, i).Tvmult(v.block(i), u.block(j));
-            };
-
-            const auto loop_op = [&op](Range &            v,
-                                       const Domain &     u,
-                                       const unsigned int i,
-                                       const unsigned int j) {
-              op.block(j, i).Tvmult_add(v.block(i), u.block(j));
-            };
-
-            apply_with_intermediate_storage(first_op, loop_op, v, u, false);
-          }
-        else
-          {
-            for (unsigned int i = 0; i < n; ++i)
-              {
-                op.block(0, i).Tvmult(v.block(i), u.block(0));
-                for (unsigned int j = 1; j < m; ++j)
-                  op.block(j, i).Tvmult_add(v.block(i), u.block(j));
-              }
-          }
-      };
-
-      op.Tvmult_add = [&op](Domain &v, const Range &u) {
-        const unsigned int n = op.n_block_cols();
-        const unsigned int m = op.n_block_rows();
-        Assert(v.n_blocks() == n, ExcDimensionMismatch(v.n_blocks(), n));
-        Assert(u.n_blocks() == m, ExcDimensionMismatch(u.n_blocks(), m));
-
-        if (PointerComparison::equal(&v, &u))
-          {
-            const auto first_op = [&op](Range &            v,
-                                        const Domain &     u,
-                                        const unsigned int i,
-                                        const unsigned int j) {
-              op.block(j, i).Tvmult(v.block(i), u.block(j));
-            };
-
-            const auto loop_op = [&op](Range &            v,
-                                       const Domain &     u,
-                                       const unsigned int i,
-                                       const unsigned int j) {
-              op.block(j, i).Tvmult_add(v.block(i), u.block(j));
-            };
-
-            apply_with_intermediate_storage(first_op, loop_op, v, u, true);
-          }
-        else
-          {
-            for (unsigned int i = 0; i < n; ++i)
-              for (unsigned int j = 0; j < m; ++j)
+        }
+    };
+
+    op.Tvmult = [&op](Domain &v, const Range &u) {
+      const unsigned int n = op.n_block_cols();
+      const unsigned int m = op.n_block_rows();
+      Assert(v.n_blocks() == n, ExcDimensionMismatch(v.n_blocks(), n));
+      Assert(u.n_blocks() == m, ExcDimensionMismatch(u.n_blocks(), m));
+
+      if (PointerComparison::equal(&v, &u))
+        {
+          const auto first_op = [&op](Range &            v,
+                                      const Domain &     u,
+                                      const unsigned int i,
+                                      const unsigned int j) {
+            op.block(j, i).Tvmult(v.block(i), u.block(j));
+          };
+
+          const auto loop_op = [&op](Range &            v,
+                                     const Domain &     u,
+                                     const unsigned int i,
+                                     const unsigned int j) {
+            op.block(j, i).Tvmult_add(v.block(i), u.block(j));
+          };
+
+          apply_with_intermediate_storage(first_op, loop_op, v, u, false);
+        }
+      else
+        {
+          for (unsigned int i = 0; i < n; ++i)
+            {
+              op.block(0, i).Tvmult(v.block(i), u.block(0));
+              for (unsigned int j = 1; j < m; ++j)
                 op.block(j, i).Tvmult_add(v.block(i), u.block(j));
-          }
-      };
-    }
+            }
+        }
+    };
+
+    op.Tvmult_add = [&op](Domain &v, const Range &u) {
+      const unsigned int n = op.n_block_cols();
+      const unsigned int m = op.n_block_rows();
+      Assert(v.n_blocks() == n, ExcDimensionMismatch(v.n_blocks(), n));
+      Assert(u.n_blocks() == m, ExcDimensionMismatch(u.n_blocks(), m));
 
+      if (PointerComparison::equal(&v, &u))
+        {
+          const auto first_op = [&op](Range &            v,
+                                      const Domain &     u,
+                                      const unsigned int i,
+                                      const unsigned int j) {
+            op.block(j, i).Tvmult(v.block(i), u.block(j));
+          };
+
+          const auto loop_op = [&op](Range &            v,
+                                     const Domain &     u,
+                                     const unsigned int i,
+                                     const unsigned int j) {
+            op.block(j, i).Tvmult_add(v.block(i), u.block(j));
+          };
+
+          apply_with_intermediate_storage(first_op, loop_op, v, u, true);
+        }
+      else
+        {
+          for (unsigned int i = 0; i < n; ++i)
+            for (unsigned int j = 0; j < m; ++j)
+              op.block(j, i).Tvmult_add(v.block(i), u.block(j));
+        }
+    };
+  }
+} // namespace
 
+namespace internal
+{
+  namespace BlockLinearOperatorImplementation
+  {
     /**
      * A dummy class for BlockLinearOperators that do not require any
      * extensions to facilitate the operations of the block matrix or its
@@ -646,8 +648,7 @@ block_operator(const BlockMatrixType &block_matrix)
     return BlockType(block_matrix.block(i, j));
   };
 
-  internal::BlockLinearOperatorImplementation::
-    populate_linear_operator_functions(return_op);
+  populate_linear_operator_functions(return_op);
   return return_op;
 }
 
@@ -714,8 +715,7 @@ block_operator(
     return ops[i][j];
   };
 
-  internal::BlockLinearOperatorImplementation::
-    populate_linear_operator_functions(return_op);
+  populate_linear_operator_functions(return_op);
   return return_op;
 }
 
@@ -772,8 +772,7 @@ block_diagonal_operator(const BlockMatrixType &block_matrix)
       return null_operator(BlockType(block_matrix.block(i, j)));
   };
 
-  internal::BlockLinearOperatorImplementation::
-    populate_linear_operator_functions(return_op);
+  populate_linear_operator_functions(return_op);
   return return_op;
 }