fixed issues with compiling without cooling

Makefile.am

@@ -19,7 +19,10 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # Show the way...
-SUBDIRS = src examples doc tests examples/CoolingRates
+SUBDIRS = src examples doc tests 
+if HAVEEAGLECOOLING
+SUBDIRS += examples/CoolingRates
+endif
 
 # Non-standard files that should be part of the distribution.
 EXTRA_DIST = INSTALL.swift .clang-format format.sh

configure.ac

@@ -1359,6 +1359,9 @@ AC_SUBST([GIT_CMD])
 DX_INIT_DOXYGEN(libswift,doc/Doxyfile,doc/)
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "$ac_cv_path_ac_pt_DX_DOXYGEN" != ""])
 
+# Check if using EAGLE cooling
+AM_CONDITIONAL([HAVEEAGLECOOLING], [test $with_cooling = "EAGLE"])
+
 # Handle .in files.
 AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile examples/CoolingRates/Makefile doc/Makefile doc/Doxyfile tests/Makefile])
 AC_CONFIG_FILES([tests/testReading.sh], [chmod +x tests/testReading.sh])

src/Makefile.am

@@ -50,6 +50,13 @@ include_HEADERS = space.h runner.h queue.h task.h lock.h cell.h part.h const.h \
     chemistry.h chemistry_io.h chemistry_struct.h cosmology.h restart.h space_getsid.h utilities.h \
     mesh_gravity.h cbrt.h velociraptor_interface.h swift_velociraptor_part.h outputlist.h
 
+# source files for EAGLE cooling
+EAGLE_COOLING_SOURCES =
+if HAVEEAGLECOOLING
+EAGLE_COOLING_SOURCES += cooling/EAGLE/cooling.c \
+cooling/EAGLE/interpolate.c cooling/EAGLE/eagle_cool_tables.c
+endif
+
 # Common source files
 AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
     serial_io.c timers.c debug.c scheduler.c proxy.c parallel_io.c \
@@ -61,8 +68,7 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
     part_type.c xmf.c gravity_properties.c gravity.c \
     collectgroup.c hydro_space.c equation_of_state.c \
     chemistry.c cosmology.c restart.c mesh_gravity.c velociraptor_interface.c \
-    outputlist.c cooling/EAGLE/cooling.c \
-    cooling/EAGLE/interpolate.c cooling/EAGLE/eagle_cool_tables.c
+    outputlist.c $(EAGLE_COOLING_SOURCES)
 
 # Include files for distribution, not installation.
 nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h inline.h kernel_hydro.h kernel_gravity.h \

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"

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;

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,

src/timestep.h

@@ -127,7 +127,7 @@ __attribute__((always_inline)) INLINE static integertime_t get_part_timestep(
   float new_dt_cooling = FLT_MAX;
   if (e->policy & engine_policy_cooling)
     new_dt_cooling = cooling_timestep(e->cooling_func, e->physical_constants,
-                                      e->cosmology, e->internal_units, p, xp);
+                                      e->cosmology, e->internal_units, p);
 
   /* Compute the next timestep (gravity condition) */
   float new_dt_grav = FLT_MAX, new_dt_self_grav = FLT_MAX,