Move the part-related swallowing functions to the black_holes_struct file....

Move the part-related swallowing functions to the black_holes_struct file. Added a structure for the merging of BHs.

src/black_holes/Default/black_holes.h

@@ -156,42 +156,6 @@ __attribute__((always_inline)) INLINE static void black_holes_swallow_part(
   /* Nothing to do here: No swallowing in the default model */
 }
 
-/**
- * @brief Update a given #part's BH data field to mark the particle has
- * not yet been swallowed.
- *
- * @param p_data The #part's #black_holes_part_data structure.
- */
-__attribute__((always_inline)) INLINE static void
-black_holes_mark_as_not_swallowed(struct black_holes_part_data* p_data) {
-
-  /* Nothing to do here: No swallowing in the default model */
-}
-
-/**
- * @brief Update a given #part's BH data field to mark the particle has
- * having been been swallowed.
- *
- * @param p_data The #part's #black_holes_part_data structure.
- */
-__attribute__((always_inline)) INLINE static void black_holes_mark_as_swallowed(
-    struct black_holes_part_data* p_data) {
-
-  /* Nothing to do here: No swallowing in the default model */
-}
-
-/**
- * @brief Return the ID of the BH that should swallow this #part.
- *
- * @param p_data The #part's #black_holes_part_data structure.
- */
-__attribute__((always_inline)) INLINE static long long
-black_holes_get_swallow_id(struct black_holes_part_data* p_data) {
-
-  /* Return a non-existing ID */
-  return -1;
-}
-
 /**
  * @brief Compute the accretion rate of the black hole and all the quantites
  * required for the feedback loop.

src/black_holes/Default/black_holes_part.h

@@ -66,6 +66,9 @@ struct bpart {
    * content, etc.) */
   struct chemistry_bpart_data chemistry_data;
 
+  /*! Black holes merger information (e.g. merging ID) */
+  struct black_holes_bpart_data merger_data;
+
 #ifdef SWIFT_DEBUG_CHECKS
 
   /* Time of the last drift */

src/black_holes/Default/black_holes_struct.h

@@ -24,4 +24,45 @@
  */
 struct black_holes_part_data {};
 
+/**
+ * @brief Black holes-related fields carried by each *BH* particle.
+ */
+struct black_holes_bpart_data {};
+
+/**
+ * @brief Update a given #part's BH data field to mark the particle has
+ * not yet been swallowed.
+ *
+ * @param p_data The #part's #black_holes_part_data structure.
+ */
+__attribute__((always_inline)) INLINE static void
+black_holes_mark_as_not_swallowed(struct black_holes_part_data* p_data) {
+
+  /* Nothing to do here: No swallowing in the default model */
+}
+
+/**
+ * @brief Update a given #part's BH data field to mark the particle has
+ * having been been swallowed.
+ *
+ * @param p_data The #part's #black_holes_part_data structure.
+ */
+__attribute__((always_inline)) INLINE static void black_holes_mark_as_swallowed(
+    struct black_holes_part_data* p_data) {
+
+  /* Nothing to do here: No swallowing in the default model */
+}
+
+/**
+ * @brief Return the ID of the BH that should swallow this #part.
+ *
+ * @param p_data The #part's #black_holes_part_data structure.
+ */
+__attribute__((always_inline)) INLINE static long long
+black_holes_get_swallow_id(struct black_holes_part_data* p_data) {
+
+  /* Return a non-existing ID */
+  return -1;
+}
+
 #endif /* SWIFT_BLACK_HOLES_STRUCT_DEFAULT_H */

src/black_holes/EAGLE/black_holes.h

@@ -234,41 +234,6 @@ __attribute__((always_inline)) INLINE static void black_holes_swallow_part(
   bp->ngb_mass -= gas_mass;
 }
 
-/**
- * @brief Update a given #part's BH data field to mark the particle has
- * not yet been swallowed.
- *
- * @param p_data The #part's #black_holes_part_data structure.
- */
-__attribute__((always_inline)) INLINE static void
-black_holes_mark_as_not_swallowed(struct black_holes_part_data* p_data) {
-
-  p_data->swallow_id = -1;
-}
-
-/**
- * @brief Update a given #part's BH data field to mark the particle has
- * having been been swallowed.
- *
- * @param p_data The #part's #black_holes_part_data structure.
- */
-__attribute__((always_inline)) INLINE static void black_holes_mark_as_swallowed(
-    struct black_holes_part_data* p_data) {
-
-  p_data->swallow_id = -2;
-}
-
-/**
- * @brief Return the ID of the BH that should swallow this #part.
- *
- * @param p_data The #part's #black_holes_part_data structure.
- */
-__attribute__((always_inline)) INLINE static long long
-black_holes_get_swallow_id(struct black_holes_part_data* p_data) {
-
-  return p_data->swallow_id;
-}
-
 /**
  * @brief Compute the accretion rate of the black hole and all the quantites
  * required for the feedback loop.

src/black_holes/EAGLE/black_holes_part.h

@@ -118,6 +118,9 @@ struct bpart {
    * content, etc.) */
   struct chemistry_bpart_data chemistry_data;
 
+  /*! Black holes merger information (e.g. merging ID) */
+  struct black_holes_bpart_data merger_data;
+
 #ifdef SWIFT_DEBUG_CHECKS
 
   /* Time of the last drift */

src/black_holes/EAGLE/black_holes_struct.h

@@ -28,4 +28,48 @@ struct black_holes_part_data {
   long long swallow_id;
 };
 
+/**
+ * @brief Black holes-related fields carried by each *BH* particle.
+ */
+struct black_holes_bpart_data {
+
+  /*! ID of the black-hole that will swallow this #bpart. */
+  long long swallow_id;
+};
+
+/**
+ * @brief Update a given #part's BH data field to mark the particle has
+ * not yet been swallowed.
+ *
+ * @param p_data The #part's #black_holes_part_data structure.
+ */
+__attribute__((always_inline)) INLINE static void
+black_holes_mark_as_not_swallowed(struct black_holes_part_data* p_data) {
+
+  p_data->swallow_id = -1;
+}
+
+/**
+ * @brief Update a given #part's BH data field to mark the particle has
+ * having been been swallowed.
+ *
+ * @param p_data The #part's #black_holes_part_data structure.
+ */
+__attribute__((always_inline)) INLINE static void black_holes_mark_as_swallowed(
+    struct black_holes_part_data* p_data) {
+
+  p_data->swallow_id = -2;
+}
+
+/**
+ * @brief Return the ID of the BH that should swallow this #part.
+ *
+ * @param p_data The #part's #black_holes_part_data structure.
+ */
+__attribute__((always_inline)) INLINE static long long
+black_holes_get_swallow_id(struct black_holes_part_data* p_data) {
+
+  return p_data->swallow_id;
+}
+
 #endif /* SWIFT_BLACK_HOLES_STRUCT_EAGLE_H */