Merge branch 'io_selection_changes' of...

Merge branch 'io_selection_changes' of https://gitlab.cosma.dur.ac.uk/swift/swiftsim into io_selection_changes

src/black_holes/EAGLE/black_holes_iact.h

@@ -124,7 +124,7 @@ runner_iact_nonsym_bh_gas_density(
       error(
           "Invalid denominator for BH particle %lld and gas particle "
           "%lld in Bondi rate calculation.",
-          bp->id, pj->id);
+          bi->id, pj->id);
 #endif
     const double denominator_inv = 1. / sqrt(denominator2);
 

src/output_options.c

-
 /*******************************************************************************
  * This file is part of SWIFT.
  * Copyright (c) 2020 Josh Borrow (josh.borrow@durham.ac.uk)
@@ -17,14 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
+#include "../config.h"
 
+/* Some standard headers. */
 #include <stdlib.h>
 
+/* MPI headers. */
 #ifdef WITH_MPI
 #include <mpi.h>
 #endif
 
+/* This object's header. */
 #include "output_options.h"
+
+/* Local headers. */
 #include "parser.h"
 #include "part_type.h"
 #include "swift.h"
@@ -143,4 +148,4 @@ int output_options_should_write_field(struct output_options* output_options,
 #endif
 
   return should_write;
-}
\ No newline at end of file
+}