Merge branch 'master' into new_timeline

configure.ac

@@ -825,5 +825,8 @@ AC_MSG_RESULT([
    Debugging checks   : $enable_debugging_checks
 ])
 
+# Make sure the latest git revision string gets included
+touch src/version.c
+
 # Generate output.
 AC_OUTPUT

examples/main.c

@@ -296,7 +296,8 @@ int main(int argc, char *argv[]) {
   /* Do we choke on FP-exceptions ? */
   if (with_fp_exceptions) {
     feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
-    if (myrank == 0) message("Floating point exceptions will be reported.");
+    if (myrank == 0)
+      message("WARNING: Floating point exceptions will be reported.");
   }
 
   /* How large are the parts? */

src/runner.c

@@ -1049,6 +1049,8 @@ void runner_do_kick2(struct runner *r, struct cell *c, int timer) {
  */
 void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
 
+#ifdef WITH_MPI
+
   const struct part *restrict parts = c->parts;
   const struct gpart *restrict gparts = c->gparts;
   const size_t nr_parts = c->count;
@@ -1102,6 +1104,10 @@ void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
   c->h_max = h_max;
 
   if (timer) TIMER_TOC(timer_dorecv_cell);
+
+#else
+  error("SWIFT was not compiled with MPI support.");
+#endif
 }
 
 /**