From 19caca1ced75a03b5bbbf4fe67890a5d1709cad9 Mon Sep 17 00:00:00 2001
From: lhausamm <loic_hausammann@hotmail.com>
Date: Wed, 1 Nov 2017 10:50:25 +0100
Subject: [PATCH] Manual merging of cooling_grackle (work done by @yvesrevaz
and @mculpo)
---
examples/Makefile.am | 4 ++--
src/cooling/grackle/grackle_wrapper.h | 2 +-
src/hydro/Gadget2/hydro_part.h | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index bddb329437..12f9c7c429 100644
--- a/examples/Makefile.am
+++ b/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
diff --git a/src/cooling/grackle/grackle_wrapper.h b/src/cooling/grackle/grackle_wrapper.h
index 3088c8a158..c7e9fa0919 100644
--- a/src/cooling/grackle/grackle_wrapper.h
+++ b/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"
diff --git a/src/hydro/Gadget2/hydro_part.h b/src/hydro/Gadget2/hydro_part.h
index c7deaf7360..7b91047da9 100644
--- a/src/hydro/Gadget2/hydro_part.h
+++ b/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;
--
GitLab