Merge branch 'reformat-code' into 'master'

Reorder #include directives

See merge request OPAL/Libraries/ippl!160

.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

alpine/BumponTailInstability.cpp

@@ -34,19 +34,19 @@
 // along with IPPL. If not, see <https://www.gnu.org/licenses/>.
 //
 
+#include <Kokkos_Random.hpp>
 #include <chrono>
 #include <cmath>
 #include <iostream>
+#include <random>
 #include <set>
 #include <string>
 #include <vector>
-#include "ChargedParticles.hpp"
-
-#include <Kokkos_Random.hpp>
 
-#include <random>
 #include "Utility/IpplTimings.h"
 
+#include "ChargedParticles.hpp"
+
 template <typename T>
 struct Newton1D {
     double tol   = 1e-12;

alpine/ChargedParticles.hpp

@@ -17,6 +17,7 @@
 //
 
 #include "Ippl.h"
+
 #include "Solver/FFTPeriodicPoissonSolver.h"
 
 // dimension of our positions

alpine/LandauDamping.cpp

@@ -31,19 +31,19 @@
 // along with IPPL. If not, see <https://www.gnu.org/licenses/>.
 //
 
+#include <Kokkos_Random.hpp>
 #include <chrono>
 #include <cmath>
 #include <iostream>
+#include <random>
 #include <set>
 #include <string>
 #include <vector>
-#include "ChargedParticles.hpp"
-
-#include <Kokkos_Random.hpp>
 
-#include <random>
 #include "Utility/IpplTimings.h"
 
+#include "ChargedParticles.hpp"
+
 template <typename T>
 struct Newton1D {
     double tol   = 1e-12;

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 <https://www.gnu.org/licenses/>.
 //
-#include "ChargedParticles.hpp"
-
+#include <Kokkos_Random.hpp>
 #include <chrono>
 #include <cmath>
 #include <iostream>
+#include <random>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <Kokkos_Random.hpp>
-#include <random>
 #include "Utility/IpplTimings.h"
 
+#include "ChargedParticles.hpp"
+
 template <typename T>
 struct Newton1D {
     double tol   = 1e-12;

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 <https://www.gnu.org/licenses/>.
 //
-#include "ChargedParticles.hpp"
-
+#include <Kokkos_Random.hpp>
 #include <chrono>
 #include <iostream>
+#include <random>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <Kokkos_Random.hpp>
-
-#include <random>
 #include "Utility/IpplTimings.h"
 
+#include "ChargedParticles.hpp"
+
 const char* TestName = "UniformPlasmaTest";
 
 template <typename T, class GeneratorPool, unsigned Dim>

src/AmrParticle/AmrParticleBase.h

@@ -38,9 +38,8 @@
 
 #include "Ippl.h"
 
-#include "Particle/IpplParticleBase.h"
-
 #include "AmrParticleLevelCounter.h"
+#include "Particle/IpplParticleBase.h"
 
 template <class PLayout>
 class AmrParticleBase : public IpplParticleBase<PLayout> {

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 {
         /*!

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 <https://www.gnu.org/licenses/>.
 //
-#include "Archive.h"
-
 #include <cstring>
 
+#include "Archive.h"
+
 namespace ippl {
     namespace detail {
 

src/Communicate/Communicate.h

@@ -17,8 +17,8 @@
 #ifndef IPPL_COMMUNICATE_H
 #define IPPL_COMMUNICATE_H
 
-#include <mpi.h>
 #include <map>
+#include <mpi.h>
 
 // For message size check; see below
 #include <climits>

src/Communicate/GlobalComm.hpp

@@ -24,13 +24,15 @@
  ***************************************************************************/
 
 // include files
+#include <algorithm>
+
 #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 <algorithm>
 
 ////////////////////////////////////////////////////////////////////////////
 // Reduce equally-sized arrays across the machine, by sending to node

src/Communicate/Operations.h

@@ -21,8 +21,8 @@
 #ifndef IPPL_MPI_OPERATIONS_H
 #define IPPL_MPI_OPERATIONS_H
 
-#include <mpi.h>
 #include <functional>
+#include <mpi.h>
 
 template <class>
 struct is_ippl_mpi_type : std::false_type {};

src/FFT/FFT.h

@@ -28,17 +28,19 @@
 #ifndef IPPL_FFT_FFT_H
 #define IPPL_FFT_FFT_H
 
+#include <array>
 #include <heffte_fft3d.h>
 #include <heffte_fft3d_r2c.h>
-#include <array>
 #include <memory>
 #include <type_traits>
 
-#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 <>

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 {
 

src/Field/BConds.h

@@ -21,12 +21,12 @@
 #ifndef IPPL_FIELD_BC_H
 #define IPPL_FIELD_BC_H
 
-#include "Field/BcTypes.h"
-
 #include <array>
 #include <iostream>
 #include <memory>
 
+#include "Field/BcTypes.h"
+
 namespace ippl {
     template <typename T, unsigned Dim, class Mesh, class Cell>
     class Field;

src/Field/BareField.h

@@ -20,19 +20,19 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "Expression/IpplExpressions.h"
+#include <cstdlib>
+#include <iostream>
+
 #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 <cstdlib>
-#include <iostream>
+#include "Field/HaloCells.h"
+#include "FieldLayout/FieldLayout.h"
 
 namespace ippl {
     class Index;

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 <https://www.gnu.org/licenses/>.
 //
-#include "Communicate/DataTypes.h"
 #include "Ippl.h"
-#include "Utility/Inform.h"
-#include "Utility/IpplInfo.h"
 
 #include <cstdlib>
 #include <map>
 #include <utility>
 
+#include "Communicate/DataTypes.h"
+
+#include "Utility/Inform.h"
+#include "Utility/IpplInfo.h"
+
 namespace ippl {
     namespace detail {
         template <typename T, unsigned Dim>

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 <typename T, unsigned Dim, class Mesh, class Cell>

src/Field/BcTypes.hpp

@@ -27,9 +27,10 @@
 // along with IPPL. If not, see <https://www.gnu.org/licenses/>.
 //
 
-#include "Field/HaloCells.h"
 #include "Utility/IpplException.h"
 
+#include "Field/HaloCells.h"
+
 namespace ippl {
     namespace detail {
 

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 {

src/Field/HaloCells.h

@@ -19,11 +19,13 @@
 #define IPPL_HALO_CELLS_H
 
 #include <array>
+
+#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 {

src/Field/HaloCells.hpp

@@ -19,9 +19,10 @@
 #include <memory>
 #include <vector>
 
-#include "Communicate/Communicate.h"
 #include "Utility/IpplException.h"
 
+#include "Communicate/Communicate.h"
+
 namespace ippl {
     namespace detail {
         template <typename T, unsigned Dim>

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"
 
 //////////////////////////////////////////////////////////////////////