Code formatting

src/align.h

@@ -40,7 +40,8 @@
 #define SWIFT_CACHE_ALIGN __attribute__((aligned(SWIFT_CACHE_ALIGNMENT)))
 
 /**
- * @brief Macro to tell the compiler that a given array has the specified alignment.
+ * @brief Macro to tell the compiler that a given array has the specified
+ * alignment.
  *
  * Note that this turns into a no-op but gives information to the compiler.
  *
@@ -56,7 +57,8 @@
 #endif
 
 /**
- * @brief Macro to tell the compiler that a given number is 0 modulo a given size.
+ * @brief Macro to tell the compiler that a given number is 0 modulo a given
+ * size.
  *
  * Note that this turns into a no-op but gives information to the compiler.
  * GCC does not have the equivalent built-in so defaults to nothing.
@@ -65,8 +67,7 @@
  * @param size The modulo of interest.
  */
 #if defined(__ICC)
-#define swift_assume_size(var, size)   \
-  __assume(var % size == 0);
+#define swift_assume_size(var, size) __assume(var % size == 0);
 #else
 #define swift_assume_size(var, size) ;
 #endif

src/gravity/Default/gravity_iact.h

@@ -249,5 +249,4 @@ __attribute__((always_inline)) INLINE static void runner_iact_grav_pp_nonsym(
   gpi->a_grav[2] -= fdx[2];
 }
 
-
 #endif /* SWIFT_DEFAULT_GRAVITY_IACT_H */

src/runner.h

@@ -27,8 +27,8 @@
 #include "../config.h"
 
 /* Includes. */
-#include "gravity_cache.h"
 #include "cache.h"
+#include "gravity_cache.h"
 
 struct cell;
 struct engine;

src/runner_doiact_grav.h

@@ -180,16 +180,18 @@ void runner_dopair_grav_pp_full(struct runner *r, struct cell *ci,
 
   /* Check that we fit in cache */
   if (gcount_i > ci_cache->count || gcount_j > cj_cache->count)
-    error("Not enough space in the caches! gcount_i=%d gcount_j=%d", 
-	  gcount_i, gcount_j);
+    error("Not enough space in the caches! gcount_i=%d gcount_j=%d", gcount_i,
+          gcount_j);
 
   /* Computed the padded counts */
   const int gcount_padded_i = gcount_i - (gcount_i % VEC_SIZE) + VEC_SIZE;
   const int gcount_padded_j = gcount_j - (gcount_j % VEC_SIZE) + VEC_SIZE;
 
   /* Fill the caches */
-  gravity_cache_populate(ci_cache, gparts_i, gcount_i, gcount_padded_i, ci_active, shift);
-  gravity_cache_populate_no_shift(cj_cache, gparts_j, gcount_j, gcount_padded_j, cj_active);
+  gravity_cache_populate(ci_cache, gparts_i, gcount_i, gcount_padded_i,
+                         ci_active, shift);
+  gravity_cache_populate_no_shift(cj_cache, gparts_j, gcount_j, gcount_padded_j,
+                                  cj_active);
 
   /* Ok... Here we go ! */
 
@@ -272,7 +274,6 @@ void runner_dopair_grav_pp_full(struct runner *r, struct cell *ci,
 #ifdef SWIFT_DEBUG_CHECKS
         gparts_i[pid].num_interacted++;
 #endif
-
       }
 
       /* Store everything back in cache */
@@ -362,7 +363,6 @@ void runner_dopair_grav_pp_full(struct runner *r, struct cell *ci,
 #ifdef SWIFT_DEBUG_CHECKS
         gparts_j[pjd].num_interacted++;
 #endif
-
       }
 
       /* Store everything back in cache */
@@ -373,10 +373,8 @@ void runner_dopair_grav_pp_full(struct runner *r, struct cell *ci,
   }
 
   /* Write back to the particles */
-  if(ci_active)
-    gravity_cache_write_back(ci_cache, gparts_i, gcount_i);
-  if(cj_active)
-    gravity_cache_write_back(cj_cache, gparts_j, gcount_j);
+  if (ci_active) gravity_cache_write_back(ci_cache, gparts_i, gcount_i);
+  if (cj_active) gravity_cache_write_back(cj_cache, gparts_j, gcount_j);
 
 #ifdef MATTHIEU_OLD_STUFF
 
@@ -492,7 +490,6 @@ void runner_dopair_grav_pp_full(struct runner *r, struct cell *ci,
 void runner_dopair_grav_pp_truncated(struct runner *r, struct cell *ci,
                                      struct cell *cj, double shift[3]) {
 
-
   /* Some constants */
   const struct engine *const e = r->e;
   const struct space *s = e->s;
@@ -518,16 +515,18 @@ void runner_dopair_grav_pp_truncated(struct runner *r, struct cell *ci,
 
   /* Check that we fit in cache */
   if (gcount_i > ci_cache->count || gcount_j > cj_cache->count)
-    error("Not enough space in the caches! gcount_i=%d gcount_j=%d", 
-	  gcount_i, gcount_j);
+    error("Not enough space in the caches! gcount_i=%d gcount_j=%d", gcount_i,
+          gcount_j);
 
   /* Computed the padded counts */
   const int gcount_padded_i = gcount_i - (gcount_i % VEC_SIZE) + VEC_SIZE;
   const int gcount_padded_j = gcount_j - (gcount_j % VEC_SIZE) + VEC_SIZE;
 
   /* Fill the caches */
-  gravity_cache_populate(ci_cache, gparts_i, gcount_i, gcount_padded_i, ci_active, shift);
-  gravity_cache_populate_no_shift(cj_cache, gparts_j, gcount_j, gcount_padded_j, cj_active);
+  gravity_cache_populate(ci_cache, gparts_i, gcount_i, gcount_padded_i,
+                         ci_active, shift);
+  gravity_cache_populate_no_shift(cj_cache, gparts_j, gcount_j, gcount_padded_j,
+                                  cj_active);
 
   /* Ok... Here we go ! */
 
@@ -615,7 +614,6 @@ void runner_dopair_grav_pp_truncated(struct runner *r, struct cell *ci,
 #ifdef SWIFT_DEBUG_CHECKS
         gparts_i[pid].num_interacted++;
 #endif
-
       }
 
       /* Store everything back in cache */
@@ -710,7 +708,6 @@ void runner_dopair_grav_pp_truncated(struct runner *r, struct cell *ci,
 #ifdef SWIFT_DEBUG_CHECKS
         gparts_j[pjd].num_interacted++;
 #endif
-
       }
 
       /* Store everything back in cache */
@@ -721,10 +718,8 @@ void runner_dopair_grav_pp_truncated(struct runner *r, struct cell *ci,
   }
 
   /* Write back to the particles */
-  if(ci_active)
-    gravity_cache_write_back(ci_cache, gparts_i, gcount_i);
-  if(cj_active)
-    gravity_cache_write_back(cj_cache, gparts_j, gcount_j);
+  if (ci_active) gravity_cache_write_back(ci_cache, gparts_i, gcount_i);
+  if (cj_active) gravity_cache_write_back(cj_cache, gparts_j, gcount_j);
 
 #ifdef MATTHIEU_OLD_STUFF
   /* Some constants */