From 0399b5c69e4729069b2d226e5fd2f6ba85b7160e Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <schaller@strw.leidenuniv.nl>
Date: Wed, 23 Jan 2019 10:37:49 +0800
Subject: [PATCH] More post-merge fixes.
---
src/engine.c | 7 +++++--
src/kick.h | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 80abcd2caf..914e6565fe 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -3276,6 +3276,7 @@ void engine_check_for_dumps(struct engine *e) {
/* Dump */
engine_print_stats(e);
+
/* and move on */
engine_compute_next_statistics_time(e);
@@ -3309,8 +3310,10 @@ void engine_check_for_dumps(struct engine *e) {
/* Save some statistics ? */
if (e->ti_end_min > e->ti_next_stats && e->ti_next_stats > 0) {
- ti_output = e->ti_next_stats;
- type = output_statistics;
+ if (e->ti_next_stats < ti_output) {
+ ti_output = e->ti_next_stats;
+ type = output_statistics;
+ }
}
/* Do we want a snapshot? */
diff --git a/src/kick.h b/src/kick.h
index b33ee059f5..f2085bf1f4 100644
--- a/src/kick.h
+++ b/src/kick.h
@@ -70,7 +70,8 @@ __attribute__((always_inline)) INLINE static void kick_gpart(
* @param dt_kick_therm The kick time-step for changes in thermal state.
* @param dt_kick_corr The kick time-step for the gizmo-mfv gravity correction.
* @param cosmo The cosmological model.
- * @param hydro_props The constants used in the scheme
+ * @param hydro_props The constants used in the scheme.
+ * @param entropy_floor_props Properties of the entropy floor.
* @param ti_start The starting (integer) time of the kick (for debugging
* checks).
* @param ti_end The ending (integer) time of the kick (for debugging checks).
--
GitLab