From 90a08e53730c58fa9d1d19fb1675f35274079aa0 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 29 Oct 2017 11:38:37 +0100 Subject: [PATCH] Replace static const by static constexpr in FEEValuation --- include/deal.II/matrix_free/fe_evaluation.h | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index c8a728fe24..571291efdd 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -85,8 +85,8 @@ public: typedef Number number_type; typedef Tensor<1,n_components_,VectorizedArray > value_type; typedef Tensor<1,n_components_,Tensor<1,dim,VectorizedArray > > gradient_type; - static const unsigned int dimension = dim; - static const unsigned int n_components = n_components_; + static constexpr unsigned int dimension = dim; + static constexpr unsigned int n_components = n_components_; /** * @name 1: General operations @@ -974,8 +974,8 @@ public: typedef Number number_type; typedef Tensor<1,n_components_,VectorizedArray > value_type; typedef Tensor<1,n_components_,Tensor<1,dim,VectorizedArray > > gradient_type; - static const unsigned int dimension = dim; - static const unsigned int n_components = n_components_; + static constexpr unsigned int dimension = dim; + static constexpr unsigned int n_components = n_components_; typedef FEEvaluationBase BaseClass; protected: @@ -1033,7 +1033,7 @@ public: typedef Number number_type; typedef VectorizedArray value_type; typedef Tensor<1,dim,VectorizedArray > gradient_type; - static const unsigned int dimension = dim; + static constexpr unsigned int dimension = dim; typedef FEEvaluationBase BaseClass; /** @copydoc FEEvaluationBase::get_dof_value() @@ -1135,8 +1135,8 @@ public: typedef Number number_type; typedef Tensor<1,dim,VectorizedArray > value_type; typedef Tensor<2,dim,VectorizedArray > gradient_type; - static const unsigned int dimension = dim; - static const unsigned int n_components = dim; + static constexpr unsigned int dimension = dim; + static constexpr unsigned int n_components = dim; typedef FEEvaluationBase BaseClass; /** @copydoc FEEvaluationBase::get_gradient() @@ -1273,7 +1273,7 @@ public: typedef Number number_type; typedef VectorizedArray value_type; typedef Tensor<1,1,VectorizedArray > gradient_type; - static const unsigned int dimension = 1; + static constexpr unsigned int dimension = 1; typedef FEEvaluationBase<1,1,Number> BaseClass; /** @copydoc FEEvaluationBase<1,1,Number>::get_dof_value() @@ -1910,12 +1910,12 @@ public: typedef Number number_type; typedef typename BaseClass::value_type value_type; typedef typename BaseClass::gradient_type gradient_type; - static const unsigned int dimension = dim; - static const unsigned int n_components = n_components_; - static const unsigned int static_n_q_points = Utilities::fixed_int_power::value; - static const unsigned int static_dofs_per_component = Utilities::fixed_int_power::value; - static const unsigned int tensor_dofs_per_cell = static_dofs_per_component *n_components; - static const unsigned int static_dofs_per_cell = static_dofs_per_component *n_components; + static constexpr unsigned int dimension = dim; + static constexpr unsigned int n_components = n_components_; + static constexpr unsigned int static_n_q_points = Utilities::fixed_int_power::value; + static constexpr unsigned int static_dofs_per_component = Utilities::fixed_int_power::value; + static constexpr unsigned int tensor_dofs_per_cell = static_dofs_per_component *n_components; + static constexpr unsigned int static_dofs_per_cell = static_dofs_per_component *n_components; /** * Constructor. Takes all data stored in MatrixFree. If applied to problems @@ -2073,7 +2073,7 @@ namespace internal struct DGP_dofs_per_component { // this division is always without remainder - static const unsigned int value = + static constexpr unsigned int value = (DGP_dofs_per_component::value * (degree+dim)) / dim; }; @@ -2081,7 +2081,7 @@ namespace internal template struct DGP_dofs_per_component<1,degree> { - static const unsigned int value = degree+1; + static constexpr unsigned int value = degree+1; }; } } -- 2.39.5