From c29f87e23055b43d3caa50fe4c2ba711593af528 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Wed, 23 Aug 2017 18:13:17 +0200 Subject: [PATCH] Modify tensor initialization to assist conversion between numbers types. --- include/deal.II/base/symmetric_tensor.h | 2 +- include/deal.II/base/tensor.h | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h index 18f17d1855..fe3816818c 100644 --- a/include/deal.II/base/symmetric_tensor.h +++ b/include/deal.II/base/symmetric_tensor.h @@ -999,7 +999,7 @@ SymmetricTensor:: SymmetricTensor (const SymmetricTensor &initializer) { for (unsigned int i=0; i::value(initializer.data[i]); } diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index 357ea704d0..443f60bbe1 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -628,6 +629,13 @@ namespace internal tmp=internal::NumberType >::value(t); return tmp; } + + static Tensor > value (const VectorizedArray &t) + { + Tensor > tmp; + tmp=t; + return tmp; + } }; } @@ -650,7 +658,7 @@ template inline Tensor<0,dim,Number>::Tensor (const OtherNumber &initializer) { - value = initializer; + value = internal::NumberType::value(initializer); } -- 2.39.5