]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge pull request #13909 from peterrum/lex_faces_remove
authorMartin Kronbichler <martin.kronbichler@uni-a.de>
Fri, 10 Jun 2022 09:04:54 +0000 (11:04 +0200)
committerGitHub <noreply@github.com>
Fri, 10 Jun 2022 09:04:54 +0000 (11:04 +0200)
Remove lex_faces from matrix-free kernels

1  2 
include/deal.II/matrix_free/evaluation_kernels.h
include/deal.II/matrix_free/tensor_product_kernels.h

index 2404ad80c87ed497e78e3b0f337f2d757e1e0dca,7a21fcd1859d959a1b50bf101160cfb2c7e15962..a83591563dbe121c3ea28a5a9bcf30ee9b66b1e4
@@@ -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<unsigned int>(n_rows, face_direction) :
-                   (dim > 1 ? n_rows : 1);
-     constexpr int n_blocks2 =
-       lex_faces ? dealii::Utilities::pow<unsigned int>(
-                     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;
  

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.