From 92a0049559945068c6765b6b175810c76aab5a6e Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Wed, 17 Jan 2018 22:41:15 +0100
Subject: [PATCH] Corrected mistake in serial i/o and added missing headed
inclusion.
---
src/hydro/Default/hydro_part.h | 1 +
src/hydro/Gadget2/hydro_io.h | 2 --
src/hydro/Gizmo/hydro_part.h | 1 +
src/hydro/Minimal/hydro_part.h | 1 +
src/hydro/PressureEntropy/hydro_part.h | 1 +
src/hydro/Shadowswift/hydro_part.h | 1 +
src/parallel_io.c | 2 ++
src/serial_io.c | 4 +++-
src/single_io.c | 2 ++
9 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/hydro/Default/hydro_part.h b/src/hydro/Default/hydro_part.h
index 042fa2aee4..6290ee5ba3 100644
--- a/src/hydro/Default/hydro_part.h
+++ b/src/hydro/Default/hydro_part.h
@@ -19,6 +19,7 @@
#ifndef SWIFT_DEFAULT_HYDRO_PART_H
#define SWIFT_DEFAULT_HYDRO_PART_H
+#include "chemistry_struct.h"
#include "cooling_struct.h"
/* Extra particle data not needed during the SPH loops over neighbours. */
diff --git a/src/hydro/Gadget2/hydro_io.h b/src/hydro/Gadget2/hydro_io.h
index 1d633f3da1..72f2e33ff9 100644
--- a/src/hydro/Gadget2/hydro_io.h
+++ b/src/hydro/Gadget2/hydro_io.h
@@ -20,8 +20,6 @@
#define SWIFT_GADGET2_HYDRO_IO_H
#include "adiabatic_index.h"
-#include "chemistry_io.h"
-#include "cooling.h"
#include "hydro.h"
#include "io_properties.h"
#include "kernel_hydro.h"
diff --git a/src/hydro/Gizmo/hydro_part.h b/src/hydro/Gizmo/hydro_part.h
index 76527f47b2..fdd73dd196 100644
--- a/src/hydro/Gizmo/hydro_part.h
+++ b/src/hydro/Gizmo/hydro_part.h
@@ -19,6 +19,7 @@
#ifndef SWIFT_GIZMO_HYDRO_PART_H
#define SWIFT_GIZMO_HYDRO_PART_H
+#include "chemistry_struct.h"
#include "cooling_struct.h"
/* Extra particle data not needed during the computation. */
diff --git a/src/hydro/Minimal/hydro_part.h b/src/hydro/Minimal/hydro_part.h
index 3ecf97e924..7556f415b9 100644
--- a/src/hydro/Minimal/hydro_part.h
+++ b/src/hydro/Minimal/hydro_part.h
@@ -32,6 +32,7 @@
* Physics, 2012, Volume 231, Issue 3, pp. 759-794.
*/
+#include "chemistry_struct.h"
#include "cooling_struct.h"
/**
diff --git a/src/hydro/PressureEntropy/hydro_part.h b/src/hydro/PressureEntropy/hydro_part.h
index 4f7f85e28f..c9482cd1ac 100644
--- a/src/hydro/PressureEntropy/hydro_part.h
+++ b/src/hydro/PressureEntropy/hydro_part.h
@@ -30,6 +30,7 @@
* Volume 428, Issue 4, pp. 2840-2856 with a simple Balsara viscosity term.
*/
+#include "chemistry_struct.h"
#include "cooling_struct.h"
/* Extra particle data not needed during the SPH loops over neighbours. */
diff --git a/src/hydro/Shadowswift/hydro_part.h b/src/hydro/Shadowswift/hydro_part.h
index ae30ecca74..4f28d7bdc1 100644
--- a/src/hydro/Shadowswift/hydro_part.h
+++ b/src/hydro/Shadowswift/hydro_part.h
@@ -19,6 +19,7 @@
*
******************************************************************************/
+#include "chemistry_struct.h"
#include "cooling_struct.h"
#include "voronoi_cell.h"
diff --git a/src/parallel_io.c b/src/parallel_io.c
index 89246f1c7a..9d1d638047 100644
--- a/src/parallel_io.c
+++ b/src/parallel_io.c
@@ -36,7 +36,9 @@
#include "parallel_io.h"
/* Local includes. */
+#include "chemistry_io.h"
#include "common_io.h"
+#include "cooling.h"
#include "dimension.h"
#include "engine.h"
#include "error.h"
diff --git a/src/serial_io.c b/src/serial_io.c
index cbc09641c0..d4705f7d09 100644
--- a/src/serial_io.c
+++ b/src/serial_io.c
@@ -36,7 +36,9 @@
#include "serial_io.h"
/* Local includes. */
+#include "chemistry_io.h"
#include "common_io.h"
+#include "cooling.h"
#include "dimension.h"
#include "engine.h"
#include "error.h"
@@ -812,7 +814,7 @@ void write_output_serial(struct engine* e, const char* baseName,
H5P_DEFAULT);
if (h_grp < 0) error("Error while creating SPH group");
hydro_props_print_snapshot(h_grp, e->hydro_properties);
- writeChemistryFlavor(h_grp);
+ writeSPHflavour(h_grp);
H5Gclose(h_grp);
}
diff --git a/src/single_io.c b/src/single_io.c
index f3e4473f06..0e000ab4e6 100644
--- a/src/single_io.c
+++ b/src/single_io.c
@@ -35,7 +35,9 @@
#include "single_io.h"
/* Local includes. */
+#include "chemistry_io.h"
#include "common_io.h"
+#include "cooling.h"
#include "dimension.h"
#include "engine.h"
#include "error.h"
--
GitLab