From: Bruno Turcksin Date: Mon, 22 Jun 2020 13:27:18 +0000 (+0000) Subject: Replace macro with constexpr variable X-Git-Tag: v9.3.0-rc1~1314^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf1bc1f51cc89ed3f643bcf200027b91465115b1;p=dealii.git Replace macro with constexpr variable --- diff --git a/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h b/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h index 294d74a9bf..01a3ea6970 100644 --- a/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h +++ b/include/deal.II/matrix_free/cuda_hanging_nodes_internal.h @@ -20,6 +20,7 @@ #ifdef DEAL_II_COMPILER_CUDA_AWARE +# include # include # include @@ -103,10 +104,8 @@ namespace CUDAWrappers namespace internal { - // TODO: use a template parameter instead of a macro -# define DEAL_II_MAX_ELEM_DEGREE 10 - __constant__ double constraint_weights[(DEAL_II_MAX_ELEM_DEGREE + 1) * - (DEAL_II_MAX_ELEM_DEGREE + 1)]; + __constant__ double + constraint_weights[(mf_max_elem_degree + 1) * (mf_max_elem_degree + 1)]; // Here is the system for how we store constraint types in a binary mask. // This is not a complete contradiction-free system, i.e., there are