Skip to content

Clang-Tidy: modernize-use-std-numbers #5370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WeiqunZhang wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Clang-Tidy: modernize-use-std-numbers #5370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa04b57
Clang-Tidy: modernize-use-std-numbers
WeiqunZhang Apr 21, 2026
0ef5d54
sqrt2
WeiqunZhang Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ Checks: >
-modernize-use-integer-sign-comparison,
-modernize-use-ranges,
-modernize-use-starts-ends-with,
-modernize-use-std-numbers,
-modernize-use-trailing-return-type,
performance-*,
-performance-enum-size,
Expand Down Expand Up @@ -81,7 +80,6 @@ HeaderFileExtensions: ['', "H", 'h', 'hh', 'hpp', 'hxx']
# We will try to modernize this after switching to C++20
# -modernize-use-constraints
# -modernize-use-designated-initializers
# -modernize-use-std-numbers
# -modernize-use-ranges
# -modernize-use-integer-sign-comparison
# -modernize-use-starts-ends-with
Expand Down
9 changes: 5 additions & 4 deletions Src/Base/AMReX_COORDSYS_1D_C.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <AMReX_Array.H>
#include <AMReX_FArrayBox.H>
#include <cmath>
#include <numbers>

namespace amrex {

Expand All @@ -29,7 +30,7 @@ amrex_setvol (Box const& bx, Array4<Real> const& vol,
}
else if (coord == 1)
{
const Real pi = Real(3.1415926535897932);
const Real pi = std::numbers::pi_v<Real>;
AMREX_PRAGMA_SIMD
for (int i = lo.x; i <= hi.x; ++i) {
Real ri = offset[0] + dx[0]*i;
Expand All @@ -40,7 +41,7 @@ amrex_setvol (Box const& bx, Array4<Real> const& vol,
}
else
{
const Real pi = Real(3.1415926535897932);
const Real pi = std::numbers::pi_v<Real>;
AMREX_PRAGMA_SIMD
for (int i = lo.x; i <= hi.x; ++i) {
Real ri = offset[0] + dx[0]*i;
Expand Down Expand Up @@ -70,7 +71,7 @@ amrex_setarea (Box const& bx, Array4<Real> const& area,
}
else if (coord == 1)
{
const Real pi = Real(3.1415926535897932);
const Real pi = std::numbers::pi_v<Real>;
AMREX_PRAGMA_SIMD
for (int i = lo.x; i <= hi.x; ++i) {
Real ri = offset[0] + dx[0]*i;
Expand All @@ -80,7 +81,7 @@ amrex_setarea (Box const& bx, Array4<Real> const& area,
}
else
{
const Real pi = Real(3.1415926535897932);
const Real pi = std::numbers::pi_v<Real>;
AMREX_PRAGMA_SIMD
for (int i = lo.x; i <= hi.x; ++i) {
Real ri = offset[0] + dx[0]*i;
Expand Down
9 changes: 5 additions & 4 deletions Src/Base/AMReX_COORDSYS_2D_C.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <AMReX_Array.H>
#include <AMReX_FArrayBox.H>
#include <cmath>
#include <numbers>

namespace amrex {

Expand All @@ -31,7 +32,7 @@ amrex_setvol (Box const& bx, Array4<Real> const& vol,
}
else if (coord == 1) // r-z
{
const Real pi = Real(3.1415926535897932);
const Real pi = std::numbers::pi_v<Real>;
for (int j = lo.y; j <= hi.y; ++j) {
AMREX_PRAGMA_SIMD
for (int i = lo.x; i <= hi.x; ++i) {
Expand All @@ -44,7 +45,7 @@ amrex_setvol (Box const& bx, Array4<Real> const& vol,
}
else // r-theta
{
const Real pi = Real(3.1415926535897932);
const Real pi = std::numbers::pi_v<Real>;
for (int j = lo.y; j <= hi.y; ++j) {
Real ti = offset[1] + dx[1]*(j);
Real to = ti + dx[1];
Expand Down Expand Up @@ -82,7 +83,7 @@ amrex_setarea (Box const& bx, Array4<Real> const& area,
}
else if (coord == 1)
{
const Real pi = Real(3.1415926535897932);
const Real pi = std::numbers::pi_v<Real>;
if (dir == 0)
{
for (int j = lo.y; j <= hi.y; ++j) {
Expand All @@ -108,7 +109,7 @@ amrex_setarea (Box const& bx, Array4<Real> const& area,
}
else
{
const Real pi = Real(3.1415926535897932);
const Real pi = std::numbers::pi_v<Real>;
if (dir == 0)
{
for (int j = lo.y; j <= hi.y; ++j) {
Expand Down
5 changes: 3 additions & 2 deletions Src/Base/AMReX_CoordSys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
#include <AMReX_ParallelDescriptor.H>

#include <iostream>
#include <numbers>

namespace {
#if (AMREX_SPACEDIM == 2)
constexpr double TWOPI = 2.*3.14159265358979323846264338327950288;
constexpr double TWOPI = 2.0 * std::numbers::pi_v<double>;
#elif (AMREX_SPACEDIM == 1)
constexpr double FOURPI = 4.*3.14159265358979323846264338327950288;
constexpr double FOURPI = 4.0 * std::numbers::pi_v<double>;
#endif
}

Expand Down
7 changes: 4 additions & 3 deletions Src/Base/AMReX_Geometry.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include <iosfwd>
#include <map>
#include <numbers>

namespace amrex {

Expand Down Expand Up @@ -252,7 +253,7 @@ public:
Real rl = geomdata.ProbLo()[0] + static_cast<Real>(point[0]) * dx[0];
Real rr = rl + dx[0];

constexpr Real pi = Real(3.1415926535897932);
constexpr Real pi = std::numbers::pi_v<Real>;
vol = (4.0_rt / 3.0_rt) * pi * dx[0] * (rl * rl + rl * rr + rr * rr);
}

Expand All @@ -271,7 +272,7 @@ public:
Real r_l = geomdata.ProbLo()[0] + static_cast<Real>(point[0]) * dx[0];
Real r_r = geomdata.ProbLo()[0] + static_cast<Real>(point[0]+1) * dx[0];

constexpr Real pi = Real(3.1415926535897932);
constexpr Real pi = std::numbers::pi_v<Real>;
vol = pi * (r_l + r_r) * dx[0] * dx[1];
}
else {
Expand All @@ -283,7 +284,7 @@ public:
Real theta_l = geomdata.ProbLo()[1] + static_cast<Real>(point[1]) * dx[1];
Real theta_r = geomdata.ProbLo()[1] + static_cast<Real>(point[1]+1) * dx[1];

constexpr Real twoThirdsPi = static_cast<Real>(2.0 * 3.1415926535897932 / 3.0);
constexpr Real twoThirdsPi = static_cast<Real>((2.0 / 3.0) * std::numbers::pi_v<Real>);
vol = twoThirdsPi * (std::cos(theta_l) - std::cos(theta_r)) * dx[0] *
(r_r*r_r + r_r*r_l + r_l*r_l);
}
Expand Down
3 changes: 2 additions & 1 deletion Src/Base/AMReX_Math.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <cmath>
#include <cstdlib>
#include <limits>
#include <numbers>
#include <type_traits>
#include <utility>

Expand Down Expand Up @@ -67,7 +68,7 @@ using std::isinf;
template <typename T>
constexpr std::enable_if_t<std::is_floating_point_v<T>,T> pi ()
{
return T(3.1415926535897932384626433832795029L);
return std::numbers::pi_v<T>;
}

//! Return cos(x*pi) given x
Expand Down
9 changes: 5 additions & 4 deletions Src/Base/AMReX_MultiFabUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

#include <AMReX_MultiFabUtil.H>
#include <AMReX_Random.H>
#include <numbers>
#include <sstream>
#include <iostream>

Expand Down Expand Up @@ -1052,7 +1053,7 @@ namespace amrex
if (m[box_no](i,j,k)) {
return Real(0.);
} else {
constexpr Real pi = Real(3.1415926535897932);
constexpr Real pi = std::numbers::pi_v<Real>;
Real ri = rlo + dx[0]*i;
Real ro = ri + dx[0];
return Real(4./3.)*pi*(ro-ri)*(ro*ro+ro*ri+ri*ri)
Expand All @@ -1072,7 +1073,7 @@ namespace amrex
} else {
Real ri = rlo + dx[0]*i;
Real ro = ri + dx[0];
constexpr Real pi = Real(3.1415926535897932);
constexpr Real pi = std::numbers::pi_v<Real>;
return pi*dx[1]*dx[0]*(ro+ri)
* a[box_no](i,j,k,icomp);
}
Expand Down Expand Up @@ -1117,7 +1118,7 @@ namespace amrex
[=] AMREX_GPU_DEVICE (int box_no, int i, int j, int k)
noexcept -> Real
{
constexpr Real pi = Real(3.1415926535897932);
constexpr Real pi = std::numbers::pi_v<Real>;
Real ri = rlo + dx[0]*i;
Real ro = ri + dx[0];
return Real(4./3.)*pi*(ro-ri)*(ro*ro+ro*ri+ri*ri)
Expand All @@ -1133,7 +1134,7 @@ namespace amrex
{
Real ri = rlo + dx[0]*i;
Real ro = ri + dx[0];
constexpr Real pi = Real(3.1415926535897932);
constexpr Real pi = std::numbers::pi_v<Real>;
return pi*dx[1]*dx[0]*(ro+ri)
* a[box_no](i,j,k,icomp);
});
Expand Down
3 changes: 2 additions & 1 deletion Src/LinearSolvers/OpenBC/AMReX_OpenBC_K.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <AMReX_OpenBC.H>
#include <AMReX_LOUtil_K.H>
#include <numbers>

namespace amrex::openbc {

Expand Down Expand Up @@ -46,7 +47,7 @@ void scale_moments (openbc::Moments::array_type& mom)
AMREX_GPU_DEVICE AMREX_FORCE_INLINE
Real block_potential (openbc::Moments const& mom, Real xb, Real yb, Real zb)
{
constexpr Real oneover4pi = Real(1.)/Real(4.*3.1415926535897932);
constexpr Real oneover4pi = Real(1.) / (Real(4.) * std::numbers::pi_v<Real>);

xb -= mom.x;
yb -= mom.y;
Expand Down
3 changes: 2 additions & 1 deletion Tests/Amr/Advection_AmrCore/Source/face_velocity.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <AMReX_Geometry.H>
#include <AMReX_FArrayBox.H>
#include <AMReX_REAL.H>
#include <numbers>

AMREX_GPU_DEVICE
AMREX_FORCE_INLINE
Expand All @@ -13,7 +14,7 @@ void get_face_velocity_psi(int i, int j,
amrex::GeometryData const& geomdata)
{
using namespace amrex;
constexpr Real PI = 3.1415926535897932384626;
constexpr Real PI = std::numbers::pi_v<Real>;

const Real* AMREX_RESTRICT prob_lo = geomdata.ProbLo();
const Real* AMREX_RESTRICT dx = geomdata.CellSize();
Expand Down
3 changes: 2 additions & 1 deletion Tests/Amr/Advection_AmrLevel/Exec/SingleVortex/face_velocity_2d_K.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <AMReX_FArrayBox.H>
#include <AMReX_Array.H>
#include <numbers>

AMREX_GPU_DEVICE
AMREX_FORCE_INLINE
Expand All @@ -15,7 +16,7 @@ void get_face_velocity_psi(int i, int j,
amrex::Real prob_lo_y)
{
using namespace amrex;
constexpr Real PI = 3.141592653589793238462643383279502884197;
constexpr Real PI = std::numbers::pi_v<Real>;

// Compute streamfunction psi
Real y = ( (Real)j + 0.5 )*dy + prob_lo_y;
Expand Down
3 changes: 2 additions & 1 deletion Tests/Amr/Advection_AmrLevel/Exec/SingleVortex/face_velocity_3d_K.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <AMReX_FArrayBox.H>
#include <AMReX_Array.H>
#include <numbers>

AMREX_GPU_DEVICE
AMREX_FORCE_INLINE
Expand All @@ -17,7 +18,7 @@ void get_face_velocity_psi(int i, int j,
amrex::Real /*prob_lo_z*/)
{
using namespace amrex;
constexpr Real PI = 3.141592653589793238462643383279502884197;
constexpr Real PI = std::numbers::pi_v<Real>;

// Compute streamfunction psi
Real y = ( (Real)j + 0.5 )*dy + prob_lo_y;
Expand Down
3 changes: 2 additions & 1 deletion Tests/EB_CNS/Exec/Pulse/cns_prob.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <AMReX_Geometry.H>
#include <AMReX_FArrayBox.H>
#include <numbers>
#include "CNS_index_macros.H"
#include "CNS_parm.H"
#include "cns_prob_parm.H"
Expand All @@ -15,7 +16,7 @@ cns_initdata (int i, int j, int k, amrex::Array4<amrex::Real> const& state,
{
using amrex::Real;

constexpr Real pi = 3.1415926535897932;
constexpr Real pi = std::numbers::pi_v<Real>;

const Real* prob_lo = geomdata.ProbLo();
const Real* prob_hi = geomdata.ProbHi();
Expand Down
3 changes: 2 additions & 1 deletion Tests/GPU/CNS/Exec/RT/cns_prob.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <AMReX_Geometry.H>
#include <AMReX_FArrayBox.H>
#include <numbers>
#include "CNS_index_macros.H"
#include "CNS_parm.H"
#include "cns_prob_parm.H"
Expand All @@ -19,7 +20,7 @@ cns_initdata (int i, int j, int k, amrex::Array4<amrex::Real> const& state,
const Real* prob_hi = geomdata.ProbHi();
const Real* dx = geomdata.CellSize();

constexpr Real pi = Real(3.14159265358979323846264338327950288);
constexpr Real pi = std::numbers::pi_v<Real>;
const Real splitx = Real(0.5)*(prob_lo[0]+prob_hi[0]);
const Real splity = Real(0.5)*(prob_lo[1]+prob_hi[1]);
const Real splitz = Real(0.5)*(prob_lo[2]+prob_hi[2]);
Expand Down
10 changes: 6 additions & 4 deletions Tests/LinearSolvers/ABecLap_SP/initProb_K.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define INIT_PROB_K_H_

#include <AMReX_FArrayBox.H>
#include <numbers>

AMREX_GPU_DEVICE AMREX_FORCE_INLINE
void actual_init_poisson (int i, int j, int k,
Expand All @@ -10,8 +11,9 @@ void actual_init_poisson (int i, int j, int k,
amrex::GpuArray<amrex::Real,AMREX_SPACEDIM> const& prob_lo,
amrex::GpuArray<amrex::Real,AMREX_SPACEDIM> const& dx)
{
constexpr amrex::Real tpi = 2.*3.1415926535897932;
constexpr amrex::Real fpi = 4.*3.1415926535897932;
constexpr amrex::Real pi = std::numbers::pi_v<amrex::Real>;
constexpr amrex::Real tpi = 2.*pi;
constexpr amrex::Real fpi = 4.*pi;
constexpr amrex::Real fac = tpi*tpi*static_cast<amrex::Real>(AMREX_SPACEDIM);
amrex::Real x = prob_lo[0] + dx[0] * (i + 0.5);
amrex::Real y = prob_lo[1] + dx[1] * (j + 0.5);
Expand Down Expand Up @@ -50,7 +52,7 @@ void actual_init_bcoef (int i, int j, int k,
constexpr amrex::Real sigma = 10.;
const amrex::Real theta = 0.5*std::log(3.) / (w + 1.e-50);

constexpr amrex::Real pi = 3.1415926535897932;
constexpr amrex::Real pi = std::numbers::pi_v<amrex::Real>;
constexpr amrex::Real tpi = 2.*pi;
constexpr amrex::Real fpi = 4.*pi;

Expand Down Expand Up @@ -99,7 +101,7 @@ void actual_init_abeclap (int i, int j, int k,
constexpr amrex::Real sigma = 10.;
const amrex::Real theta = 0.5*std::log(3.) / (w + 1.e-50);

constexpr amrex::Real pi = 3.1415926535897932;
constexpr amrex::Real pi = std::numbers::pi_v<amrex::Real>;
constexpr amrex::Real tpi = 2.*pi;
constexpr amrex::Real fpi = 4.*pi;
constexpr amrex::Real fac = static_cast<amrex::Real>(AMREX_SPACEDIM*4)*pi*pi;
Expand Down
Loading
Loading