From 9b727cfe90a5265785454a75a0b59c0a818522f0 Mon Sep 17 00:00:00 2001 From: vinciguerra_a Date: Fri, 17 Mar 2023 10:07:14 +0000 Subject: [PATCH] Reorder #include directives --- .clang-format | 27 +++++++++++++++++++- alpine/BumponTailInstability.cpp | 8 +++--- alpine/ChargedParticles.hpp | 1 + alpine/LandauDamping.cpp | 8 +++--- alpine/PenningTrap.cpp | 8 +++--- alpine/UniformPlasmaTest.cpp | 9 +++---- src/AmrParticle/AmrParticleBase.h | 3 +-- src/Communicate/Archive.h | 3 ++- src/Communicate/Archive.hpp | 4 +-- src/Communicate/Communicate.h | 2 +- src/Communicate/GlobalComm.hpp | 8 +++--- src/Communicate/Operations.h | 2 +- src/FFT/FFT.h | 8 +++--- src/FFT/FFT.hpp | 6 +++-- src/Field/BConds.h | 4 +-- src/Field/BareField.h | 12 ++++----- src/Field/BareField.hpp | 8 +++--- src/Field/BcTypes.h | 5 ++-- src/Field/BcTypes.hpp | 3 ++- src/Field/Field.h | 3 ++- src/Field/HaloCells.h | 6 +++-- src/Field/HaloCells.hpp | 3 ++- src/FieldLayout/BinaryBalancer.hpp | 4 ++- src/FieldLayout/FieldLayout.h | 7 ++--- src/FieldLayout/FieldLayout.hpp | 10 ++++---- src/Ippl.cpp | 5 ++-- src/Ippl.h | 4 ++- src/IpplCore.h | 6 ++--- src/Meshes/Cartesian.h | 4 +-- src/Meshes/Cartesian.hpp | 14 +++++----- src/Meshes/CartesianCentering.h | 4 +-- src/Meshes/UniformCartesian.hpp | 5 ++-- src/Particle/IntNGP.h | 1 + src/Particle/Interpolator.h | 18 +++++++------ src/Particle/ParticleAttrib.h | 1 + src/Particle/ParticleAttrib.hpp | 4 ++- src/Particle/ParticleBalancer.hpp | 3 ++- src/Particle/ParticleBase.h | 5 ++-- src/Particle/ParticleLayout.h | 5 ++-- src/Particle/ParticleSpatialLayout.h | 5 ++-- src/Particle/ParticleSpatialLayout.hpp | 1 + src/Region/NDRegion.h | 4 +-- src/Region/RegionLayout.h | 4 +-- src/Solver/FFTPeriodicPoissonSolver.h | 3 ++- src/Solver/FFTPoissonSolver.h | 6 +++-- src/Solver/FFTPoissonSolver.hpp | 6 +++-- src/Solver/Solver.h | 3 ++- src/Solver/SolverAlgorithm.h | 1 + src/Solver/test/Budiardja_plot.cpp | 3 ++- src/Solver/test/TestCGSolver.cpp | 3 ++- src/Solver/test/TestGaussian.cpp | 7 +++-- src/Solver/test/TestGaussian_biharmonic.cpp | 4 ++- src/Solver/test/TestGaussian_convergence.cpp | 4 ++- src/Solver/test/TestSphere.cpp | 3 ++- src/Types/Vector.h | 4 +-- src/Utility/Inform.cpp | 4 +-- src/Utility/IpplInfo.cpp | 7 +++-- src/Utility/IpplMemoryUsage.h | 2 +- src/Utility/IpplTimings.cpp | 9 ++++--- src/Utility/IpplTimings.h | 9 +++---- src/Utility/PAssert.h | 4 +-- src/Utility/Timer.cpp | 4 +-- src/Utility/UserList.cpp | 1 + src/Utility/vmap.hpp | 1 + test/FFT/TestCos.cpp | 3 ++- test/FFT/TestFFTCC.cpp | 3 ++- test/FFT/TestFFTRC.cpp | 3 ++- test/FFT/TestSine.cpp | 3 ++- test/kokkos/TestVectorField2.cpp | 3 +-- test/kokkos/TestVectorField3.cpp | 3 +-- test/kokkos/TestVectorField4.cpp | 3 +-- test/p3m/p3m3d.cpp | 4 ++- test/p3m/p3m3dHeating.cpp | 15 ++++++----- test/p3m/p3m3dMicrobunching.cpp | 7 +++-- test/p3m/p3m3dRegressionTests.cpp | 12 ++++----- test/p3m/p3m3dTwoStreamParallel.cpp | 8 +++--- test/particle/PIC3d.cpp | 5 ++-- test/particle/TestGather.cpp | 3 ++- test/particle/TestScatter.cpp | 3 ++- test/particle/benchmarkParticleUpdate.cpp | 7 ++--- test/serialization/serialize01.cpp | 6 ++--- test/vector/TestVector2.cpp | 4 +-- test/vector/TestVector3.cpp | 4 +-- unit_tests/BareField/BareField.cpp | 1 + unit_tests/Field/Field.cpp | 1 + unit_tests/Field/FieldBC.cpp | 4 ++- unit_tests/Meshes/UniformCartesian.cpp | 1 + unit_tests/PIC/ORB.cpp | 4 +-- unit_tests/PIC/PIC.cpp | 4 +-- unit_tests/Particle/ParticleBC.cpp | 1 + unit_tests/Particle/ParticleBase.cpp | 1 + unit_tests/Particle/ParticleSendRecv.cpp | 4 +-- unit_tests/Utility/ParameterList.cpp | 4 ++- 93 files changed, 279 insertions(+), 188 deletions(-) diff --git a/.clang-format b/.clang-format index 66e07b9fd..5eb0e5c45 100644 --- a/.clang-format +++ b/.clang-format @@ -16,7 +16,32 @@ BreakConstructorInitializers: BeforeComma ColumnLimit: 100 DerivePointerAlignment: false IndentWidth: 4 -IncludeBlocks: Preserve +IncludeBlocks: Regroup +IncludeCategories: + - Regex: 'Kokkos_Core' + Priority: -1 + SortPriority: -2 + - Regex: '^"Ippl' + Priority: -1 + SortPriority: -1 + - Regex: '^<.*>$' + Priority: 2 + - Regex: 'Types[^/]*"$' + Priority: 10 + - Regex: '^"Types' + Priority: 20 + - Regex: '^"Utility' + Priority: 30 + - Regex: '^"Expression' + Priority: 40 + - Regex: '.*Field.h"$' + Priority: 50 + - Regex: 'BConds' + Priority: 50 + SortPriority: 51 + - Regex: 'BcTypes' + Priority: 50 + SortPriority: 52 IndentGotoLabels: false NamespaceIndentation: All PackConstructorInitializers: Never diff --git a/alpine/BumponTailInstability.cpp b/alpine/BumponTailInstability.cpp index f27143eb7..9dd42b154 100644 --- a/alpine/BumponTailInstability.cpp +++ b/alpine/BumponTailInstability.cpp @@ -34,19 +34,19 @@ // along with IPPL. If not, see . // +#include #include #include #include +#include #include #include #include -#include "ChargedParticles.hpp" - -#include -#include #include "Utility/IpplTimings.h" +#include "ChargedParticles.hpp" + template struct Newton1D { double tol = 1e-12; diff --git a/alpine/ChargedParticles.hpp b/alpine/ChargedParticles.hpp index 9885934db..8f0e204e6 100644 --- a/alpine/ChargedParticles.hpp +++ b/alpine/ChargedParticles.hpp @@ -17,6 +17,7 @@ // #include "Ippl.h" + #include "Solver/FFTPeriodicPoissonSolver.h" // dimension of our positions diff --git a/alpine/LandauDamping.cpp b/alpine/LandauDamping.cpp index 068711ef4..ca79013cc 100644 --- a/alpine/LandauDamping.cpp +++ b/alpine/LandauDamping.cpp @@ -31,19 +31,19 @@ // along with IPPL. If not, see . // +#include #include #include #include +#include #include #include #include -#include "ChargedParticles.hpp" - -#include -#include #include "Utility/IpplTimings.h" +#include "ChargedParticles.hpp" + template struct Newton1D { double tol = 1e-12; diff --git a/alpine/PenningTrap.cpp b/alpine/PenningTrap.cpp index 492cb0f76..c5a406ed9 100644 --- a/alpine/PenningTrap.cpp +++ b/alpine/PenningTrap.cpp @@ -30,19 +30,19 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // -#include "ChargedParticles.hpp" - +#include #include #include #include +#include #include #include #include -#include -#include #include "Utility/IpplTimings.h" +#include "ChargedParticles.hpp" + template struct Newton1D { double tol = 1e-12; diff --git a/alpine/UniformPlasmaTest.cpp b/alpine/UniformPlasmaTest.cpp index 5383dbc1d..830681dff 100644 --- a/alpine/UniformPlasmaTest.cpp +++ b/alpine/UniformPlasmaTest.cpp @@ -28,19 +28,18 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // -#include "ChargedParticles.hpp" - +#include #include #include +#include #include #include #include -#include - -#include #include "Utility/IpplTimings.h" +#include "ChargedParticles.hpp" + const char* TestName = "UniformPlasmaTest"; template diff --git a/src/AmrParticle/AmrParticleBase.h b/src/AmrParticle/AmrParticleBase.h index 79dd447b4..5235ea9bf 100644 --- a/src/AmrParticle/AmrParticleBase.h +++ b/src/AmrParticle/AmrParticleBase.h @@ -38,9 +38,8 @@ #include "Ippl.h" -#include "Particle/IpplParticleBase.h" - #include "AmrParticleLevelCounter.h" +#include "Particle/IpplParticleBase.h" template class AmrParticleBase : public IpplParticleBase { diff --git a/src/Communicate/Archive.h b/src/Communicate/Archive.h index d368d2225..c4c7d238b 100644 --- a/src/Communicate/Archive.h +++ b/src/Communicate/Archive.h @@ -26,9 +26,10 @@ #define IPPL_ARCHIVE_H #include "Types/IpplTypes.h" -#include "Types/Vector.h" #include "Types/ViewTypes.h" +#include "Types/Vector.h" + namespace ippl { namespace detail { /*! diff --git a/src/Communicate/Archive.hpp b/src/Communicate/Archive.hpp index f818a2d33..634bb371f 100644 --- a/src/Communicate/Archive.hpp +++ b/src/Communicate/Archive.hpp @@ -15,10 +15,10 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // -#include "Archive.h" - #include +#include "Archive.h" + namespace ippl { namespace detail { diff --git a/src/Communicate/Communicate.h b/src/Communicate/Communicate.h index 37855e21a..789344ed5 100644 --- a/src/Communicate/Communicate.h +++ b/src/Communicate/Communicate.h @@ -17,8 +17,8 @@ #ifndef IPPL_COMMUNICATE_H #define IPPL_COMMUNICATE_H -#include #include +#include // For message size check; see below #include diff --git a/src/Communicate/GlobalComm.hpp b/src/Communicate/GlobalComm.hpp index 10a3622c2..908b1efa9 100644 --- a/src/Communicate/GlobalComm.hpp +++ b/src/Communicate/GlobalComm.hpp @@ -24,13 +24,15 @@ ***************************************************************************/ // include files +#include + #include "Communicate/DataTypes.h" + +#include "Utility/IpplInfo.h" + #include "Communicate/GlobalComm.h" #include "Communicate/Operations.h" #include "Communicate/Tags.h" -#include "Utility/IpplInfo.h" - -#include //////////////////////////////////////////////////////////////////////////// // Reduce equally-sized arrays across the machine, by sending to node diff --git a/src/Communicate/Operations.h b/src/Communicate/Operations.h index 0346f2c76..9d8d5b34f 100644 --- a/src/Communicate/Operations.h +++ b/src/Communicate/Operations.h @@ -21,8 +21,8 @@ #ifndef IPPL_MPI_OPERATIONS_H #define IPPL_MPI_OPERATIONS_H -#include #include +#include template struct is_ippl_mpi_type : std::false_type {}; diff --git a/src/FFT/FFT.h b/src/FFT/FFT.h index 431cae6d1..71b436803 100644 --- a/src/FFT/FFT.h +++ b/src/FFT/FFT.h @@ -28,17 +28,19 @@ #ifndef IPPL_FFT_FFT_H #define IPPL_FFT_FFT_H +#include #include #include -#include #include #include -#include "Field/Field.h" -#include "FieldLayout/FieldLayout.h" #include "Utility/IpplException.h" #include "Utility/ParameterList.h" +#include "Field/Field.h" + +#include "FieldLayout/FieldLayout.h" + namespace heffte { template <> diff --git a/src/FFT/FFT.hpp b/src/FFT/FFT.hpp index 38815f2f6..de3bab565 100644 --- a/src/FFT/FFT.hpp +++ b/src/FFT/FFT.hpp @@ -28,10 +28,12 @@ Implementations for FFT constructor/destructor and transforms */ -#include "FFT/FFT.h" +#include "Utility/IpplTimings.h" + #include "Field/BareField.h" + +#include "FFT/FFT.h" #include "FieldLayout/FieldLayout.h" -#include "Utility/IpplTimings.h" namespace ippl { diff --git a/src/Field/BConds.h b/src/Field/BConds.h index b33af4d42..52d4e2cc5 100644 --- a/src/Field/BConds.h +++ b/src/Field/BConds.h @@ -21,12 +21,12 @@ #ifndef IPPL_FIELD_BC_H #define IPPL_FIELD_BC_H -#include "Field/BcTypes.h" - #include #include #include +#include "Field/BcTypes.h" + namespace ippl { template class Field; diff --git a/src/Field/BareField.h b/src/Field/BareField.h index 63a1b5963..f0dc947e1 100644 --- a/src/Field/BareField.h +++ b/src/Field/BareField.h @@ -20,19 +20,19 @@ #include -#include "Expression/IpplExpressions.h" +#include +#include + #include "Types/IpplTypes.h" #include "Types/ViewTypes.h" -#include "FieldLayout/FieldLayout.h" - #include "Utility/IpplInfo.h" #include "Utility/PAssert.h" -#include "Field/HaloCells.h" +#include "Expression/IpplExpressions.h" -#include -#include +#include "Field/HaloCells.h" +#include "FieldLayout/FieldLayout.h" namespace ippl { class Index; diff --git a/src/Field/BareField.hpp b/src/Field/BareField.hpp index 43cdcd4a4..604dc15d4 100644 --- a/src/Field/BareField.hpp +++ b/src/Field/BareField.hpp @@ -15,15 +15,17 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // -#include "Communicate/DataTypes.h" #include "Ippl.h" -#include "Utility/Inform.h" -#include "Utility/IpplInfo.h" #include #include #include +#include "Communicate/DataTypes.h" + +#include "Utility/Inform.h" +#include "Utility/IpplInfo.h" + namespace ippl { namespace detail { template diff --git a/src/Field/BcTypes.h b/src/Field/BcTypes.h index fc55c65e1..e1c8439a8 100644 --- a/src/Field/BcTypes.h +++ b/src/Field/BcTypes.h @@ -29,12 +29,13 @@ #ifndef IPPL_FIELD_BC_TYPES_H #define IPPL_FIELD_BC_TYPES_H +#include "Types/IpplTypes.h" +#include "Types/ViewTypes.h" + #include "Communicate/Archive.h" #include "FieldLayout/FieldLayout.h" #include "Index/NDIndex.h" #include "Meshes/UniformCartesian.h" -#include "Types/IpplTypes.h" -#include "Types/ViewTypes.h" namespace ippl { template diff --git a/src/Field/BcTypes.hpp b/src/Field/BcTypes.hpp index 56a142c1d..d799c8728 100644 --- a/src/Field/BcTypes.hpp +++ b/src/Field/BcTypes.hpp @@ -27,9 +27,10 @@ // along with IPPL. If not, see . // -#include "Field/HaloCells.h" #include "Utility/IpplException.h" +#include "Field/HaloCells.h" + namespace ippl { namespace detail { diff --git a/src/Field/Field.h b/src/Field/Field.h index 584de9da7..c920d6742 100644 --- a/src/Field/Field.h +++ b/src/Field/Field.h @@ -18,8 +18,9 @@ #ifndef IPPL_FIELD_H #define IPPL_FIELD_H -#include "Field/BConds.h" #include "Field/BareField.h" +#include "Field/BConds.h" + #include "Meshes/UniformCartesian.h" namespace ippl { diff --git a/src/Field/HaloCells.h b/src/Field/HaloCells.h index bb3024ceb..b28a4cd80 100644 --- a/src/Field/HaloCells.h +++ b/src/Field/HaloCells.h @@ -19,11 +19,13 @@ #define IPPL_HALO_CELLS_H #include + +#include "Types/IpplTypes.h" +#include "Types/ViewTypes.h" + #include "Communicate/Archive.h" #include "FieldLayout/FieldLayout.h" #include "Index/NDIndex.h" -#include "Types/IpplTypes.h" -#include "Types/ViewTypes.h" namespace ippl { namespace detail { diff --git a/src/Field/HaloCells.hpp b/src/Field/HaloCells.hpp index ee71a58e9..23cccf850 100644 --- a/src/Field/HaloCells.hpp +++ b/src/Field/HaloCells.hpp @@ -19,9 +19,10 @@ #include #include -#include "Communicate/Communicate.h" #include "Utility/IpplException.h" +#include "Communicate/Communicate.h" + namespace ippl { namespace detail { template diff --git a/src/FieldLayout/BinaryBalancer.hpp b/src/FieldLayout/BinaryBalancer.hpp index a17997aee..aad9c23ac 100644 --- a/src/FieldLayout/BinaryBalancer.hpp +++ b/src/FieldLayout/BinaryBalancer.hpp @@ -24,10 +24,12 @@ ***************************************************************************/ // include files +#include "Utility/PAssert.h" + #include "Field/BareField.h" + #include "FieldLayout/BinaryBalancer.h" #include "FieldLayout/FieldLayout.h" -#include "Utility/PAssert.h" ////////////////////////////////////////////////////////////////////// diff --git a/src/FieldLayout/FieldLayout.h b/src/FieldLayout/FieldLayout.h index 547624a92..6d924c133 100644 --- a/src/FieldLayout/FieldLayout.h +++ b/src/FieldLayout/FieldLayout.h @@ -21,13 +21,14 @@ #ifndef IPPL_FIELD_LAYOUT_H #define IPPL_FIELD_LAYOUT_H -#include "Index/NDIndex.h" -#include "Types/ViewTypes.h" - #include #include #include +#include "Types/ViewTypes.h" + +#include "Index/NDIndex.h" + namespace ippl { template diff --git a/src/FieldLayout/FieldLayout.hpp b/src/FieldLayout/FieldLayout.hpp index 98868398f..02b63dda2 100644 --- a/src/FieldLayout/FieldLayout.hpp +++ b/src/FieldLayout/FieldLayout.hpp @@ -18,17 +18,17 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // -#include "FieldLayout/FieldLayout.h" #include "Ippl.h" -#include "Utility/PAssert.h" -#include "Partition/Partitioner.h" +#include +#include #include "Utility/IpplException.h" #include "Utility/IpplTimings.h" +#include "Utility/PAssert.h" -#include -#include +#include "FieldLayout/FieldLayout.h" +#include "Partition/Partitioner.h" namespace ippl { diff --git a/src/Ippl.cpp b/src/Ippl.cpp index 90cf1b425..3d690f984 100644 --- a/src/Ippl.cpp +++ b/src/Ippl.cpp @@ -15,13 +15,14 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // +#include #include "Ippl.h" + #include #include #include -#include "Utility/IpplInfo.h" -#include +#include "Utility/IpplInfo.h" // public static members of IpplInfo, initialized to default values std::unique_ptr Ippl::Comm = 0; diff --git a/src/Ippl.h b/src/Ippl.h index 44ea054c6..7c72f99b8 100644 --- a/src/Ippl.h +++ b/src/Ippl.h @@ -20,10 +20,12 @@ #include -#include "Communicate/Communicate.h" #include "Types/IpplTypes.h" + #include "Utility/Inform.h" +#include "Communicate/Communicate.h" + class Ippl; std::ostream& operator<<(std::ostream&, const Ippl&); diff --git a/src/IpplCore.h b/src/IpplCore.h index c00203d71..7b98204c6 100644 --- a/src/IpplCore.h +++ b/src/IpplCore.h @@ -18,9 +18,9 @@ #ifndef IPPL_CORE_H #define IPPL_CORE_H -#include "Field/BConds.h" #include "Field/BareField.h" #include "Field/Field.h" +#include "Field/BConds.h" // IPPL Utilities // #include "Utility/Timer.h" @@ -41,11 +41,11 @@ // // IPPL Meshes // #include "Meshes/UniformCartesian.h" +#include "Types/Vector.h" + #include "Particle/ParticleBase.h" #include "Particle/ParticleSpatialLayout.h" -#include "Types/Vector.h" - // // IPPL Load balancing #include "Decomposition/OrthogonalRecursiveBisection.h" diff --git a/src/Meshes/Cartesian.h b/src/Meshes/Cartesian.h index 11da5da12..21c7c6ca2 100644 --- a/src/Meshes/Cartesian.h +++ b/src/Meshes/Cartesian.h @@ -15,13 +15,13 @@ // Cartesian class - represents non-uniform-spacing cartesian meshes. // include files +#include + #include "AppTypes/Vektor.h" #include "Meshes/CartesianCentering.h" #include "Meshes/Centering.h" #include "Meshes/Mesh.h" -#include - // forward declarations template class BareField; diff --git a/src/Meshes/Cartesian.hpp b/src/Meshes/Cartesian.hpp index 228f07f3e..cbb903300 100644 --- a/src/Meshes/Cartesian.hpp +++ b/src/Meshes/Cartesian.hpp @@ -27,16 +27,18 @@ // Implementations for Cartesian mesh class (nonuniform spacings) // include files -#include "Field/Assign.h" -#include "Field/AssignDefs.h" -#include "Field/BareField.h" -#include "Field/BrickExpression.h" -#include "Field/Field.h" -#include "Field/LField.h" #include "Utility/IpplException.h" #include "Utility/IpplInfo.h" #include "Utility/PAssert.h" +#include "Field/BareField.h" +#include "Field/Field.h" +#include "Field/LField.h" + +#include "Field/Assign.h" +#include "Field/AssignDefs.h" +#include "Field/BrickExpression.h" + //----------------------------------------------------------------------------- // Setup chores common to all constructors: //----------------------------------------------------------------------------- diff --git a/src/Meshes/CartesianCentering.h b/src/Meshes/CartesianCentering.h index 602fefca4..2400dcecf 100644 --- a/src/Meshes/CartesianCentering.h +++ b/src/Meshes/CartesianCentering.h @@ -20,11 +20,11 @@ #ifndef CARTESIAN_CENTERING_H #define CARTESIAN_CENTERING_H -#include "Meshes/Centering.h" - #include #include +#include "Meshes/Centering.h" + // Enumeration of basic 1D (one-component) centering types: // May add to this when unstructured comes in, and it means something to // simply say FACE or EDGE centering (for cartesian meshes, face and edge diff --git a/src/Meshes/UniformCartesian.hpp b/src/Meshes/UniformCartesian.hpp index 9ad94ca5e..49b19a3ef 100644 --- a/src/Meshes/UniformCartesian.hpp +++ b/src/Meshes/UniformCartesian.hpp @@ -15,11 +15,12 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // -#include "Field/BareField.h" -#include "Field/Field.h" #include "Utility/IpplInfo.h" #include "Utility/PAssert.h" +#include "Field/BareField.h" +#include "Field/Field.h" + namespace ippl { template diff --git a/src/Particle/IntNGP.h b/src/Particle/IntNGP.h index a2bf81723..0df2c1ba9 100644 --- a/src/Particle/IntNGP.h +++ b/src/Particle/IntNGP.h @@ -16,6 +16,7 @@ // include files #include "Field/Field.h" + #include "Particle/Interpolator.h" // forward declaration diff --git a/src/Particle/Interpolator.h b/src/Particle/Interpolator.h index 8d56d4b2f..f70394213 100644 --- a/src/Particle/Interpolator.h +++ b/src/Particle/Interpolator.h @@ -12,19 +12,21 @@ #define INTERPOLATOR_H // include files -#include "AppTypes/Vektor.h" -#include "Field/BareField.h" -#include "Field/CompressedBrickIterator.h" -#include "Field/LField.h" -#include "Index/NDIndex.h" -#include "Utility/IpplException.h" -#include "Utility/IpplInfo.h" - #include #include #include #include +#include "Utility/IpplException.h" +#include "Utility/IpplInfo.h" + +#include "Field/BareField.h" +#include "Field/LField.h" + +#include "AppTypes/Vektor.h" +#include "Field/CompressedBrickIterator.h" +#include "Index/NDIndex.h" + // Helper class and functions for finding nearest grid point given centering // A tag indicating the Field centering type diff --git a/src/Particle/ParticleAttrib.h b/src/Particle/ParticleAttrib.h index 78b2815b1..e95fdbc72 100644 --- a/src/Particle/ParticleAttrib.h +++ b/src/Particle/ParticleAttrib.h @@ -30,6 +30,7 @@ #define IPPL_PARTICLE_ATTRIB_H #include "Expression/IpplExpressions.h" + #include "Particle/ParticleAttribBase.h" namespace ippl { diff --git a/src/Particle/ParticleAttrib.hpp b/src/Particle/ParticleAttrib.hpp index 2ef1bb619..a33c0adde 100644 --- a/src/Particle/ParticleAttrib.hpp +++ b/src/Particle/ParticleAttrib.hpp @@ -26,8 +26,10 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // -#include "Communicate/DataTypes.h" #include "Ippl.h" + +#include "Communicate/DataTypes.h" + #include "Utility/IpplTimings.h" namespace ippl { diff --git a/src/Particle/ParticleBalancer.hpp b/src/Particle/ParticleBalancer.hpp index a13378ae3..c355d7519 100644 --- a/src/Particle/ParticleBalancer.hpp +++ b/src/Particle/ParticleBalancer.hpp @@ -24,6 +24,8 @@ ***************************************************************************/ // include files +#include "Utility/IpplInfo.h" + #include "FieldLayout/BinaryBalancer.h" #include "FieldLayout/FieldLayout.h" #include "Index/NDIndex.h" @@ -33,7 +35,6 @@ #include "Particle/ParticleBalancer.h" #include "Particle/ParticleSpatialLayout.h" #include "Region/RegionLayout.h" -#include "Utility/IpplInfo.h" ///////////////////////////////////////////////////////////////////////////// // calculate a new RegionLayout for a given ParticleBase, and distribute the diff --git a/src/Particle/ParticleBase.h b/src/Particle/ParticleBase.h index c6cb118f3..93929ab67 100644 --- a/src/Particle/ParticleBase.h +++ b/src/Particle/ParticleBase.h @@ -64,10 +64,11 @@ #ifndef IPPL_PARTICLE_BASE_H #define IPPL_PARTICLE_BASE_H -#include "Particle/ParticleLayout.h" +#include + #include "Types/IpplTypes.h" -#include +#include "Particle/ParticleLayout.h" namespace ippl { /*! diff --git a/src/Particle/ParticleLayout.h b/src/Particle/ParticleLayout.h index 34809aa46..6d2ff7a02 100644 --- a/src/Particle/ParticleLayout.h +++ b/src/Particle/ParticleLayout.h @@ -44,11 +44,10 @@ #ifndef IPPL_PARTICLE_LAYOUT_H #define IPPL_PARTICLE_LAYOUT_H -#include "Particle/ParticleBC.h" +#include #include "Particle/ParticleAttrib.h" - -#include +#include "Particle/ParticleBC.h" namespace ippl { namespace detail { diff --git a/src/Particle/ParticleSpatialLayout.h b/src/Particle/ParticleSpatialLayout.h index d1d12b62b..fd34c1e5f 100644 --- a/src/Particle/ParticleSpatialLayout.h +++ b/src/Particle/ParticleSpatialLayout.h @@ -35,12 +35,11 @@ #ifndef IPPL_PARTICLE_SPATIAL_LAYOUT_H #define IPPL_PARTICLE_SPATIAL_LAYOUT_H +#include "Types/IpplTypes.h" + #include "FieldLayout/FieldLayout.h" #include "Particle/ParticleBase.h" #include "Particle/ParticleLayout.h" - -#include "Types/IpplTypes.h" - #include "Region/RegionLayout.h" namespace ippl { diff --git a/src/Particle/ParticleSpatialLayout.hpp b/src/Particle/ParticleSpatialLayout.hpp index fd34dbd55..8ab9f7fc8 100644 --- a/src/Particle/ParticleSpatialLayout.hpp +++ b/src/Particle/ParticleSpatialLayout.hpp @@ -35,6 +35,7 @@ #include #include #include + #include "Utility/IpplTimings.h" namespace ippl { diff --git a/src/Region/NDRegion.h b/src/Region/NDRegion.h index c8f598d17..951720b40 100644 --- a/src/Region/NDRegion.h +++ b/src/Region/NDRegion.h @@ -19,10 +19,10 @@ #ifndef IPPL_NDREGION_H #define IPPL_NDREGION_H -#include "Region/PRegion.h" - #include +#include "Region/PRegion.h" + namespace ippl { template /*! diff --git a/src/Region/RegionLayout.h b/src/Region/RegionLayout.h index a8ab193d4..46a16a964 100644 --- a/src/Region/RegionLayout.h +++ b/src/Region/RegionLayout.h @@ -36,10 +36,10 @@ #include -#include "Region/NDRegion.h" - #include "Types/ViewTypes.h" +#include "Region/NDRegion.h" + namespace ippl { namespace detail { diff --git a/src/Solver/FFTPeriodicPoissonSolver.h b/src/Solver/FFTPeriodicPoissonSolver.h index 748021ce0..241011d22 100644 --- a/src/Solver/FFTPeriodicPoissonSolver.h +++ b/src/Solver/FFTPeriodicPoissonSolver.h @@ -20,11 +20,12 @@ #ifndef IPPL_FFT_PERIODIC_POISSON_SOLVER_H #define IPPL_FFT_PERIODIC_POISSON_SOLVER_H +#include "Types/ViewTypes.h" + #include "Electrostatics.h" #include "FFT/FFT.h" #include "FieldLayout/FieldLayout.h" #include "Index/NDIndex.h" -#include "Types/ViewTypes.h" namespace ippl { diff --git a/src/Solver/FFTPoissonSolver.h b/src/Solver/FFTPoissonSolver.h index 84068caa3..4ecbd6601 100644 --- a/src/Solver/FFTPoissonSolver.h +++ b/src/Solver/FFTPoissonSolver.h @@ -17,12 +17,14 @@ #ifndef FFT_POISSON_SOLVER_H_ #define FFT_POISSON_SOLVER_H_ +#include "Types/Vector.h" + +#include "Field/Field.h" + #include "Electrostatics.h" #include "FFT/FFT.h" -#include "Field/Field.h" #include "FieldLayout/FieldLayout.h" #include "Meshes/UniformCartesian.h" -#include "Types/Vector.h" namespace ippl { template , diff --git a/src/Solver/FFTPoissonSolver.hpp b/src/Solver/FFTPoissonSolver.hpp index 00316e5ef..5726752d5 100644 --- a/src/Solver/FFTPoissonSolver.hpp +++ b/src/Solver/FFTPoissonSolver.hpp @@ -15,11 +15,13 @@ // #include + +#include "Utility/IpplException.h" +#include "Utility/IpplTimings.h" + #include "Communicate/Archive.h" #include "FFTPoissonSolver.h" #include "Field/HaloCells.h" -#include "Utility/IpplException.h" -#include "Utility/IpplTimings.h" // Communication specific functions (pack and unpack). template diff --git a/src/Solver/Solver.h b/src/Solver/Solver.h index b3218ee0d..265dc4718 100644 --- a/src/Solver/Solver.h +++ b/src/Solver/Solver.h @@ -19,9 +19,10 @@ #ifndef IPPL_SOLVER_H #define IPPL_SOLVER_H -#include "Field/Field.h" #include "Utility/ParameterList.h" +#include "Field/Field.h" + namespace ippl { template , diff --git a/src/Solver/SolverAlgorithm.h b/src/Solver/SolverAlgorithm.h index 36d6e11b0..f3aeb8a21 100644 --- a/src/Solver/SolverAlgorithm.h +++ b/src/Solver/SolverAlgorithm.h @@ -20,6 +20,7 @@ #define IPPL_SOLVER_ALGORITHM_H #include + #include "Utility/ParameterList.h" namespace ippl { diff --git a/src/Solver/test/Budiardja_plot.cpp b/src/Solver/test/Budiardja_plot.cpp index 89e6756ab..fdf62f0d4 100644 --- a/src/Solver/test/Budiardja_plot.cpp +++ b/src/Solver/test/Budiardja_plot.cpp @@ -1,9 +1,10 @@ // This program recreates the convergence test plot from the Budiardja et al. (2010) paper. // Gravitational potential of a sphere. -#include "FFTPoissonSolver.h" #include "Ippl.h" +#include "FFTPoissonSolver.h" + KOKKOS_INLINE_FUNCTION double source(double x, double y, double z, double density = 1.0, double R = 1.0, double mu = 1.2) { double pi = std::acos(-1.0); diff --git a/src/Solver/test/TestCGSolver.cpp b/src/Solver/test/TestCGSolver.cpp index 91f2b6980..3672dd53a 100644 --- a/src/Solver/test/TestCGSolver.cpp +++ b/src/Solver/test/TestCGSolver.cpp @@ -8,10 +8,11 @@ #include #include -#include "ElectrostaticsCG.h" #include "Utility/Inform.h" #include "Utility/IpplTimings.h" +#include "ElectrostaticsCG.h" + int main(int argc, char* argv[]) { Ippl ippl(argc, argv); diff --git a/src/Solver/test/TestGaussian.cpp b/src/Solver/test/TestGaussian.cpp index 9fd0b5deb..d9d532c3c 100644 --- a/src/Solver/test/TestGaussian.cpp +++ b/src/Solver/test/TestGaussian.cpp @@ -10,12 +10,15 @@ // See heffte documentation for more information on these parameters: // https://mkstoyanov.bitbucket.io/heffte/ -#include -#include "FFTPoissonSolver.h" #include "Ippl.h" + +#include + #include "Utility/IpplException.h" #include "Utility/IpplTimings.h" +#include "FFTPoissonSolver.h" + KOKKOS_INLINE_FUNCTION double gaussian(double x, double y, double z, double sigma = 0.05, double mu = 0.5) { double pi = std::acos(-1.0); diff --git a/src/Solver/test/TestGaussian_biharmonic.cpp b/src/Solver/test/TestGaussian_biharmonic.cpp index 7c60a1ee8..d417b3014 100644 --- a/src/Solver/test/TestGaussian_biharmonic.cpp +++ b/src/Solver/test/TestGaussian_biharmonic.cpp @@ -4,10 +4,12 @@ // srun ./TestGaussian_convergence HOCKNEY --info 10 // OR srun ./TestGaussian_convergence VICO --info 10 -#include "FFTPoissonSolver.h" #include "Ippl.h" + #include "Utility/IpplTimings.h" +#include "FFTPoissonSolver.h" + KOKKOS_INLINE_FUNCTION double gaussian(double x, double y, double z, double sigma = 0.05, double mu = 0.5) { double pi = std::acos(-1.0); diff --git a/src/Solver/test/TestGaussian_convergence.cpp b/src/Solver/test/TestGaussian_convergence.cpp index a0e0b9761..af4cb0e46 100644 --- a/src/Solver/test/TestGaussian_convergence.cpp +++ b/src/Solver/test/TestGaussian_convergence.cpp @@ -4,10 +4,12 @@ // srun ./TestGaussian_convergence HOCKNEY --info 10 // OR srun ./TestGaussian_convergence VICO --info 10 -#include "FFTPoissonSolver.h" #include "Ippl.h" + #include "Utility/IpplTimings.h" +#include "FFTPoissonSolver.h" + KOKKOS_INLINE_FUNCTION double gaussian(double x, double y, double z, double sigma = 0.05, double mu = 0.5) { double pi = std::acos(-1.0); diff --git a/src/Solver/test/TestSphere.cpp b/src/Solver/test/TestSphere.cpp index c7326ccde..002710a07 100644 --- a/src/Solver/test/TestSphere.cpp +++ b/src/Solver/test/TestSphere.cpp @@ -4,9 +4,10 @@ // The algorithm can be chosen by the user ("HOCKNEY" or "VICO"). Example: // srun ./TestSphere HOCKNEY --info 10 -#include "FFTPoissonSolver.h" #include "Ippl.h" +#include "FFTPoissonSolver.h" + KOKKOS_INLINE_FUNCTION double source(double x, double y, double z, double density = 1.0, double R = 1.0, double mu = 1.2) { double pi = std::acos(-1.0); diff --git a/src/Types/Vector.h b/src/Types/Vector.h index ee97dedc8..17179011e 100644 --- a/src/Types/Vector.h +++ b/src/Types/Vector.h @@ -18,10 +18,10 @@ #ifndef IPPL_Vector_H #define IPPL_Vector_H -#include "Expression/IpplExpressions.h" - #include +#include "Expression/IpplExpressions.h" + namespace ippl { /*! * @file Vector.h diff --git a/src/Utility/Inform.cpp b/src/Utility/Inform.cpp index 557168054..764f94a6f 100644 --- a/src/Utility/Inform.cpp +++ b/src/Utility/Inform.cpp @@ -24,10 +24,10 @@ ***************************************************************************/ // include files -#include "Utility/Inform.h" - #include "Ippl.h" +#include "Utility/Inform.h" + #include #include diff --git a/src/Utility/IpplInfo.cpp b/src/Utility/IpplInfo.cpp index 3039f6b03..2b78134d5 100644 --- a/src/Utility/IpplInfo.cpp +++ b/src/Utility/IpplInfo.cpp @@ -15,15 +15,14 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // -#include "Utility/IpplInfo.h" - #include "Ippl.h" - #include "IpplVersions.h" -#include +#include "Utility/IpplInfo.h" + #include #include +#include ///////////////////////////////////////////////////////////////////// // printVersion: print out a version summary. If the argument is true, diff --git a/src/Utility/IpplMemoryUsage.h b/src/Utility/IpplMemoryUsage.h index 3f35f5c86..e25773827 100644 --- a/src/Utility/IpplMemoryUsage.h +++ b/src/Utility/IpplMemoryUsage.h @@ -41,9 +41,9 @@ #ifndef IPPL_MEMPRYUSAGE_H #define IPPL_MEMPRYUSAGE_H -#include #include "Ippl.h" +#include #include #include // not required but increases portability diff --git a/src/Utility/IpplTimings.cpp b/src/Utility/IpplTimings.cpp index b8d802cfa..3e5b6c030 100644 --- a/src/Utility/IpplTimings.cpp +++ b/src/Utility/IpplTimings.cpp @@ -34,15 +34,18 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // -#include "Utility/IpplTimings.h" + #include "Ippl.h" -#include "Utility/Inform.h" -#include "Utility/IpplInfo.h" + +#include "Utility/IpplTimings.h" #include #include #include +#include "Utility/Inform.h" +#include "Utility/IpplInfo.h" + Timing* IpplTimings::instance = new Timing(); std::stack IpplTimings::stashedInstance; diff --git a/src/Utility/IpplTimings.h b/src/Utility/IpplTimings.h index 87c380b83..73481463c 100644 --- a/src/Utility/IpplTimings.h +++ b/src/Utility/IpplTimings.h @@ -37,17 +37,16 @@ #ifndef IPPL_TIMINGS_H #define IPPL_TIMINGS_H -#include "Utility/PAssert.h" -#include "Utility/Timer.h" -#include "Utility/my_auto_ptr.h" - +#include #include #include #include #include #include -#include +#include "Utility/PAssert.h" +#include "Utility/Timer.h" +#include "Utility/my_auto_ptr.h" // a simple class used to store timer values class IpplTimerInfo { diff --git a/src/Utility/PAssert.h b/src/Utility/PAssert.h index a43391a72..078593929 100644 --- a/src/Utility/PAssert.h +++ b/src/Utility/PAssert.h @@ -6,11 +6,11 @@ #ifndef PASSERT_H #define PASSERT_H -#include "Utility/IpplInfo.h" - #include #include #include + +#include "Utility/IpplInfo.h" ////////////////////////////////////////////////////////////////////// // // This is a compile time assert. diff --git a/src/Utility/Timer.cpp b/src/Utility/Timer.cpp index 91b7e7371..e455f51c0 100644 --- a/src/Utility/Timer.cpp +++ b/src/Utility/Timer.cpp @@ -19,10 +19,10 @@ // You should have received a copy of the GNU General Public License // along with OPAL. If not, see . // -#include "Timer.h" - #include "Kokkos_Core.hpp" +#include "Timer.h" + Timer::Timer() { this->clear(); } diff --git a/src/Utility/UserList.cpp b/src/Utility/UserList.cpp index 2ea88a143..6aae2c501 100644 --- a/src/Utility/UserList.cpp +++ b/src/Utility/UserList.cpp @@ -25,6 +25,7 @@ // include files #include "Utility/UserList.h" + #include "Utility/PAssert.h" //////////////////////////////////////////////////////////////////////////// diff --git a/src/Utility/vmap.hpp b/src/Utility/vmap.hpp index b1d48a9f5..94ec543db 100644 --- a/src/Utility/vmap.hpp +++ b/src/Utility/vmap.hpp @@ -25,6 +25,7 @@ // include files #include + #include "Utility/vmap.h" ////////////////////////////////////////////////////////////////////// diff --git a/test/FFT/TestCos.cpp b/test/FFT/TestCos.cpp index 4e5cead53..aa6c96779 100644 --- a/test/FFT/TestCos.cpp +++ b/test/FFT/TestCos.cpp @@ -1,11 +1,12 @@ #include "Ippl.h" -#include "Utility/ParameterList.h" #include #include #include #include +#include "Utility/ParameterList.h" + int main(int argc, char* argv[]) { Ippl ippl(argc, argv); diff --git a/test/FFT/TestFFTCC.cpp b/test/FFT/TestFFTCC.cpp index 44ad77bf8..5688f2eba 100644 --- a/test/FFT/TestFFTCC.cpp +++ b/test/FFT/TestFFTCC.cpp @@ -1,11 +1,12 @@ #include "Ippl.h" -#include "Utility/ParameterList.h" #include #include #include #include +#include "Utility/ParameterList.h" + int main(int argc, char* argv[]) { Ippl ippl(argc, argv); diff --git a/test/FFT/TestFFTRC.cpp b/test/FFT/TestFFTRC.cpp index e0d1270b6..57a6c1138 100644 --- a/test/FFT/TestFFTRC.cpp +++ b/test/FFT/TestFFTRC.cpp @@ -1,11 +1,12 @@ #include "Ippl.h" -#include "Utility/ParameterList.h" #include #include #include #include +#include "Utility/ParameterList.h" + int main(int argc, char* argv[]) { Ippl ippl(argc, argv); diff --git a/test/FFT/TestSine.cpp b/test/FFT/TestSine.cpp index 873328a2c..dac5393d2 100644 --- a/test/FFT/TestSine.cpp +++ b/test/FFT/TestSine.cpp @@ -1,11 +1,12 @@ #include "Ippl.h" -#include "Utility/ParameterList.h" #include #include #include #include +#include "Utility/ParameterList.h" + int main(int argc, char* argv[]) { Ippl ippl(argc, argv); diff --git a/test/kokkos/TestVectorField2.cpp b/test/kokkos/TestVectorField2.cpp index aded804e7..a8210f936 100644 --- a/test/kokkos/TestVectorField2.cpp +++ b/test/kokkos/TestVectorField2.cpp @@ -1,6 +1,5 @@ -#include "Ippl.h" - #include +#include "Ippl.h" #include #include diff --git a/test/kokkos/TestVectorField3.cpp b/test/kokkos/TestVectorField3.cpp index c2dd30731..166dafd8b 100644 --- a/test/kokkos/TestVectorField3.cpp +++ b/test/kokkos/TestVectorField3.cpp @@ -1,6 +1,5 @@ -#include "Ippl.h" - #include +#include "Ippl.h" #include #include diff --git a/test/kokkos/TestVectorField4.cpp b/test/kokkos/TestVectorField4.cpp index a93c85f28..38a533c9a 100644 --- a/test/kokkos/TestVectorField4.cpp +++ b/test/kokkos/TestVectorField4.cpp @@ -1,6 +1,5 @@ -#include "Ippl.h" - #include +#include "Ippl.h" #include #include diff --git a/test/p3m/p3m3d.cpp b/test/p3m/p3m3d.cpp index 5c123dbc6..d716d027a 100644 --- a/test/p3m/p3m3d.cpp +++ b/test/p3m/p3m3d.cpp @@ -25,12 +25,14 @@ // You should have received a copy of the GNU General Public License // along with OPAL. If not, see . // +#include "Ippl.h" + #include #include #include #include #include -#include "Ippl.h" + #include "Particle/BoxParticleCachingPolicy.h" #include "Particle/PairBuilder/HashPairBuilder.h" #include "Particle/PairBuilder/PairConditions.h" diff --git a/test/p3m/p3m3dHeating.cpp b/test/p3m/p3m3dHeating.cpp index d5ef512a6..21f78a8c6 100644 --- a/test/p3m/p3m3dHeating.cpp +++ b/test/p3m/p3m3dHeating.cpp @@ -23,25 +23,26 @@ // You should have received a copy of the GNU General Public License // along with OPAL. If not, see . // +#include "Ippl.h" + #include #include #include #include +#include #include #include + +#include "Utility/PAssert.h" + +#include "ChargedParticleFactory.hpp" #include "H5hut.h" -#include "Ippl.h" #include "Particle/BoxParticleCachingPolicy.h" #include "Particle/PairBuilder/HashPairBuilderPeriodic.h" #include "Particle/PairBuilder/HashPairBuilderPeriodicParallel.h" #include "Particle/PairBuilder/PairConditions.h" -#include "Utility/PAssert.h" -#include "math.h" - -#include - -#include "ChargedParticleFactory.hpp" #include "VTKFieldWriterParallel.hpp" +#include "math.h" // dimension of our positions const unsigned Dim = 3; diff --git a/test/p3m/p3m3dMicrobunching.cpp b/test/p3m/p3m3dMicrobunching.cpp index 567e115fe..ec24a5012 100644 --- a/test/p3m/p3m3dMicrobunching.cpp +++ b/test/p3m/p3m3dMicrobunching.cpp @@ -22,6 +22,8 @@ // You should have received a copy of the GNU General Public License // along with OPAL. If not, see . // +#include "Ippl.h" + #include #include #include @@ -29,13 +31,14 @@ #include #include #include + +#include "Utility/PAssert.h" + #include "H5hut.h" -#include "Ippl.h" #include "Particle/BoxParticleCachingPolicy.h" #include "Particle/PairBuilder/HashPairBuilderPeriodic.h" #include "Particle/PairBuilder/HashPairBuilderPeriodicParallel.h" #include "Particle/PairBuilder/PairConditions.h" -#include "Utility/PAssert.h" #include "math.h" // #include "FixedAlgebra/FMatrix.h" diff --git a/test/p3m/p3m3dRegressionTests.cpp b/test/p3m/p3m3dRegressionTests.cpp index f06cb85cf..9c8553527 100644 --- a/test/p3m/p3m3dRegressionTests.cpp +++ b/test/p3m/p3m3dRegressionTests.cpp @@ -23,22 +23,22 @@ // You should have received a copy of the GNU General Public License // along with OPAL. If not, see . // +#include "Ippl.h" + #include #include #include +#include #include #include -#include "Ippl.h" + +#include "ChargedParticleFactory.hpp" #include "Particle/BoxParticleCachingPolicy.h" #include "Particle/PairBuilder/HashPairBuilderPeriodic.h" #include "Particle/PairBuilder/HashPairBuilderPeriodicParallel.h" #include "Particle/PairBuilder/PairConditions.h" -#include "math.h" - -#include - -#include "ChargedParticleFactory.hpp" #include "VTKFieldWriterParallel.hpp" +#include "math.h" // dimension of our positions const unsigned Dim = 3; diff --git a/test/p3m/p3m3dTwoStreamParallel.cpp b/test/p3m/p3m3dTwoStreamParallel.cpp index 365244875..4cd29b0d6 100644 --- a/test/p3m/p3m3dTwoStreamParallel.cpp +++ b/test/p3m/p3m3dTwoStreamParallel.cpp @@ -21,20 +21,20 @@ // You should have received a copy of the GNU General Public License // along with OPAL. If not, see . // -#include -#include #include "Ippl.h" #include #include #include +#include +#include +#include + #include "Particle/BoxParticleCachingPolicy.h" #include "Particle/PairBuilder/HashPairBuilderPeriodicParallel.h" #include "Particle/PairBuilder/PairConditions.h" #include "math.h" -#include - // #include "VTKFieldWriter.hpp" #include "ChargedParticleFactory.hpp" #include "VTKFieldWriterParallel.hpp" diff --git a/test/particle/PIC3d.cpp b/test/particle/PIC3d.cpp index cc47fccfb..1261ed894 100644 --- a/test/particle/PIC3d.cpp +++ b/test/particle/PIC3d.cpp @@ -24,13 +24,14 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // +#include "Ippl.h" + #include +#include #include #include #include -#include "Ippl.h" -#include #include "Utility/IpplTimings.h" // dimension of our positions diff --git a/test/particle/TestGather.cpp b/test/particle/TestGather.cpp index 616adb5a7..5b3067e86 100644 --- a/test/particle/TestGather.cpp +++ b/test/particle/TestGather.cpp @@ -1,6 +1,7 @@ -#include #include "Ippl.h" +#include + template struct Bunch : public ippl::ParticleBase { Bunch(PLayout& playout) diff --git a/test/particle/TestScatter.cpp b/test/particle/TestScatter.cpp index 683b0b436..57dea32bd 100644 --- a/test/particle/TestScatter.cpp +++ b/test/particle/TestScatter.cpp @@ -1,6 +1,7 @@ -#include #include "Ippl.h" +#include + template struct Bunch : public ippl::ParticleBase { Bunch(PLayout& playout) diff --git a/test/particle/benchmarkParticleUpdate.cpp b/test/particle/benchmarkParticleUpdate.cpp index 7196f314d..1457d7994 100644 --- a/test/particle/benchmarkParticleUpdate.cpp +++ b/test/particle/benchmarkParticleUpdate.cpp @@ -15,14 +15,15 @@ // You should have received a copy of the GNU General Public License // along with IPPL. If not, see . // +#include "Ippl.h" + +#include #include +#include #include #include #include -#include "Ippl.h" -#include -#include #include "Utility/IpplTimings.h" // dimension of our positions diff --git a/test/serialization/serialize01.cpp b/test/serialization/serialize01.cpp index 0c99cfb59..484a461ab 100644 --- a/test/serialization/serialize01.cpp +++ b/test/serialization/serialize01.cpp @@ -1,8 +1,8 @@ -#include -#include +#include +#include #include -#include +#include template void send(int, int, BType&); diff --git a/test/vector/TestVector2.cpp b/test/vector/TestVector2.cpp index 66103bd3f..b81dba896 100644 --- a/test/vector/TestVector2.cpp +++ b/test/vector/TestVector2.cpp @@ -1,12 +1,10 @@ #include +#include #include #include - #include -#include - template class Expression { public: diff --git a/test/vector/TestVector3.cpp b/test/vector/TestVector3.cpp index e9c4d2d88..4592dbc1d 100644 --- a/test/vector/TestVector3.cpp +++ b/test/vector/TestVector3.cpp @@ -1,12 +1,10 @@ #include +#include #include #include - #include -#include - template class Expression { public: diff --git a/unit_tests/BareField/BareField.cpp b/unit_tests/BareField/BareField.cpp index 50914ed6a..a04e66271 100644 --- a/unit_tests/BareField/BareField.cpp +++ b/unit_tests/BareField/BareField.cpp @@ -18,6 +18,7 @@ #include "Ippl.h" #include + #include "gtest/gtest.h" class BareFieldTest : public ::testing::Test { diff --git a/unit_tests/Field/Field.cpp b/unit_tests/Field/Field.cpp index 93c0508ab..77a880aa7 100644 --- a/unit_tests/Field/Field.cpp +++ b/unit_tests/Field/Field.cpp @@ -18,6 +18,7 @@ #include "Ippl.h" #include + #include "gtest/gtest.h" class FieldTest : public ::testing::Test { diff --git a/unit_tests/Field/FieldBC.cpp b/unit_tests/Field/FieldBC.cpp index f6f1937eb..f268cf2d0 100644 --- a/unit_tests/Field/FieldBC.cpp +++ b/unit_tests/Field/FieldBC.cpp @@ -17,9 +17,11 @@ // along with IPPL. If not, see . // #include "Ippl.h" -#include "Utility/IpplException.h" #include + +#include "Utility/IpplException.h" + #include "gtest/gtest.h" class FieldBCTest : public ::testing::Test { diff --git a/unit_tests/Meshes/UniformCartesian.cpp b/unit_tests/Meshes/UniformCartesian.cpp index c13975e2a..813a96f7c 100644 --- a/unit_tests/Meshes/UniformCartesian.cpp +++ b/unit_tests/Meshes/UniformCartesian.cpp @@ -18,6 +18,7 @@ #include "Ippl.h" #include + #include "gtest/gtest.h" class UniformCartesianTest : public ::testing::Test { diff --git a/unit_tests/PIC/ORB.cpp b/unit_tests/PIC/ORB.cpp index f6a5dacea..dba3357cb 100644 --- a/unit_tests/PIC/ORB.cpp +++ b/unit_tests/PIC/ORB.cpp @@ -19,10 +19,10 @@ #include "Ippl.h" #include -#include "gtest/gtest.h" - #include +#include "gtest/gtest.h" + class ORBTest : public ::testing::Test { public: static constexpr size_t dim = 3; diff --git a/unit_tests/PIC/PIC.cpp b/unit_tests/PIC/PIC.cpp index 08a67c4e2..d74da07a5 100644 --- a/unit_tests/PIC/PIC.cpp +++ b/unit_tests/PIC/PIC.cpp @@ -18,10 +18,10 @@ #include "Ippl.h" #include -#include "gtest/gtest.h" - #include +#include "gtest/gtest.h" + class PICTest : public ::testing::Test { public: static constexpr size_t dim = 3; diff --git a/unit_tests/Particle/ParticleBC.cpp b/unit_tests/Particle/ParticleBC.cpp index e3399ab93..909ecc252 100644 --- a/unit_tests/Particle/ParticleBC.cpp +++ b/unit_tests/Particle/ParticleBC.cpp @@ -18,6 +18,7 @@ #include "Ippl.h" #include + #include "gtest/gtest.h" class ParticleBCTest : public ::testing::Test { diff --git a/unit_tests/Particle/ParticleBase.cpp b/unit_tests/Particle/ParticleBase.cpp index 2714fada6..0d2dca84c 100644 --- a/unit_tests/Particle/ParticleBase.cpp +++ b/unit_tests/Particle/ParticleBase.cpp @@ -18,6 +18,7 @@ #include "Ippl.h" #include + #include "gtest/gtest.h" class ParticleBaseTest : public ::testing::Test { diff --git a/unit_tests/Particle/ParticleSendRecv.cpp b/unit_tests/Particle/ParticleSendRecv.cpp index 806ee7b5b..2e6d2876d 100644 --- a/unit_tests/Particle/ParticleSendRecv.cpp +++ b/unit_tests/Particle/ParticleSendRecv.cpp @@ -19,10 +19,10 @@ #include "Ippl.h" #include -#include "gtest/gtest.h" - #include +#include "gtest/gtest.h" + class ParticleSendRecv : public ::testing::Test { public: static constexpr size_t dim = 3; diff --git a/unit_tests/Utility/ParameterList.cpp b/unit_tests/Utility/ParameterList.cpp index 7a26182d3..7c10311c1 100644 --- a/unit_tests/Utility/ParameterList.cpp +++ b/unit_tests/Utility/ParameterList.cpp @@ -17,8 +17,10 @@ // #include "Ippl.h" -#include "Utility/IpplException.h" #include "Utility/ParameterList.h" + +#include "Utility/IpplException.h" + #include "gtest/gtest.h" class ParameterListTest : public ::testing::Test {