From 78d8b2ef8ce064275ca198953a0c58f6ca9fb86c Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sat, 11 May 2019 21:54:20 +0200 Subject: [PATCH] Add ExpressionType template parameter to tensor add_to_substitution_map() --- .../sd/symengine_tensor_operations.h | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/include/deal.II/differentiation/sd/symengine_tensor_operations.h b/include/deal.II/differentiation/sd/symengine_tensor_operations.h index a572f950a0..1014db2038 100644 --- a/include/deal.II/differentiation/sd/symengine_tensor_operations.h +++ b/include/deal.II/differentiation/sd/symengine_tensor_operations.h @@ -555,11 +555,13 @@ namespace Differentiation template void - add_to_substitution_map(types::substitution_map &substitution_map, - const Tensor &symbol_tensor, - const Tensor & value_tensor); + add_to_substitution_map( + types::substitution_map & substitution_map, + const Tensor &symbol_tensor, + const Tensor & value_tensor); /** * A convenience function for adding an entry to the @p substitution_map. @@ -578,12 +580,13 @@ namespace Differentiation template void add_to_substitution_map( - types::substitution_map & substitution_map, - const SymmetricTensor &symbol_tensor, - const SymmetricTensor & value_tensor); + types::substitution_map & substitution_map, + const SymmetricTensor &symbol_tensor, + const SymmetricTensor & value_tensor); //@} @@ -1122,12 +1125,12 @@ namespace Differentiation int dim, typename ValueType, template class TensorType> - std::vector> + std::vector> tensor_substitution_map( - const TensorType &symbol_tensor, - const TensorType & value_tensor) + const TensorType &symbol_tensor, + const TensorType & value_tensor) { - std::vector> symbol_values; + std::vector> symbol_values; for (unsigned int i = 0; i < symbol_tensor.n_independent_components; ++i) { @@ -1140,13 +1143,13 @@ namespace Differentiation } - template - std::vector> + template + std::vector> tensor_substitution_map( - const SymmetricTensor<4, dim, Expression> &symbol_tensor, - const SymmetricTensor<4, dim, ValueType> & value_tensor) + const SymmetricTensor<4, dim, ExpressionType> &symbol_tensor, + const SymmetricTensor<4, dim, ValueType> & value_tensor) { - std::vector> symbol_values; + std::vector> symbol_values; for (unsigned int i = 0; i < SymmetricTensor<2, dim>::n_independent_components; ++i) @@ -1167,11 +1170,13 @@ namespace Differentiation template void - add_to_substitution_map(types::substitution_map &substitution_map, - const Tensor &symbol_tensor, - const Tensor & value_tensor) + add_to_substitution_map( + types::substitution_map & substitution_map, + const Tensor &symbol_tensor, + const Tensor & value_tensor) { add_to_substitution_map( substitution_map, @@ -1182,12 +1187,13 @@ namespace Differentiation template void add_to_substitution_map( - types::substitution_map & substitution_map, - const SymmetricTensor &symbol_tensor, - const SymmetricTensor & value_tensor) + types::substitution_map & substitution_map, + const SymmetricTensor &symbol_tensor, + const SymmetricTensor & value_tensor) { add_to_substitution_map( substitution_map, -- 2.39.5