From 766d71146a8314a48db88f29b0e0548d1d9c5397 Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Wed, 26 Jul 2023 20:55:34 +0200 Subject: Initialize variables at declaration if it improves readability (#4117) * init some variables at declaration * make code more readable * avoid lossy function result cast * Update Source/Initialization/WarpXInitData.cpp Co-authored-by: Weiqun Zhang * replace with equality * Revert "replace with equality" This reverts commit e3164f9e053d345b153d770ae107a7f68c4bb260. * Update Source/Diagnostics/ComputeDiagFunctors/ParticleReductionFunctor.cpp Co-authored-by: Weiqun Zhang --------- Co-authored-by: Weiqun Zhang --- .../FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H') diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H index 622f7fa82..ad8194a13 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H @@ -50,14 +50,9 @@ struct CylindricalYeeAlgorithm { // semi-analytically by R. Lehe, and resulted in the following // coefficients. std::array< amrex::Real, 6 > const multimode_coeffs = {{ 0.2105_rt, 1.0_rt, 3.5234_rt, 8.5104_rt, 15.5059_rt, 24.5037_rt }}; - amrex::Real multimode_alpha; - if (n_rz_azimuthal_modes < 7) { - // Use the table of the coefficients - multimode_alpha = multimode_coeffs[n_rz_azimuthal_modes-1]; - } else { - // Use a realistic extrapolation - multimode_alpha = (n_rz_azimuthal_modes - 1._rt)*(n_rz_azimuthal_modes - 1._rt) - 0.4_rt; - } + const amrex::Real multimode_alpha = (n_rz_azimuthal_modes < 7)? + multimode_coeffs[n_rz_azimuthal_modes-1]: // Use the table of the coefficients + (n_rz_azimuthal_modes - 1._rt)*(n_rz_azimuthal_modes - 1._rt) - 0.4_rt; // Use a realistic extrapolation const amrex::Real delta_t = 1._rt / ( std::sqrt( (1._rt + multimode_alpha) / (dx[0]*dx[0]) + 1._rt / (dx[1]*dx[1]) -- cgit v1.2.3