Manual merging of cooling_grackle (work done by @yvesrevaz and @mculpo)

examples/Makefile.am

@@ -27,8 +27,8 @@ AM_LDFLAGS = $(HDF5_LDFLAGS)
 EXTRA_LIBS = $(HDF5_LIBS) $(FFTW_LIBS) $(PROFILER_LIBS) $(TCMALLOC_LIBS) $(JEMALLOC_LIBS) $(GRACKLE_LIBS)
 
 # MPI libraries.
-MPI_LIBS = $(METIS_LIBS) $(MPI_THREAD_LIBS)
-MPI_FLAGS = -DWITH_MPI $(METIS_INCS)
+MPI_LIBS = $(METIS_LIBS) $(GRACKLE_LIBS) $(MPI_THREAD_LIBS)
+MPI_FLAGS = -DWITH_MPI $(METIS_INCS) $(GRACKLE_INCS)
 
 # Programs.
 bin_PROGRAMS = swift

src/cooling/grackle/grackle_wrapper.h

@@ -13,12 +13,12 @@
 #ifndef SWIFT_COOLING_GRACKLE_WRAPPER_H
 #define SWIFT_COOLING_GRACKLE_WRAPPER_H
 
-#include "../../../config.h"
 #include <grackle.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "config.h"
 #include "error.h"
 

src/hydro/Gadget2/hydro_part.h

@@ -45,6 +45,9 @@ struct xpart {
   /* Velocity at the last full step. */
   float v_full[3];
 
+  /* Radiated energy */
+  float e_radcool;
+
   /* Entropy at the last full step. */
   float entropy_full;