From: Jean-Paul Pelteret Date: Wed, 16 Aug 2017 08:57:57 +0000 (-0600) Subject: Generalised symmetric tensor scalar product on number type X-Git-Tag: v9.0.0-rc1~1196^2~10 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c91d8a3dd5fa01fcd9963ae44c2aa2187801b6;p=dealii.git Generalised symmetric tensor scalar product on number type --- diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h index 0531adadae..30efc6685f 100644 --- a/include/deal.II/base/symmetric_tensor.h +++ b/include/deal.II/base/symmetric_tensor.h @@ -3527,11 +3527,11 @@ operator / (const SymmetricTensor &t, * * @relates SymmetricTensor */ -template +template inline -Number -scalar_product (const SymmetricTensor<2,dim,Number> &t1, - const SymmetricTensor<2,dim,Number> &t2) +typename ProductType::type +scalar_product (const SymmetricTensor<2,dim,Number> &t1, + const SymmetricTensor<2,dim,OtherNumber> &t2) { return (t1*t2); } @@ -3546,11 +3546,11 @@ scalar_product (const SymmetricTensor<2,dim,Number> &t1, * * @relates Tensor @relates SymmetricTensor */ -template +template inline -Number +typename ProductType::type scalar_product (const SymmetricTensor<2,dim,Number> &t1, - const Tensor<2,dim,Number> &t2) + const Tensor<2,dim,OtherNumber> &t2) { Number s = 0; for (unsigned int i=0; i &t1, * * @relates Tensor @relates SymmetricTensor */ -template +template inline -Number -scalar_product (const Tensor<2,dim,Number> &t1, - const SymmetricTensor<2,dim,Number> &t2) +typename ProductType::type +scalar_product (const Tensor<2,dim,Number> &t1, + const SymmetricTensor<2,dim,OtherNumber> &t2) { return scalar_product(t2, t1); }