From 72f85e688bde4ccf1e585a97ad1336b04859b382 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 17 Sep 2015 12:48:44 -0500 Subject: [PATCH] Rename double contraction "contract" to "double_contract" --- include/deal.II/base/tensor.h | 4 ++-- include/deal.II/base/tensor_deprecated.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 inline typename Tensor::type>::tensor_type -contract (const Tensor &src1, - const Tensor &src2) +double_contract (const Tensor &src1, + const Tensor &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 sumi,j src1[i][j]*src2[i][j]. * - * @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, * src2, 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 -- 2.39.5