From: Daniel Garcia-Sanchez Date: Sat, 22 Jun 2019 07:08:29 +0000 (+0200) Subject: Add cross_product_3d between std::complex and number X-Git-Tag: v9.2.0-rc1~1425^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d3068870d7b79ca652aac3ca65f2005f5c2d564;p=dealii.git Add cross_product_3d between std::complex and number --- diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index f6690804b3..d0a350fc8d 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -2095,14 +2095,15 @@ inline DEAL_II_ALWAYS_INLINE Tensor<1, dim, Number> * @relatesalso Tensor * @author Guido Kanschat, 2001 */ -template -inline DEAL_II_ALWAYS_INLINE Tensor<1, dim, Number> - cross_product_3d(const Tensor<1, dim, Number> &src1, - const Tensor<1, dim, Number> &src2) +template +inline DEAL_II_ALWAYS_INLINE + Tensor<1, dim, typename ProductType::type> + cross_product_3d(const Tensor<1, dim, Number1> &src1, + const Tensor<1, dim, Number2> &src2) { Assert(dim == 3, ExcInternalError()); - Tensor<1, dim, Number> result; + Tensor<1, dim, typename ProductType::type> result; result[0] = src1[1] * src2[2] - src1[2] * src2[1]; result[1] = src1[2] * src2[0] - src1[0] * src2[2];