Print the scale-factor to stdout and the timestep file.

examples/main.c

@@ -845,9 +845,10 @@ int main(int argc, char *argv[]) {
 
   /* Legend */
   if (myrank == 0)
-    printf("# %6s %14s %14s %9s %12s %12s %12s %16s [%s] %6s\n", "Step", "Time",
-           "Time-step", "Time-bins", "Updates", "g-Updates", "s-Updates",
-           "Wall-clock time", clocks_getunit(), "Props");
+    printf("# %6s %14s %14s %14s %9s %12s %12s %12s %16s [%s] %6s\n", "Step",
+           "Time", "Scale-factor", "Time-step", "Time-bins", "Updates",
+           "g-Updates", "s-Updates", "Wall-clock time", clocks_getunit(),
+           "Props");
 
   /* File for the timers */
   if (with_verbose_timers) timers_open_file(myrank);

examples/plot_scaling_results.py

@@ -148,8 +148,8 @@ def parse_files():
     
     # Loop over all files for a given series and load the times
     for j in range(0,len(file_list)):
-      times = np.loadtxt(file_list[j],usecols=(8,))
-      updates = np.loadtxt(file_list[j],usecols=(5,))
+      times = np.loadtxt(file_list[j],usecols=(9,))
+      updates = np.loadtxt(file_list[j],usecols=(6,))
       totalTime[i].append(np.sum(times))
       
     sumTotal.append(np.sum(totalTime[i]))

examples/plot_scaling_results_breakdown.py

@@ -149,8 +149,8 @@ def parse_files():
    
     # Loop over all files for a given series and load the times
     for j in range(0,len(file_list)):
-      times = np.loadtxt(file_list[j],usecols=(8,))
-      updates = np.loadtxt(file_list[j],usecols=(5,))
+      times = np.loadtxt(file_list[j],usecols=(9,))
+      updates = np.loadtxt(file_list[j],usecols=(6,))
       totalTime[i].append(np.sum(times))
       
     sumTotal.append(np.sum(totalTime[i]))

src/engine.c

@@ -4371,17 +4371,17 @@ void engine_step(struct engine *e) {
   if (e->nodeID == 0) {
 
     /* Print some information to the screen */
-    printf("  %6d %14e %14e %4d %4d %12zu %12zu %12zu %21.3f %6d\n", e->step,
-           e->time, e->time_step, e->min_active_bin, e->max_active_bin,
-           e->updates, e->g_updates, e->s_updates, e->wallclock_time,
-           e->step_props);
+    printf("  %6d %14e %14e %14e %4d %4d %12zu %12zu %12zu %21.3f %6d\n",
+           e->step, e->time, e->cosmology->a, e->time_step, e->min_active_bin,
+           e->max_active_bin, e->updates, e->g_updates, e->s_updates,
+           e->wallclock_time, e->step_props);
     fflush(stdout);
 
     fprintf(e->file_timesteps,
-            "  %6d %14e %14e %4d %4d %12zu %12zu %12zu %21.3f %6d\n", e->step,
-            e->time, e->time_step, e->min_active_bin, e->max_active_bin,
-            e->updates, e->g_updates, e->s_updates, e->wallclock_time,
-            e->step_props);
+            "  %6d %14e %14e %14e %4d %4d %12zu %12zu %12zu %21.3f %6d\n",
+            e->step, e->time, e->cosmology->a, e->time_step, e->min_active_bin,
+            e->max_active_bin, e->updates, e->g_updates, e->s_updates,
+            e->wallclock_time, e->step_props);
     fflush(e->file_timesteps);
   }
 
@@ -5530,9 +5530,10 @@ void engine_config(int restart, struct engine *e,
               engine_step_prop_snapshot, engine_step_prop_restarts);
 
       fprintf(e->file_timesteps,
-              "# %6s %14s %14s %9s %12s %12s %12s %16s [%s] %6s\n", "Step",
-              "Time", "Time-step", "Time-bins", "Updates", "g-Updates",
-              "s-Updates", "Wall-clock time", clocks_getunit(), "Props");
+              "# %6s %14s %14s %14s %9s %12s %12s %12s %16s [%s] %6s\n", "Step",
+              "Time", "Scale-factor", "Time-step", "Time-bins", "Updates",
+              "g-Updates", "s-Updates", "Wall-clock time", clocks_getunit(),
+              "Props");
       fflush(e->file_timesteps);
     }
   }