From 206d81dd3726d12bb6a3e5de354b954bf4feb737 Mon Sep 17 00:00:00 2001 From: David Wells Date: Tue, 13 Aug 2024 16:03:46 -0600 Subject: [PATCH] TensorProductPolynomials: remove some reinterpret_casts. --- .../deal.II/base/tensor_product_polynomials.h | 150 +++++++++--------- 1 file changed, 71 insertions(+), 79 deletions(-) diff --git a/include/deal.II/base/tensor_product_polynomials.h b/include/deal.II/base/tensor_product_polynomials.h index e16b6fa584..c535fefbfd 100644 --- a/include/deal.II/base/tensor_product_polynomials.h +++ b/include/deal.II/base/tensor_product_polynomials.h @@ -592,36 +592,78 @@ TensorProductPolynomials::compute_derivative( } } - Tensor derivative; - switch (order) + if constexpr (order == 1) { - case 1: + Tensor<1, dim> derivative; + for (unsigned int d = 0; d < dim; ++d) { - Tensor<1, dim> &derivative_1 = - *reinterpret_cast *>(&derivative); - for (unsigned int d = 0; d < dim; ++d) + derivative[d] = 1.; + for (unsigned int x = 0; x < dim; ++x) { - derivative_1[d] = 1.; + unsigned int x_order = 0; + if (d == x) + ++x_order; + + derivative[d] *= v[x][x_order]; + } + } + + return derivative; + } + else if constexpr (order == 2) + { + Tensor<2, dim> derivative; + for (unsigned int d1 = 0; d1 < dim; ++d1) + for (unsigned int d2 = 0; d2 < dim; ++d2) + { + derivative[d1][d2] = 1.; + for (unsigned int x = 0; x < dim; ++x) + { + unsigned int x_order = 0; + if (d1 == x) + ++x_order; + if (d2 == x) + ++x_order; + + derivative[d1][d2] *= v[x][x_order]; + } + } + + return derivative; + } + else if constexpr (order == 3) + { + Tensor<3, dim> derivative; + for (unsigned int d1 = 0; d1 < dim; ++d1) + for (unsigned int d2 = 0; d2 < dim; ++d2) + for (unsigned int d3 = 0; d3 < dim; ++d3) + { + derivative[d1][d2][d3] = 1.; for (unsigned int x = 0; x < dim; ++x) { unsigned int x_order = 0; - if (d == x) + if (d1 == x) + ++x_order; + if (d2 == x) + ++x_order; + if (d3 == x) ++x_order; - derivative_1[d] *= v[x][x_order]; + derivative[d1][d2][d3] *= v[x][x_order]; } } - return derivative; - } - case 2: - { - Tensor<2, dim> &derivative_2 = - *reinterpret_cast *>(&derivative); - for (unsigned int d1 = 0; d1 < dim; ++d1) - for (unsigned int d2 = 0; d2 < dim; ++d2) + return derivative; + } + else if constexpr (order == 4) + { + Tensor<4, dim> derivative; + for (unsigned int d1 = 0; d1 < dim; ++d1) + for (unsigned int d2 = 0; d2 < dim; ++d2) + for (unsigned int d3 = 0; d3 < dim; ++d3) + for (unsigned int d4 = 0; d4 < dim; ++d4) { - derivative_2[d1][d2] = 1.; + derivative[d1][d2][d3][d4] = 1.; for (unsigned int x = 0; x < dim; ++x) { unsigned int x_order = 0; @@ -629,71 +671,21 @@ TensorProductPolynomials::compute_derivative( ++x_order; if (d2 == x) ++x_order; + if (d3 == x) + ++x_order; + if (d4 == x) + ++x_order; - derivative_2[d1][d2] *= v[x][x_order]; + derivative[d1][d2][d3][d4] *= v[x][x_order]; } } - return derivative; - } - case 3: - { - Tensor<3, dim> &derivative_3 = - *reinterpret_cast *>(&derivative); - for (unsigned int d1 = 0; d1 < dim; ++d1) - for (unsigned int d2 = 0; d2 < dim; ++d2) - for (unsigned int d3 = 0; d3 < dim; ++d3) - { - derivative_3[d1][d2][d3] = 1.; - for (unsigned int x = 0; x < dim; ++x) - { - unsigned int x_order = 0; - if (d1 == x) - ++x_order; - if (d2 == x) - ++x_order; - if (d3 == x) - ++x_order; - - derivative_3[d1][d2][d3] *= v[x][x_order]; - } - } - - return derivative; - } - case 4: - { - Tensor<4, dim> &derivative_4 = - *reinterpret_cast *>(&derivative); - for (unsigned int d1 = 0; d1 < dim; ++d1) - for (unsigned int d2 = 0; d2 < dim; ++d2) - for (unsigned int d3 = 0; d3 < dim; ++d3) - for (unsigned int d4 = 0; d4 < dim; ++d4) - { - derivative_4[d1][d2][d3][d4] = 1.; - for (unsigned int x = 0; x < dim; ++x) - { - unsigned int x_order = 0; - if (d1 == x) - ++x_order; - if (d2 == x) - ++x_order; - if (d3 == x) - ++x_order; - if (d4 == x) - ++x_order; - - derivative_4[d1][d2][d3][d4] *= v[x][x_order]; - } - } - - return derivative; - } - default: - { - DEAL_II_NOT_IMPLEMENTED(); - return derivative; - } + return derivative; + } + else + { + DEAL_II_NOT_IMPLEMENTED(); + return {}; } } -- 2.39.5