From ed52ed7558fb0fc600c5e8ff759ebc3aada56ad0 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 2 Oct 2024 11:57:09 -0700 Subject: [PATCH] Formatting: Whitespaces Only spaces --- examples/CMakeLists.txt | 4 +-- .../diagnostics/CovarianceMatrixMath.H | 26 +++++++++---------- .../diagnostics/EmittanceInvariants.H | 7 ++--- .../diagnostics/EmittanceInvariants.cpp | 13 +++++----- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index ce9f905f4..353743bff 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -965,13 +965,13 @@ add_impactx_test(dogleg.py # w/o space charge add_impactx_test(coupled-optics examples/coupled_optics/input_coupled_optics.in - ON # ImpactX MPI-parallel + ON # ImpactX MPI-parallel examples/coupled_optics/analysis_coupled_optics.py OFF # no plot script yet ) add_impactx_test(coupled-optics.py examples/coupled_optics/run_coupled_optics.py - OFF # ImpactX MPI-parallel + OFF # ImpactX MPI-parallel examples/coupled_optics/analysis_coupled_optics.py OFF # no plot script yet ) diff --git a/src/particles/diagnostics/CovarianceMatrixMath.H b/src/particles/diagnostics/CovarianceMatrixMath.H index 8771082ee..d90c9fc82 100644 --- a/src/particles/diagnostics/CovarianceMatrixMath.H +++ b/src/particles/diagnostics/CovarianceMatrixMath.H @@ -35,9 +35,10 @@ namespace impactx::diagnostics * @returns tuple of three real roots */ std::tuple< - amrex::ParticleReal, - amrex::ParticleReal, - amrex::ParticleReal> + amrex::ParticleReal, + amrex::ParticleReal, + amrex::ParticleReal + > CubicRootsTrig ( amrex::ParticleReal a, amrex::ParticleReal b, @@ -48,7 +49,7 @@ namespace impactx::diagnostics using namespace amrex::literals; using ablastr::constant::math::pi; - std::tuple roots; + std::tuple roots; amrex::ParticleReal x1 = 0.0_prt; amrex::ParticleReal x2 = 0.0_prt; amrex::ParticleReal x3 = 0.0_prt; @@ -59,11 +60,11 @@ namespace impactx::diagnostics // Discriminant should be < 0. Otherwise, keep theta at default and throw an error. amrex::ParticleReal tol = 1.0e-12; //allow for roundoff error - if(discriminant > tol){ + if (discriminant > tol) { std::cout << "Polynomial in CubicRoots has one or more complex roots." << "\n"; - } else if (Q == 0.0_prt){ // Special case of a triple root + } else if (Q == 0.0_prt) { // Special case of a triple root x1 = - b/(3.0_prt*a); x2 = - b/(3.0_prt*a); @@ -79,7 +80,6 @@ namespace impactx::diagnostics } - roots = std::make_tuple(x1,x2,x3); return roots; } @@ -97,9 +97,10 @@ namespace impactx::diagnostics * @returns tuple of three real roots */ std::tuple< - amrex::ParticleReal, - amrex::ParticleReal, - amrex::ParticleReal> + amrex::ParticleReal, + amrex::ParticleReal, + amrex::ParticleReal + > CubicRootsAlg ( amrex::ParticleReal a, amrex::ParticleReal b, @@ -110,7 +111,7 @@ namespace impactx::diagnostics using namespace amrex::literals; using Complex = amrex::GpuComplex; - std::tuple roots; + std::tuple roots; amrex::ParticleReal x1 = 0.0_prt; amrex::ParticleReal x2 = 0.0_prt; amrex::ParticleReal x3 = 0.0_prt; @@ -132,7 +133,7 @@ namespace impactx::diagnostics //Three roots in algebraic form. - if (C.m_real == 0.0_prt && C.m_imag == 0.0_prt){ // Special case of a triple root + if (C.m_real == 0.0_prt && C.m_imag == 0.0_prt) { // Special case of a triple root x1 = - b/(3.0_prt*a); x2 = - b/(3.0_prt*a); @@ -148,7 +149,6 @@ namespace impactx::diagnostics x3 = z3.m_real - b/(3.0*a); } - roots = std::make_tuple(x1,x2,x3); return roots; } diff --git a/src/particles/diagnostics/EmittanceInvariants.H b/src/particles/diagnostics/EmittanceInvariants.H index 3766bd9a4..177371953 100644 --- a/src/particles/diagnostics/EmittanceInvariants.H +++ b/src/particles/diagnostics/EmittanceInvariants.H @@ -39,9 +39,10 @@ namespace impactx::diagnostics * @returns tuple containing invariants I2, I4, and I6 */ std::tuple< - amrex::ParticleReal, - amrex::ParticleReal, - amrex::ParticleReal> + amrex::ParticleReal, + amrex::ParticleReal, + amrex::ParticleReal + > KineticInvariants ( amrex::Array2D const & Sigma ); diff --git a/src/particles/diagnostics/EmittanceInvariants.cpp b/src/particles/diagnostics/EmittanceInvariants.cpp index d8ab1daf5..51a276edc 100644 --- a/src/particles/diagnostics/EmittanceInvariants.cpp +++ b/src/particles/diagnostics/EmittanceInvariants.cpp @@ -33,9 +33,10 @@ namespace impactx::diagnostics * returns - tuple containing invarants I2, I4, and I6 */ std::tuple< - amrex::ParticleReal, - amrex::ParticleReal, - amrex::ParticleReal> + amrex::ParticleReal, + amrex::ParticleReal, + amrex::ParticleReal + > KineticInvariants ( amrex::Array2D const & Sigma ) @@ -105,9 +106,9 @@ namespace impactx::diagnostics using namespace amrex::literals; - std::tuple invariants; - std::tuple roots; - std::tuple emittances; + std::tuple invariants; + std::tuple roots; + std::tuple emittances; // Get the invariants I2, I4, and I6 from the covariance matrix. invariants = KineticInvariants(Sigma);