Merge branch 'darwin/fixes' into 'master'

Fix GEAR sink number of outputs

See merge request !2127

src/sink/GEAR/sink_io.h

@@ -127,7 +127,7 @@ INLINE static void sink_write_particles(const struct sink* sinks,
                                         int with_cosmology) {
 
   /* Say how much we want to write */
-  *num_fields = 10;
+  *num_fields = 11;
 
   /* List what we want to write */
   list[0] = io_make_output_field_convert_sink(
@@ -179,12 +179,12 @@ INLINE static void sink_write_particles(const struct sink* sinks,
       "Physical swallowed angular momentum of the particles");
 
   if (with_cosmology) {
-    list[9] = io_make_physical_output_field(
+    list[10] = io_make_physical_output_field(
         "BirthScaleFactors", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, sinks,
         birth_scale_factor, /*can convert to comoving=*/0,
         "Scale-factors at which the sinks were born");
   } else {
-    list[9] =
+    list[10] =
         io_make_output_field("BirthTimes", FLOAT, 1, UNIT_CONV_TIME, 0.f, sinks,
                              birth_time, "Times at which the sinks were born");
   }