From dbeeeb423c5e46b40b205a886f2507fea6879bc1 Mon Sep 17 00:00:00 2001
From: loikki <loic.hausammann@protonmail.ch>
Date: Tue, 30 Oct 2018 16:10:46 +0100
Subject: [PATCH] clean for merge request
---
src/engine.c | 3 ++-
src/engine.h | 2 +-
src/hydro/Gadget2/hydro.h | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 0adbeb4adc..ae00595839 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -6545,7 +6545,7 @@ void engine_dump_index(struct engine *e) {
message("writing particle indices took %.3f %s.",
(float)clocks_diff(&time1, &time2), clocks_getunit());
#else
- error("Logger disabled");
+ error("SWIFT was not compiled with the logger");
#endif
}
@@ -7327,6 +7327,7 @@ void engine_config(int restart, struct engine *e, struct swift_params *params,
}
#ifdef WITH_LOGGER
+ /* Write the particle logger header */
logger_write_file_header(e->log, e);
#endif
diff --git a/src/engine.h b/src/engine.h
index 7a83d4541b..7097fc6c46 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -75,7 +75,7 @@ enum engine_policy {
engine_policy_stars = (1 << 15),
engine_policy_structure_finding = (1 << 16),
engine_policy_star_formation = (1 << 17),
- engine_policy_feedback = (1 << 18),
+ engine_policy_feedback = (1 << 18)
};
#define engine_maxpolicy 18
extern const char *engine_policy_names[];
diff --git a/src/hydro/Gadget2/hydro.h b/src/hydro/Gadget2/hydro.h
index 98dcad4f39..e2736dce83 100644
--- a/src/hydro/Gadget2/hydro.h
+++ b/src/hydro/Gadget2/hydro.h
@@ -35,7 +35,6 @@
#include "approx_math.h"
#include "cosmology.h"
#include "dimension.h"
-#include "engine.h"
#include "equation_of_state.h"
#include "hydro_properties.h"
#include "hydro_space.h"
--
GitLab