From 0a18511c3cc4ef05bfdac44fca8d5c80998fee13 Mon Sep 17 00:00:00 2001 From: Reza Rastak Date: Sun, 5 May 2019 14:57:30 -0700 Subject: [PATCH] Sprinkling c++11-compliant constexpr onto tensor.h and numbers.h --- include/deal.II/base/numbers.h | 80 ++++++++++++++++--------------- include/deal.II/base/tensor.h | 88 +++++++++++++++++----------------- source/base/numbers.cc | 4 +- source/base/tensor.cc | 4 +- 4 files changed, 89 insertions(+), 87 deletions(-) diff --git a/include/deal.II/base/numbers.h b/include/deal.II/base/numbers.h index 60396a2af5..ae23a9429d 100644 --- a/include/deal.II/base/numbers.h +++ b/include/deal.II/base/numbers.h @@ -118,52 +118,52 @@ namespace numbers /** * e */ - static const double E = 2.7182818284590452354; + static constexpr double E = 2.7182818284590452354; /** * log_2 e */ - static const double LOG2E = 1.4426950408889634074; + static constexpr double LOG2E = 1.4426950408889634074; /** * log_10 e */ - static const double LOG10E = 0.43429448190325182765; + static constexpr double LOG10E = 0.43429448190325182765; /** * log_e 2 */ - static const double LN2 = 0.69314718055994530942; + static constexpr double LN2 = 0.69314718055994530942; /** * log_e 10 */ - static const double LN10 = 2.30258509299404568402; + static constexpr double LN10 = 2.30258509299404568402; /** * pi */ - static const double PI = 3.14159265358979323846; + static constexpr double PI = 3.14159265358979323846; /** * pi/2 */ - static const double PI_2 = 1.57079632679489661923; + static constexpr double PI_2 = 1.57079632679489661923; /** * pi/4 */ - static const double PI_4 = 0.78539816339744830962; + static constexpr double PI_4 = 0.78539816339744830962; /** * sqrt(2) */ - static const double SQRT2 = 1.41421356237309504880; + static constexpr double SQRT2 = 1.41421356237309504880; /** * 1/sqrt(2) */ - static const double SQRT1_2 = 0.70710678118654752440; + static constexpr double SQRT1_2 = 0.70710678118654752440; /** * Check whether the given type can be used in CUDA device code. @@ -352,7 +352,7 @@ namespace numbers * complex or real. Since the general template is selected for non-complex * types, the answer is false. */ - static const bool is_complex = false; + static constexpr bool is_complex = false; /** * For this data type, alias the corresponding real type. Since the @@ -369,8 +369,8 @@ namespace numbers * * @note This function can also be used in CUDA device code. */ - static DEAL_II_CUDA_HOST_DEV const number & - conjugate(const number &x); + static constexpr DEAL_II_CUDA_HOST_DEV const number & + conjugate(const number &x); /** * Return the square of the absolute value of the given number. Since the @@ -381,17 +381,18 @@ namespace numbers * for this function. */ template - static DEAL_II_CUDA_HOST_DEV + static constexpr DEAL_II_CUDA_HOST_DEV typename std::enable_if::value && is_cuda_compatible::value, real_type>::type abs_square(const number &x); template - static typename std::enable_if::value && - !is_cuda_compatible::value, - real_type>::type - abs_square(const number &x); + static constexpr + typename std::enable_if::value && + !is_cuda_compatible::value, + real_type>::type + abs_square(const number &x); /** * Return the absolute value of a number. @@ -415,7 +416,7 @@ namespace numbers * complex or real. Since this specialization of the general template is * selected for complex types, the answer is true. */ - static const bool is_complex = true; + static constexpr bool is_complex = true; /** * For this data type, alias the corresponding real type. Since this @@ -428,7 +429,7 @@ namespace numbers /** * Return the complex-conjugate of the given number. */ - static std::complex + static constexpr std::complex conjugate(const std::complex &x); /** @@ -437,7 +438,7 @@ namespace numbers * std::complex, this function returns the product of a number and its * complex conjugate. */ - static real_type + static constexpr real_type abs_square(const std::complex &x); @@ -495,8 +496,8 @@ namespace numbers template - DEAL_II_CUDA_HOST_DEV const number & - NumberTraits::conjugate(const number &x) + constexpr DEAL_II_CUDA_HOST_DEV const number & + NumberTraits::conjugate(const number &x) { return x; } @@ -505,7 +506,7 @@ namespace numbers template template - DEAL_II_CUDA_HOST_DEV + constexpr DEAL_II_CUDA_HOST_DEV typename std::enable_if::value && is_cuda_compatible::value, typename NumberTraits::real_type>::type @@ -518,10 +519,11 @@ namespace numbers template template - typename std::enable_if::value && - !is_cuda_compatible::value, - typename NumberTraits::real_type>::type - NumberTraits::abs_square(const number &x) + constexpr + typename std::enable_if::value && + !is_cuda_compatible::value, + typename NumberTraits::real_type>::type + NumberTraits::abs_square(const number &x) { return x * x; } @@ -538,7 +540,7 @@ namespace numbers template - std::complex + constexpr std::complex NumberTraits>::conjugate(const std::complex &x) { return std::conj(x); @@ -556,7 +558,7 @@ namespace numbers template - typename NumberTraits>::real_type + constexpr typename NumberTraits>::real_type NumberTraits>::abs_square(const std::complex &x) { return std::norm(x); @@ -632,8 +634,8 @@ namespace internal template struct NumberType { - static DEAL_II_CUDA_HOST_DEV const T & - value(const T &t) + static constexpr DEAL_II_CUDA_HOST_DEV const T & + value(const T &t) { return t; } @@ -647,9 +649,9 @@ namespace internal // Type T is constructible from F. template - static DEAL_II_CUDA_HOST_DEV T - value(const F &f, - typename std::enable_if< + static constexpr DEAL_II_CUDA_HOST_DEV T + value(const F &f, + typename std::enable_if< !std::is_same::type, typename std::decay::type>::value && std::is_constructible::value>::type * = nullptr) @@ -659,7 +661,7 @@ namespace internal // Type T is explicitly convertible (but not constructible) from F. template - static T + static constexpr T value(const F &f, typename std::enable_if< !std::is_same::type, @@ -691,13 +693,13 @@ namespace internal template struct NumberType> { - static const std::complex & + static constexpr const std::complex & value(const std::complex &t) { return t; } - static std::complex + static constexpr std::complex value(const T &t) { return std::complex(t); @@ -705,7 +707,7 @@ namespace internal // Facilitate cast from complex to complex template - static std::complex + static constexpr std::complex value(const std::complex &t) { return std::complex(NumberType::value(t.real()), diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index 97fa8d608e..666509a6c7 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -102,17 +102,17 @@ public: * of an inlined function; the compiler may therefore produce more efficient * code and you may use this value to declare other data types. */ - static const unsigned int dimension = dim; + static constexpr unsigned int dimension = dim; /** * Publish the rank of this tensor to the outside world. */ - static const unsigned int rank = 0; + static constexpr unsigned int rank = 0; /** * Number of independent components of a tensor of rank 0. */ - static const unsigned int n_independent_components = 1; + static constexpr unsigned int n_independent_components = 1; /** * Declare a type that has holds real-valued numbers with the same precision @@ -168,7 +168,7 @@ public: /** * Return a const pointer to the first element of the underlying storage. */ - const Number * + constexpr const Number * begin_raw() const; /** @@ -181,7 +181,7 @@ public: * Return a const pointer to the element past the end of the underlying * storage. */ - const Number * + constexpr const Number * end_raw() const; /** @@ -244,7 +244,7 @@ public: * Test for inequality of two tensors. */ template - bool + constexpr bool operator!=(const Tensor<0, dim, OtherNumber> &rhs) const; /** @@ -280,7 +280,7 @@ public: /** * Tensor with inverted entries. */ - Tensor + constexpr Tensor operator-() const; /** @@ -405,18 +405,18 @@ public: * of an inlined function; the compiler may therefore produce more efficient * code and you may use this value to declare other data types. */ - static const unsigned int dimension = dim; + static constexpr unsigned int dimension = dim; /** * Publish the rank of this tensor to the outside world. */ - static const unsigned int rank = rank_; + static constexpr unsigned int rank = rank_; /** * Number of independent components of a tensor of current rank. This is dim * times the number of independent components of each sub-tensor. */ - static const unsigned int n_independent_components = + static constexpr unsigned int n_independent_components = Tensor::n_independent_components * dim; /** @@ -438,7 +438,7 @@ public: * * @note This function can also be used in CUDA device code. */ - DEAL_II_CUDA_HOST_DEV + constexpr DEAL_II_CUDA_HOST_DEV Tensor() = default; /** @@ -465,6 +465,7 @@ public: * Conversion operator to tensor of tensors. */ template + constexpr operator Tensor<1, dim, Tensor>() const; /** @@ -479,8 +480,8 @@ public: * * @note This function can also be used in CUDA device code. */ - DEAL_II_CUDA_HOST_DEV const value_type & - operator[](const unsigned int i) const; + constexpr DEAL_II_CUDA_HOST_DEV const value_type & + operator[](const unsigned int i) const; /** * Read access using TableIndices indices @@ -501,7 +502,7 @@ public: /** * Return a const pointer to the first element of the underlying storage. */ - const Number * + constexpr const Number * begin_raw() const; /** @@ -513,7 +514,7 @@ public: /** * Return a pointer to the element past the end of the underlying storage. */ - const Number * + constexpr const Number * end_raw() const; /** @@ -545,7 +546,7 @@ public: * Test for inequality of two tensors. */ template - bool + constexpr bool operator!=(const Tensor &) const; /** @@ -647,7 +648,7 @@ public: * Determine an estimate for the memory consumption (in bytes) of this * object. */ - static std::size_t + static constexpr std::size_t memory_consumption(); /** @@ -712,7 +713,7 @@ namespace internal template struct NumberType> { - static const Tensor & + static constexpr const Tensor & value(const Tensor &t) { return t; @@ -730,7 +731,7 @@ namespace internal template struct NumberType>> { - static const Tensor> & + static constexpr const Tensor> & value(const Tensor> &t) { return t; @@ -759,8 +760,7 @@ namespace internal template -inline DEAL_II_CUDA_HOST_DEV -Tensor<0, dim, Number>::Tensor() +DEAL_II_CUDA_HOST_DEV inline Tensor<0, dim, Number>::Tensor() // Some auto-differentiable numbers need explicit // zero initialization. : value(internal::NumberType::value(0.0)) @@ -796,7 +796,7 @@ Tensor<0, dim, Number>::begin_raw() template -inline const Number * +constexpr const Number * Tensor<0, dim, Number>::begin_raw() const { return std::addressof(value); @@ -814,7 +814,7 @@ Tensor<0, dim, Number>::end_raw() template -inline const Number * +constexpr const Number * Tensor<0, dim, Number>::end_raw() const { return begin_raw() + n_independent_components; @@ -897,7 +897,7 @@ Tensor<0, dim, Number>::operator==(const Tensor<0, dim, OtherNumber> &p) const template template -inline bool +constexpr bool Tensor<0, dim, Number>::operator!=(const Tensor<0, dim, OtherNumber> &p) const { return !((*this) == p); @@ -930,7 +930,7 @@ namespace internal namespace ComplexWorkaround { template - inline DEAL_II_CUDA_HOST_DEV void + constexpr DEAL_II_CUDA_HOST_DEV void multiply_assign_scalar(Number &val, const OtherNumber &s) { val *= s; @@ -938,7 +938,7 @@ namespace internal #ifdef __CUDA_ARCH__ template - inline DEAL_II_CUDA_HOST_DEV void + constexpr DEAL_II_CUDA_HOST_DEV void multiply_assign_scalar(std::complex &, const OtherNumber &) { printf("This function is not implemented for std::complex!\n"); @@ -971,7 +971,7 @@ Tensor<0, dim, Number>::operator/=(const OtherNumber &s) template -inline Tensor<0, dim, Number> +constexpr Tensor<0, dim, Number> Tensor<0, dim, Number>::operator-() const { return -value; @@ -1069,8 +1069,8 @@ Tensor::Tensor( template template -inline DEAL_II_ALWAYS_INLINE Tensor:: - operator Tensor<1, dim, Tensor>() const +constexpr DEAL_II_ALWAYS_INLINE Tensor:: + operator Tensor<1, dim, Tensor>() const { return Tensor<1, dim, Tensor>(values); } @@ -1123,7 +1123,7 @@ inline DEAL_II_ALWAYS_INLINE DEAL_II_CUDA_HOST_DEV template -inline DEAL_II_ALWAYS_INLINE +constexpr DEAL_II_ALWAYS_INLINE DEAL_II_CUDA_HOST_DEV const typename Tensor::value_type & Tensor::operator[](const unsigned int i) const { @@ -1167,7 +1167,7 @@ Tensor::begin_raw() template -inline const Number * +constexpr const Number * Tensor::begin_raw() const { return std::addressof( @@ -1186,7 +1186,7 @@ Tensor::end_raw() template -inline const Number * +constexpr const Number * Tensor::end_raw() const { return begin_raw() + n_independent_components; @@ -1248,7 +1248,7 @@ Tensor<1, 0, double>::operator==(const Tensor<1, 0, double> &) const template template -inline bool +constexpr bool Tensor:: operator!=(const Tensor &p) const { @@ -1442,7 +1442,7 @@ Tensor::clear() template -inline std::size_t +constexpr std::size_t Tensor::memory_consumption() { return sizeof(Tensor); @@ -1518,7 +1518,7 @@ operator<<(std::ostream &out, const Tensor<0, dim, Number> &p) * @relatesalso Tensor<0,dim,Number> */ template -inline DEAL_II_ALWAYS_INLINE typename ProductType::type +constexpr DEAL_II_ALWAYS_INLINE typename ProductType::type operator*(const Other &object, const Tensor<0, dim, Number> &t) { return object * static_cast(t); @@ -1535,7 +1535,7 @@ operator*(const Other &object, const Tensor<0, dim, Number> &t) * @relatesalso Tensor<0,dim,Number> */ template -inline DEAL_II_ALWAYS_INLINE typename ProductType::type +constexpr DEAL_II_ALWAYS_INLINE typename ProductType::type operator*(const Tensor<0, dim, Number> &t, const Other &object) { return static_cast(t) * object; @@ -1552,7 +1552,7 @@ operator*(const Tensor<0, dim, Number> &t, const Other &object) * @relatesalso Tensor<0,dim,Number> */ template -inline DEAL_II_ALWAYS_INLINE typename ProductType::type +constexpr DEAL_II_ALWAYS_INLINE typename ProductType::type operator*(const Tensor<0, dim, Number> & src1, const Tensor<0, dim, OtherNumber> &src2) { @@ -1567,7 +1567,7 @@ operator*(const Tensor<0, dim, Number> & src1, * @relatesalso Tensor<0,dim,Number> */ template -inline DEAL_II_ALWAYS_INLINE +constexpr DEAL_II_ALWAYS_INLINE Tensor<0, dim, typename ProductType */ template -inline DEAL_II_ALWAYS_INLINE +constexpr DEAL_II_ALWAYS_INLINE Tensor<0, dim, typename ProductType::type> operator+(const Tensor<0, dim, Number> & p, const Tensor<0, dim, OtherNumber> &q) @@ -1599,7 +1599,7 @@ inline DEAL_II_ALWAYS_INLINE * @relatesalso Tensor<0,dim,Number> */ template -inline DEAL_II_ALWAYS_INLINE +constexpr DEAL_II_ALWAYS_INLINE Tensor<0, dim, typename ProductType::type> operator-(const Tensor<0, dim, Number> & p, const Tensor<0, dim, OtherNumber> &q) @@ -1645,7 +1645,7 @@ inline DEAL_II_ALWAYS_INLINE * @relatesalso Tensor */ template -inline DEAL_II_ALWAYS_INLINE +constexpr DEAL_II_ALWAYS_INLINE Tensor::type, @@ -2154,7 +2154,7 @@ determinant(const Tensor<2, dim, Number> &t) * @relatesalso Tensor */ template -inline Number +constexpr Number determinant(const Tensor<2, 1, Number> &t) { return t[0][0]; @@ -2315,7 +2315,7 @@ inline DEAL_II_ALWAYS_INLINE Tensor<2, dim, Number> * @author Jean-Paul Pelteret, 2016 */ template -inline Tensor<2, dim, Number> +constexpr Tensor<2, dim, Number> adjugate(const Tensor<2, dim, Number> &t) { return determinant(t) * invert(t); @@ -2337,7 +2337,7 @@ adjugate(const Tensor<2, dim, Number> &t) * @author Jean-Paul Pelteret, 2016 */ template -inline Tensor<2, dim, Number> +constexpr Tensor<2, dim, Number> cofactor(const Tensor<2, dim, Number> &t) { return transpose(adjugate(t)); diff --git a/source/base/numbers.cc b/source/base/numbers.cc index d5f5c425c4..71c5fdbbc6 100644 --- a/source/base/numbers.cc +++ b/source/base/numbers.cc @@ -24,10 +24,10 @@ DEAL_II_NAMESPACE_OPEN namespace numbers { template - const bool NumberTraits::is_complex; + constexpr bool NumberTraits::is_complex; template - const bool NumberTraits>::is_complex; + constexpr bool NumberTraits>::is_complex; // explicit instantiations template struct NumberTraits; diff --git a/source/base/tensor.cc b/source/base/tensor.cc index 43dabdad75..1cfe7e87e6 100644 --- a/source/base/tensor.cc +++ b/source/base/tensor.cc @@ -26,10 +26,10 @@ DEAL_II_NAMESPACE_OPEN template -const unsigned int Tensor<0, dim, Number>::n_independent_components; +constexpr unsigned int Tensor<0, dim, Number>::n_independent_components; template -const unsigned int Tensor::n_independent_components; +constexpr unsigned int Tensor::n_independent_components; #include "tensor.inst" -- 2.39.5