From 2b3c8537aca60efea5c8e17329dc968bff366b86 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Wed, 28 Aug 2024 14:10:10 -0400 Subject: [PATCH] fix some clang-tidy issues for wdmerger (#2949) --- Exec/science/wdmerger/Prob.cpp | 2 +- Exec/science/wdmerger/Problem.H | 3 +++ Exec/science/wdmerger/problem_checkpoint.H | 2 +- Exec/science/wdmerger/problem_restart.H | 2 +- Exec/science/wdmerger/wdmerger_util.cpp | 2 +- Source/gravity/Gravity.cpp | 12 ++++++------ Source/gravity/binary.H | 2 +- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Exec/science/wdmerger/Prob.cpp b/Exec/science/wdmerger/Prob.cpp index ac6a41eceb..ba28a87a18 100644 --- a/Exec/science/wdmerger/Prob.cpp +++ b/Exec/science/wdmerger/Prob.cpp @@ -604,7 +604,7 @@ Castro::update_relaxation(Real time, Real dt) { const Real ldt = new_time - old_time; - force[lev].reset(new MultiFab(getLevel(lev).grids, getLevel(lev).dmap, NUM_STATE, 0)); + force[lev] = std::make_unique(getLevel(lev).grids, getLevel(lev).dmap, NUM_STATE, 0); force[lev]->setVal(0.0); MultiFab& S_new = getLevel(lev).get_new_data(State_Type); diff --git a/Exec/science/wdmerger/Problem.H b/Exec/science/wdmerger/Problem.H index db48b224e7..8696516ab6 100644 --- a/Exec/science/wdmerger/Problem.H +++ b/Exec/science/wdmerger/Problem.H @@ -27,11 +27,13 @@ void volInBoundary (amrex::Real time, amrex::Real& vol_p, amrex::Real& vol_s, am // Computes standard dot product of two three-vectors. +static amrex::Real dot_product(const amrex::Real a[], const amrex::Real b[]); // Computes norm of a three vector. +static amrex::Real norm(const amrex::Real a[]); // Problem post-initialization routine. @@ -48,6 +50,7 @@ void problem_post_timestep(); // Write out the git hashes for the various parts of the code. +static void writeGitHashes(std::ostream& log); // Update relaxation process. diff --git a/Exec/science/wdmerger/problem_checkpoint.H b/Exec/science/wdmerger/problem_checkpoint.H index 1ddee5e049..9ee3b16846 100644 --- a/Exec/science/wdmerger/problem_checkpoint.H +++ b/Exec/science/wdmerger/problem_checkpoint.H @@ -7,7 +7,7 @@ #include AMREX_INLINE -void problem_checkpoint (std::string checkpoint_dir) +void problem_checkpoint (const std::string& checkpoint_dir) { std::ofstream com; com.open(checkpoint_dir + "/COM", std::ios::out); diff --git a/Exec/science/wdmerger/problem_restart.H b/Exec/science/wdmerger/problem_restart.H index 2246732b64..3acbe99165 100644 --- a/Exec/science/wdmerger/problem_restart.H +++ b/Exec/science/wdmerger/problem_restart.H @@ -5,7 +5,7 @@ #include AMREX_INLINE -void problem_restart (std::string checkpoint_dir) +void problem_restart (const std::string& checkpoint_dir) { std::ifstream com; com.open(checkpoint_dir + "/COM", std::ios::in); diff --git a/Exec/science/wdmerger/wdmerger_util.cpp b/Exec/science/wdmerger/wdmerger_util.cpp index 65b09f89e5..6cb481b5e4 100644 --- a/Exec/science/wdmerger/wdmerger_util.cpp +++ b/Exec/science/wdmerger/wdmerger_util.cpp @@ -658,7 +658,7 @@ void binary_setup () Real v_P_r, v_S_r, v_P_phi, v_S_phi; - kepler_third_law(problem::radius_P, problem::mass_P, problem::radius_S, problem::mass_S, + kepler_third_law(problem::radius_P, problem::mass_P, problem::radius_S, problem::mass_S, // NOLINT(readability-suspicious-call-argument) castro::rotational_period, problem::orbital_eccentricity, problem::orbital_angle, problem::a, problem::r_P_initial, problem::r_S_initial, v_P_r, v_S_r, v_P_phi, v_S_phi); diff --git a/Source/gravity/Gravity.cpp b/Source/gravity/Gravity.cpp index 18eebefbfc..c5f7bac162 100644 --- a/Source/gravity/Gravity.cpp +++ b/Source/gravity/Gravity.cpp @@ -2777,12 +2777,12 @@ Gravity::fill_direct_sum_BCs(int crse_level, int fine_level, const Vector::max()); BL_ASSERT(nPtsYZ <= std::numeric_limits::max()); - ParallelDescriptor::ReduceRealSum(bcXYLo.dataPtr(), nPtsXY); - ParallelDescriptor::ReduceRealSum(bcXYHi.dataPtr(), nPtsXY); - ParallelDescriptor::ReduceRealSum(bcXZLo.dataPtr(), nPtsXZ); - ParallelDescriptor::ReduceRealSum(bcXZHi.dataPtr(), nPtsXZ); - ParallelDescriptor::ReduceRealSum(bcYZLo.dataPtr(), nPtsYZ); - ParallelDescriptor::ReduceRealSum(bcYZHi.dataPtr(), nPtsYZ); + ParallelDescriptor::ReduceRealSum(bcXYLo.dataPtr(), static_cast(nPtsXY)); + ParallelDescriptor::ReduceRealSum(bcXYHi.dataPtr(), static_cast(nPtsXY)); + ParallelDescriptor::ReduceRealSum(bcXZLo.dataPtr(), static_cast(nPtsXZ)); + ParallelDescriptor::ReduceRealSum(bcXZHi.dataPtr(), static_cast(nPtsXZ)); + ParallelDescriptor::ReduceRealSum(bcYZLo.dataPtr(), static_cast(nPtsYZ)); + ParallelDescriptor::ReduceRealSum(bcYZHi.dataPtr(), static_cast(nPtsYZ)); #ifdef _OPENMP #pragma omp parallel diff --git a/Source/gravity/binary.H b/Source/gravity/binary.H index 684d875139..1d2438b7d4 100644 --- a/Source/gravity/binary.H +++ b/Source/gravity/binary.H @@ -67,7 +67,7 @@ void lagrange_iterate (Real& r, Real mass_1, Real mass_2, Real r1, Real r2, Real const Real tolerance = 1.0e-8_rt; const int max_iters = 200; - Real rm, rp; + Real rm{}, rp{}; if (r_min == 0.0_rt && r_max == 0.0_rt) { amrex::Abort("Lagrange point iteration must have at least one non-zero bound provided.");