From 911cedb62a033e8c45488335b89ee54170547b68 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 15 Sep 2015 15:33:16 -0500 Subject: [PATCH] Do not use "contract" in the tests. --- source/fe/mapping_fe_field.cc | 3 ++- source/fe/mapping_q1.cc | 4 ++-- tests/base/tensor.cc | 2 +- tests/base/tensor_complex.cc | 2 +- tests/base/tensor_float.cc | 2 +- tests/codim_one/gradients.cc | 6 ++---- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc index 15deaa1aa7..8460d67c5e 100644 --- a/source/fe/mapping_fe_field.cc +++ b/source/fe/mapping_fe_field.cc @@ -1785,7 +1785,8 @@ transform_real_to_unit_cell_internal df[j][l] = -DF[j] * DF[l]; } // Solve [f'(x)]d=f(x) - Tensor<1, dim> delta = invert(df) * static_cast&>(f); + const Tensor<1, dim> delta = + invert(df) * static_cast &>(f); // do a line search double step_length = 1; do diff --git a/source/fe/mapping_q1.cc b/source/fe/mapping_q1.cc index 4e6e0a69fc..6f4cfe9b86 100644 --- a/source/fe/mapping_q1.cc +++ b/source/fe/mapping_q1.cc @@ -607,8 +607,8 @@ transform_real_to_unit_cell_internal // Solve [f'(x)]d=f(x) Tensor<2,spacedim> df_inverse = invert(df); - Tensor<1, spacedim> delta = - df_inverse * static_cast &>(f); + const Tensor<1, spacedim> delta = + df_inverse * static_cast &>(f); #ifdef DEBUG_TRANSFORM_REAL_TO_UNIT_CELL std::cout << " delta=" << delta << std::endl; diff --git a/tests/base/tensor.cc b/tests/base/tensor.cc index c230cf1089..fb2b32301c 100644 --- a/tests/base/tensor.cc +++ b/tests/base/tensor.cc @@ -56,7 +56,7 @@ int main () deallog << std::endl; }; - contract (tt,t,t); + tt = t * t; deallog << "tt=" << std::endl; for (unsigned int i=0; i