From: Martin Kronbichler Date: Fri, 10 Jun 2022 09:04:54 +0000 (+0200) Subject: Merge pull request #13909 from peterrum/lex_faces_remove X-Git-Tag: v9.4.0-rc1~41 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3abca26803cc64286441eb04c5c1bef3d79476e6;p=dealii.git Merge pull request #13909 from peterrum/lex_faces_remove Remove lex_faces from matrix-free kernels --- 3abca26803cc64286441eb04c5c1bef3d79476e6 diff --cc include/deal.II/matrix_free/tensor_product_kernels.h index 2404ad80c8,7a21fcd185..a83591563d --- a/include/deal.II/matrix_free/tensor_product_kernels.h +++ b/include/deal.II/matrix_free/tensor_product_kernels.h @@@ -468,16 -459,11 +460,11 @@@ namespace interna ExcMessage( "The given array shape_values must not be the null pointer.")); - constexpr int n_blocks1 = - lex_faces ? dealii::Utilities::pow(n_rows, face_direction) : - (dim > 1 ? n_rows : 1); - constexpr int n_blocks2 = - lex_faces ? dealii::Utilities::pow( - n_rows, std::max(dim - face_direction - 1, 0)) : - (dim > 2 ? n_rows : 1); + constexpr int n_blocks1 = (dim > 1 ? n_rows : 1); + constexpr int n_blocks2 = (dim > 2 ? n_rows : 1); AssertIndexRange(face_direction, dim); - constexpr int stride = Utilities::pow(n_rows, face_direction); + constexpr int in_stride = Utilities::pow(n_rows, face_direction); constexpr int out_stride = Utilities::pow(n_rows, dim - 1); const Number *DEAL_II_RESTRICT shape_values = this->shape_values;