From cbdc7888d6e6b6c01effccd22e943a5dd942a482 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <schaller@strw.leidenuniv.nl>
Date: Mon, 8 Oct 2018 13:31:59 +0200
Subject: [PATCH] Temporary update to the EAGLE cooling function signatures in
preparation for the actual merge.
---
src/cooling/EAGLE/cooling.h | 8 ++++++--
src/cooling/EAGLE/cooling_io.h | 8 ++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/cooling/EAGLE/cooling.h b/src/cooling/EAGLE/cooling.h
index 1c56572856..8d74222c78 100644
--- a/src/cooling/EAGLE/cooling.h
+++ b/src/cooling/EAGLE/cooling.h
@@ -54,8 +54,10 @@ __attribute__((always_inline)) INLINE static void cooling_cool_part(
const struct phys_const* restrict phys_const,
const struct unit_system* restrict us,
const struct cosmology* restrict cosmo,
+ const struct hydro_props* hydro_props,
const struct cooling_function_data* restrict cooling,
- struct part* restrict p, struct xpart* restrict xp, float dt) {}
+ struct part* restrict p, struct xpart* restrict xp, const float dt,
+ const float dt_therm) {}
/**
* @brief Computes the cooling time-step.
@@ -70,7 +72,9 @@ __attribute__((always_inline)) INLINE static float cooling_timestep(
const struct cooling_function_data* restrict cooling,
const struct phys_const* restrict phys_const,
const struct cosmology* restrict cosmo,
- const struct unit_system* restrict us, const struct part* restrict p) {
+ const struct unit_system* restrict us,
+ const struct hydro_props* hydro_props, const struct part* restrict p,
+ const struct xpart* restrict xp) {
return FLT_MAX;
}
diff --git a/src/cooling/EAGLE/cooling_io.h b/src/cooling/EAGLE/cooling_io.h
index f98539605d..b8f89717b4 100644
--- a/src/cooling/EAGLE/cooling_io.h
+++ b/src/cooling/EAGLE/cooling_io.h
@@ -28,13 +28,13 @@
#ifdef HAVE_HDF5
/**
- * @brief Writes the current model of SPH to the file
- * @param h_grpsph The HDF5 group in which to write
+ * @brief Writes the current model of cooling to the file
+ * @param h_grp The HDF5 group in which to write
*/
__attribute__((always_inline)) INLINE static void cooling_write_flavour(
- hid_t h_grpsph) {
+ hid_t h_grp, const struct cooling_function_data* cooling) {
- io_write_attribute_s(h_grpsph, "Cooling Model", "EAGLE");
+ io_write_attribute_s(h_grp, "Cooling Model", "EAGLE");
}
#endif
--
GitLab