Better way of switching between SPH definition for the i/o routines.

src/Makefile.am

@@ -46,7 +46,7 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
 # Include files for distribution, not installation.
 noinst_HEADERS = atomic.h cycle.h error.h inline.h kernel.h vector.h \
 		 runner_doiact.h runner_doiact_grav.h units.h intrinsics.h \
-		 hydro.h gravity.h hydro/*/*.h gravity/*/*.h
+		 hydro.h hydro_io.h gravity.h hydro/*/*.h gravity/*/*.h
 
 # Sources and flags for regular library
 libswiftsim_la_SOURCES = $(AM_SOURCES)

src/hydro_io.h

+/*******************************************************************************
+ * This file is part of SWIFT.
+ * Coypright (c) 2016 Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ******************************************************************************/
+#ifndef SWIFT_HYDRO_IO_H
+#define SWIFT_HYDRO_IO_H
+
+#include "./const.h"
+
+/* Import the right functions */
+#ifdef LEGACY_GADGET2_SPH
+#include "./hydro/Gadget2/hydro_io.h"
+#else
+#include "./hydro/Default/hydro_io.h"
+#endif
+
+#endif

src/parallel_io.c

@@ -337,12 +337,11 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
                     mpi_rank, offset, (char*)(&(part[0]).field), us,          \
                     convFactor)
 
+
 /* Import the right hydro definition */
-#ifdef LEGACY_GADGET2_SPH
-#include "./hydro/Gadget2/hydro_io.h"
-#else
-#include "./hydro/Default/hydro_io.h"
-#endif
+#include "hydro_io.h"
+
+
 
 
 /**

src/serial_io.c

@@ -358,11 +358,8 @@ void writeArrayBackEnd(hid_t grp, char* name,
 
 
 /* Import the right hydro definition */
-#ifdef LEGACY_GADGET2_SPH
-#include "./hydro/Gadget2/hydro_io.h"
-#else
-#include "./hydro/Default/hydro_io.h"
-#endif
+#include "hydro_io.h"
+
 
 
 /**

src/single_io.c

@@ -280,11 +280,7 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
 
 
 /* Import the right hydro definition */
-#ifdef LEGACY_GADGET2_SPH
-#include "./hydro/Gadget2/hydro_io.h"
-#else
-#include "./hydro/Default/hydro_io.h"
-#endif
+#include "hydro_io.h"