From befb32c5ab1c3f90251447a72f7993089aefd021 Mon Sep 17 00:00:00 2001
From: lhausamm <loic_hausammann@hotmail.com>
Date: Wed, 17 Jan 2018 10:24:34 +0100
Subject: [PATCH] Add includes, inline functions and change chemistry_data to
 chemistry_part_data

---
 src/chemistry.c                    | 4 ++--
 src/chemistry.h                    | 4 ++--
 src/chemistry/none/chemistry.h     | 5 +++--
 src/cooling/const_du/cooling.h     | 2 +-
 src/cooling/const_lambda/cooling.h | 2 +-
 src/cooling/grackle/cooling.h      | 2 +-
 src/cooling/none/cooling.h         | 2 +-
 src/hydro/Gadget2/hydro_io.h       | 1 +
 src/io_properties.h                | 1 +
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/chemistry.c b/src/chemistry.c
index 4d2a5e7ba9..f0ba8818fe 100644
--- a/src/chemistry.c
+++ b/src/chemistry.c
@@ -36,7 +36,7 @@
 void chemistry_init(const struct swift_params* parameter_file,
                   const struct unit_system* us,
                   const struct phys_const* phys_const,
-                  struct chemistry_data* chemistry) {
+                  struct chemistry_part_data* chemistry) {
 
   chemistry_init_backend(parameter_file, us, phys_const, chemistry);
 }
@@ -48,7 +48,7 @@ void chemistry_init(const struct swift_params* parameter_file,
  *
  * @param chemistry The properties of the chemistry function.
  */
-void chemistry_print(const struct chemistry_data* chemistry) {
+void chemistry_print(const struct chemistry_part_data* chemistry) {
 
   chemistry_print_backend(chemistry);
 }
diff --git a/src/chemistry.h b/src/chemistry.h
index 25769240eb..c1971fd0db 100644
--- a/src/chemistry.h
+++ b/src/chemistry.h
@@ -39,8 +39,8 @@
 void chemistry_init(const struct swift_params* parameter_file,
 		    const struct unit_system* us,
 		    const struct phys_const* phys_const,
-		    struct chemistry_data* chem);
+		    struct chemistry_part_data* chem);
 
-void chemistry_print(const struct chemistry_data* chem);
+void chemistry_print(const struct chemistry_part_data* chem);
 
 #endif /* SWIFT_CHEMISTRY_H */
diff --git a/src/chemistry/none/chemistry.h b/src/chemistry/none/chemistry.h
index 6c17af00fd..6f2cb354d9 100644
--- a/src/chemistry/none/chemistry.h
+++ b/src/chemistry/none/chemistry.h
@@ -29,6 +29,7 @@
 #include <math.h>
 
 /* Local includes. */
+#include "chemistry_struct.h"
 #include "error.h"
 #include "hydro.h"
 #include "parser.h"
@@ -61,7 +62,7 @@ __attribute__((always_inline)) INLINE static void chemistry_init_part(
 static INLINE void chemistry_init_backend(
     const struct swift_params* parameter_file, const struct unit_system* us,
     const struct phys_const* phys_const,
-    struct chemistry_data* chemistry) {}
+    struct chemistry_part_data* chemistry) {}
 
 /**
  * @brief Prints the properties of the chemistry model to stdout.
@@ -69,7 +70,7 @@ static INLINE void chemistry_init_backend(
  * @param chemistry The properties of the chemistry function.
  */
 static INLINE void chemistry_print_backend(
-    const struct chemistry_data* chemistry) {
+    const struct chemistry_part_data* chemistry) {
 
   message("Chemistry function is 'No chemistry'.");
 }
diff --git a/src/cooling/const_du/cooling.h b/src/cooling/const_du/cooling.h
index 3dfc215c79..5fd12c657e 100644
--- a/src/cooling/const_du/cooling.h
+++ b/src/cooling/const_du/cooling.h
@@ -48,7 +48,7 @@
  * @brief Writes the current model of SPH to the file
  * @param h_grpsph The HDF5 group in which to write
  */
-void writeCoolingFlavor(hid_t h_grpsph) {
+__attribute__((always_inline)) INLINE static void writeCoolingFlavor(hid_t h_grpsph) {
 
   /* Viscosity and thermal conduction */
   io_write_attribute_s(
diff --git a/src/cooling/const_lambda/cooling.h b/src/cooling/const_lambda/cooling.h
index ac0b4d348f..2dd311e8f3 100644
--- a/src/cooling/const_lambda/cooling.h
+++ b/src/cooling/const_lambda/cooling.h
@@ -41,7 +41,7 @@
  * @brief Writes the current model of SPH to the file
  * @param h_grpsph The HDF5 group in which to write
  */
-void writeCoolingFlavor(hid_t h_grpsph) {
+__attribute__((always_inline)) INLINE static void writeCoolingFlavor(hid_t h_grpsph) {
 
   /* Viscosity and thermal conduction */
   io_write_attribute_s(
diff --git a/src/cooling/grackle/cooling.h b/src/cooling/grackle/cooling.h
index ad7c65bd28..8e7a7dc86f 100644
--- a/src/cooling/grackle/cooling.h
+++ b/src/cooling/grackle/cooling.h
@@ -46,7 +46,7 @@
  * @brief Writes the current model of SPH to the file
  * @param h_grpsph The HDF5 group in which to write
  */
-void writeCoolingFlavor(hid_t h_grpsph) {
+__attribute__((always_inline)) INLINE static void writeCoolingFlavor(hid_t h_grpsph) {
 
   /* Viscosity and thermal conduction */
   io_write_attribute_s(
diff --git a/src/cooling/none/cooling.h b/src/cooling/none/cooling.h
index 90f21c8796..678f5b19a5 100644
--- a/src/cooling/none/cooling.h
+++ b/src/cooling/none/cooling.h
@@ -41,7 +41,7 @@
  * @brief Writes the current model of SPH to the file
  * @param h_grpsph The HDF5 group in which to write
  */
-void writeCoolingFlavor(hid_t h_grpsph) {
+__attribute__((always_inline)) INLINE static void writeCoolingFlavor(hid_t h_grpsph) {
 
   /* Viscosity and thermal conduction */
   io_write_attribute_s(
diff --git a/src/hydro/Gadget2/hydro_io.h b/src/hydro/Gadget2/hydro_io.h
index 482ab9723f..7a461ee266 100644
--- a/src/hydro/Gadget2/hydro_io.h
+++ b/src/hydro/Gadget2/hydro_io.h
@@ -24,6 +24,7 @@
 #include "io_properties.h"
 #include "kernel_hydro.h"
 #include "chemistry_io.h"
+#include "cooling.h"
 
 /**
  * @brief Specifies which particle fields to read from a dataset
diff --git a/src/io_properties.h b/src/io_properties.h
index 2142d8d555..37ebd6da5b 100644
--- a/src/io_properties.h
+++ b/src/io_properties.h
@@ -24,6 +24,7 @@
 
 /* Local includes. */
 #include "inline.h"
+#include "common_io.h"
 
 /**
  * @brief The two sorts of data present in the GADGET IC files: compulsory to
-- 
GitLab