From f4bd9eaa7db1041e05a3d74623a0b6ba5dbe6a9c Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <schaller@strw.leidenuniv.nl>
Date: Tue, 11 Jun 2019 14:15:54 +0200
Subject: [PATCH] Import small fixes from the blackhole swallowing branch that
are unrelated to the swallowing itself.
---
examples/main.c | 9 +++++++++
src/feedback/EAGLE/feedback.c | 2 +-
src/feedback/EAGLE/feedback_iact.h | 2 +-
src/random.h | 5 +++--
src/runner_doiact_stars.h | 6 ++++--
5 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/examples/main.c b/examples/main.c
index 56432f3187..6f1341abe7 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -1281,6 +1281,15 @@ int main(int argc, char *argv[]) {
/* Write final output. */
if (!force_stop) {
+
+ /* Move forward in time */
+ e.ti_old = e.ti_current;
+ e.ti_current = e.ti_end_min;
+ e.max_active_bin = get_max_active_bin(e.ti_end_min);
+ e.min_active_bin = get_min_active_bin(e.ti_current, e.ti_old);
+ e.step += 1;
+ engine_current_step = e.step;
+
engine_drift_all(&e, /*drift_mpole=*/0);
engine_print_stats(&e);
#ifdef WITH_LOGGER
diff --git a/src/feedback/EAGLE/feedback.c b/src/feedback/EAGLE/feedback.c
index 4cd6a45a10..531f887a74 100644
--- a/src/feedback/EAGLE/feedback.c
+++ b/src/feedback/EAGLE/feedback.c
@@ -110,7 +110,7 @@ double eagle_feedback_energy_fraction(const struct spart* sp,
/* Physical density of the gas at the star's birth time */
const double rho_birth = sp->birth_density;
- double n_birth = rho_birth * props->rho_to_n_cgs;
+ const double n_birth = rho_birth * props->rho_to_n_cgs;
/* Calculate f_E */
const double Z_term = pow(max(Z_smooth, 1e-6) / Z_0, n_Z);
diff --git a/src/feedback/EAGLE/feedback_iact.h b/src/feedback/EAGLE/feedback_iact.h
index 4ad145e77d..05d8ff43d4 100644
--- a/src/feedback/EAGLE/feedback_iact.h
+++ b/src/feedback/EAGLE/feedback_iact.h
@@ -115,7 +115,7 @@ runner_iact_nonsym_feedback_apply(const float r2, const float *dx,
}
#ifdef SWIFT_DEBUG_CHECKS
- if (Omega_frac < 0. || Omega_frac > 1.)
+ if (Omega_frac < 0. || Omega_frac > 1.00001)
error("Invalid fraction of material to distribute. Omega_frac=%e",
Omega_frac);
#endif
diff --git a/src/random.h b/src/random.h
index 660ae21db8..e7fc77a241 100644
--- a/src/random.h
+++ b/src/random.h
@@ -39,13 +39,14 @@
* generator.
* In case new numbers need to be added other possible
* numbers could be:
- * 4947009007, 5947309451, 6977309513
+ * 5947309451, 6977309513
*/
enum random_number_type {
random_number_star_formation = 0LL,
random_number_stellar_feedback = 3947008991LL,
random_number_stellar_enrichment = 2936881973LL,
- random_number_BH_feedback = 1640531371LL
+ random_number_BH_feedback = 1640531371LL,
+ random_number_BH_swallow = 4947009007LL
};
/**
diff --git a/src/runner_doiact_stars.h b/src/runner_doiact_stars.h
index be4f83f813..4fca3be946 100644
--- a/src/runner_doiact_stars.h
+++ b/src/runner_doiact_stars.h
@@ -1221,12 +1221,14 @@ void DOPAIR1_BRANCH_STARS(struct runner *r, struct cell *ci, struct cell *cj) {
#ifdef SWIFT_DEBUG_CHECKS
if (do_ci) {
- RUNNER_CHECK_SORT(hydro, part, cj, ci, sid);
+ // MATTHIEU: This test is faulty. To be fixed...
+ // RUNNER_CHECK_SORT(hydro, part, cj, ci, sid);
RUNNER_CHECK_SORT(stars, spart, ci, cj, sid);
}
if (do_cj) {
- RUNNER_CHECK_SORT(hydro, part, ci, cj, sid);
+ // MATTHIEU: This test is faulty. To be fixed...
+ // RUNNER_CHECK_SORT(hydro, part, ci, cj, sid);
RUNNER_CHECK_SORT(stars, spart, cj, ci, sid);
}
#endif /* SWIFT_DEBUG_CHECKS */
--
GitLab