From: Matthias Maier <tamiko@43-1.org>
Date: Thu, 17 Sep 2015 17:48:44 +0000 (-0500)
Subject: Rename double contraction "contract" to "double_contract"
X-Git-Tag: v8.4.0-rc2~385^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72f85e688bde4ccf1e585a97ad1336b04859b382;p=dealii.git

Rename double contraction "contract" to "double_contract"
---

diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 931377dc2e..c55abbfe00 100644
--- a/include/deal.II/base/tensor.h
+++ b/include/deal.II/base/tensor.h
@@ -1575,8 +1575,8 @@ template <int index_1, int index_2, int index_3, int index_4,
           typename Number, typename OtherNumber>
 inline
 typename Tensor<rank_1 + rank_2 - 4, dim, typename ProductType<Number, OtherNumber>::type>::tensor_type
-contract (const Tensor<rank_1, dim, Number> &src1,
-          const Tensor<rank_2, dim, OtherNumber> &src2)
+double_contract (const Tensor<rank_1, dim, Number> &src1,
+                 const Tensor<rank_2, dim, OtherNumber> &src2)
 {
   Assert(0 <= index_1 && index_1 < rank_1,
          ExcMessage("The specified index_1 must lie within the range [0,rank_1)"));
diff --git a/include/deal.II/base/tensor_deprecated.h b/include/deal.II/base/tensor_deprecated.h
index 646fe76d48..9d8c5687d3 100644
--- a/include/deal.II/base/tensor_deprecated.h
+++ b/include/deal.II/base/tensor_deprecated.h
@@ -44,7 +44,7 @@ DeclException1 (ExcInvalidTensorContractionIndex,
  * Double contract two tensors of rank 2, thus computing the Frobenius inner
  * product <tt>sum<sub>i,j</sub> src1[i][j]*src2[i][j]</tt>.
  *
- * @deprecated Use the contract function that takes indices as template
+ * @deprecated Use the double_contract function that takes indices as template
  *   arguments and returns its result instead.
  * @relates Tensor
  */
@@ -59,8 +59,8 @@ Number double_contract (const Tensor<2, dim, Number> &src1,
  * <tt>src2</tt>, creating a rank-2 tensor. This is the matrix-vector product
  * analog operation between tensors of rank 4 and rank 2.
  *
- * @deprecated Use the contract function that takes indices as template
- *   arguments and returns its result instead.
+ * @deprecated Use the double_contract function that takes indices as
+ *   template arguments and returns its result instead.
  * @relates Tensor
  */
 template <int dim, typename Number>