From 984a96e0d2dd20d8e2f2733f3b751a9803cccc8c Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Sat, 13 Feb 2016 17:54:52 +0000
Subject: [PATCH] Can now easily switch to the Minimal SPH implementation

---
 src/debug.c    |  9 +++++++--
 src/hydro.h    | 15 ++++++++++-----
 src/hydro_io.h | 10 +++++++---
 src/part.h     |  8 ++++++--
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/debug.c b/src/debug.c
index 29076bfb61..d2fdf7c124 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -28,12 +28,17 @@
 #include "debug.h"
 
 /* Import the right hydro definition */
-#ifdef GADGET2_SPH
+#if defined(MINIMAL_SPH)
+#include "./hydro/Minimal/hydro_debug.h"
+#elif defined(GADGET2_SPH)
 #include "./hydro/Gadget2/hydro_debug.h"
-#else
+#elif defined(DEFAULT_SPH)
 #include "./hydro/Default/hydro_debug.h"
+#else
+#error "Invalid choice of SPH variant"
 #endif
 
+
 /**
  * @brief Looks for the particle with the given id and prints its information to
  *the standard output.
diff --git a/src/hydro.h b/src/hydro.h
index e6db545859..4b131ea7bb 100644
--- a/src/hydro.h
+++ b/src/hydro.h
@@ -22,12 +22,17 @@
 #include "./const.h"
 
 /* Import the right functions */
-#ifdef GADGET2_SPH
-#include "./hydro/Gadget2/hydro.h"
+#if defined(MINIMAL_SPH)
+#include "./hydro/Minimal/hydro_iact.h"
+#include "./hydro/Minimal/hydro.h"
+#elif defined(GADGET2_SPH)
 #include "./hydro/Gadget2/hydro_iact.h"
-#else
-#include "./hydro/Default/hydro.h"
+#include "./hydro/Gadget2/hydro.h"
+#elif defined(DEFAULT_SPH)
 #include "./hydro/Default/hydro_iact.h"
+#include "./hydro/Default/hydro.h"
+#else
+#error "Invalid choice of SPH variant"
 #endif
 
-#endif
+#endif /* SWIFT_HYDRO_H */
diff --git a/src/hydro_io.h b/src/hydro_io.h
index 2f8c1d4cd3..30d663f647 100644
--- a/src/hydro_io.h
+++ b/src/hydro_io.h
@@ -22,10 +22,14 @@
 #include "./const.h"
 
 /* Import the right functions */
-#ifdef GADGET2_SPH
+#if defined(MINIMAL_SPH)
+#include "./hydro/Minimal/hydro_io.h"
+#elif defined(GADGET2_SPH)
 #include "./hydro/Gadget2/hydro_io.h"
-#else
+#elif defined(DEFAULT_SPH)
 #include "./hydro/Default/hydro_io.h"
+#else
+#error "Invalid choice of SPH variant"
 #endif
 
-#endif
+#endif /* SWIFT_HYDRO_IO_H */
diff --git a/src/part.h b/src/part.h
index 44adf56762..168e80b68b 100644
--- a/src/part.h
+++ b/src/part.h
@@ -38,10 +38,14 @@
 #define xpart_align 32
 
 /* Import the right particle definition */
-#ifdef GADGET2_SPH
+#if defined(MINIMAL_SPH)
+#include "./hydro/Minimal/hydro_part.h"
+#elif defined(GADGET2_SPH)
 #include "./hydro/Gadget2/hydro_part.h"
-#else
+#elif defined(DEFAULT_SPH)
 #include "./hydro/Default/hydro_part.h"
+#else
+#error "Invalid choice of SPH variant"
 #endif
 
 #include "./gravity/Default/gravity_part.h"
-- 
GitLab