From 824efccedd1a8d7a60bd0072870ee6d05a1d953f Mon Sep 17 00:00:00 2001
From: Alexei Borissov <dc-bori1@cosma-b.cosma>
Date: Fri, 24 Aug 2018 11:30:32 +0100
Subject: [PATCH] fixed issues with compiling without cooling
---
src/cooling.c | 5 -----
src/cooling/EAGLE/cooling.c | 3 +--
src/cooling/EAGLE/cooling.h | 3 +--
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/cooling.c b/src/cooling.c
index 93d1799c8e..154b859f74 100644
--- a/src/cooling.c
+++ b/src/cooling.c
@@ -20,11 +20,6 @@
/* Config parameters. */
#include "../config.h"
-#if defined(COOLING_EAGLE)
-#include "./cooling/EAGLE/cooling_struct.h"
-#include "./cooling/EAGLE/eagle_cool_tables.h"
-#endif
-
/* This object's header. */
#include "cooling.h"
#include "restart.h"
diff --git a/src/cooling/EAGLE/cooling.c b/src/cooling/EAGLE/cooling.c
index c61fd5f103..6d2b6ce5f6 100644
--- a/src/cooling/EAGLE/cooling.c
+++ b/src/cooling/EAGLE/cooling.c
@@ -972,8 +972,7 @@ __attribute__((always_inline)) INLINE 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 xpart *restrict xp) {
+ const struct unit_system *restrict us, const struct part *restrict p) {
/* Remember to update when using an implicit integrator */
// const float cooling_rate = cooling->cooling_rate;
diff --git a/src/cooling/EAGLE/cooling.h b/src/cooling/EAGLE/cooling.h
index 3fddb265b8..f1ad66b055 100644
--- a/src/cooling/EAGLE/cooling.h
+++ b/src/cooling/EAGLE/cooling.h
@@ -105,8 +105,7 @@ float cooling_timestep(const struct cooling_function_data *restrict,
const struct phys_const *restrict,
const struct cosmology *restrict,
const struct unit_system *restrict,
- const struct part *restrict,
- const struct xpart *restrict);
+ const struct part *restrict);
void cooling_first_init_part(const struct phys_const *restrict,
const struct unit_system *restrict,
--
GitLab