Skip to content

Commit

Permalink
Formatting: Whitespaces
Browse files Browse the repository at this point in the history
Only spaces
  • Loading branch information
ax3l authored Oct 2, 2024
1 parent 534e40f commit ed52ed7
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 24 deletions.
4 changes: 2 additions & 2 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
26 changes: 13 additions & 13 deletions src/particles/diagnostics/CovarianceMatrixMath.H
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -48,7 +49,7 @@ namespace impactx::diagnostics
using namespace amrex::literals;
using ablastr::constant::math::pi;

std::tuple <amrex::ParticleReal,amrex::ParticleReal,amrex::ParticleReal> roots;
std::tuple<amrex::ParticleReal, amrex::ParticleReal, amrex::ParticleReal> roots;
amrex::ParticleReal x1 = 0.0_prt;
amrex::ParticleReal x2 = 0.0_prt;
amrex::ParticleReal x3 = 0.0_prt;
Expand All @@ -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);
Expand All @@ -79,7 +80,6 @@ namespace impactx::diagnostics

}


roots = std::make_tuple(x1,x2,x3);
return roots;
}
Expand All @@ -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,
Expand All @@ -110,7 +111,7 @@ namespace impactx::diagnostics
using namespace amrex::literals;
using Complex = amrex::GpuComplex<amrex::ParticleReal>;

std::tuple <amrex::ParticleReal,amrex::ParticleReal,amrex::ParticleReal> roots;
std::tuple<amrex::ParticleReal, amrex::ParticleReal, amrex::ParticleReal> roots;
amrex::ParticleReal x1 = 0.0_prt;
amrex::ParticleReal x2 = 0.0_prt;
amrex::ParticleReal x3 = 0.0_prt;
Expand All @@ -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);
Expand All @@ -148,7 +149,6 @@ namespace impactx::diagnostics
x3 = z3.m_real - b/(3.0*a);
}


roots = std::make_tuple(x1,x2,x3);
return roots;
}
Expand Down
7 changes: 4 additions & 3 deletions src/particles/diagnostics/EmittanceInvariants.H
Original file line number Diff line number Diff line change
Expand Up @@ -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<amrex::ParticleReal, 1, 6, 1, 6> const & Sigma
);
Expand Down
13 changes: 7 additions & 6 deletions src/particles/diagnostics/EmittanceInvariants.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<amrex::ParticleReal, 1, 6, 1, 6> const & Sigma
)
Expand Down Expand Up @@ -105,9 +106,9 @@ namespace impactx::diagnostics

using namespace amrex::literals;

std::tuple <amrex::ParticleReal,amrex::ParticleReal,amrex::ParticleReal> invariants;
std::tuple <amrex::ParticleReal,amrex::ParticleReal,amrex::ParticleReal> roots;
std::tuple <amrex::ParticleReal,amrex::ParticleReal,amrex::ParticleReal> emittances;
std::tuple<amrex::ParticleReal, amrex::ParticleReal, amrex::ParticleReal> invariants;
std::tuple<amrex::ParticleReal, amrex::ParticleReal, amrex::ParticleReal> roots;
std::tuple<amrex::ParticleReal, amrex::ParticleReal, amrex::ParticleReal> emittances;

// Get the invariants I2, I4, and I6 from the covariance matrix.
invariants = KineticInvariants(Sigma);
Expand Down

0 comments on commit ed52ed7

Please sign in to comment.