From e75037ad94578ff7938e24f536ea68889f729b18 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Thu, 31 Mar 2016 17:13:06 +0100 Subject: [PATCH] Removed references to NO_SPH --- src/const.h | 3 +-- src/debug.c | 2 -- src/hydro.h | 4 ---- src/hydro_io.h | 2 -- src/part.h | 2 -- 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/const.h b/src/const.h index 9d0da33585..5ce5ee3cbb 100644 --- a/src/const.h +++ b/src/const.h @@ -68,9 +68,8 @@ /* SPH variant to use */ //#define MINIMAL_SPH -//#define GADGET2_SPH +#define GADGET2_SPH //#define DEFAULT_SPH -#define NO_SPH /* Gravity properties */ /* valid choices EXTERNAL_POTENTIAL_POINTMASS */ diff --git a/src/debug.c b/src/debug.c index 84d345ed07..4c1434118c 100644 --- a/src/debug.c +++ b/src/debug.c @@ -34,8 +34,6 @@ #include "./hydro/Gadget2/hydro_debug.h" #elif defined(DEFAULT_SPH) #include "./hydro/Default/hydro_debug.h" -#elif defined(NO_SPH) -#include "./hydro/Gadget2/hydro_debug.h" #else #error "Invalid choice of SPH variant" #endif diff --git a/src/hydro.h b/src/hydro.h index 4851523f23..aacbb6ac1d 100644 --- a/src/hydro.h +++ b/src/hydro.h @@ -34,10 +34,6 @@ #include "./hydro/Default/hydro_iact.h" #include "./hydro/Default/hydro.h" #define SPH_IMPLEMENTATION "Default version of SPH" -#elif defined(NO_SPH) -#include "./hydro/Gadget2/hydro_iact.h" -#include "./hydro/Gadget2/hydro.h" -#define SPH_IMPLEMENTATION "No SPH i.e. use Gadget2 framework for now..." #else #error "Invalid choice of SPH variant" #endif diff --git a/src/hydro_io.h b/src/hydro_io.h index 3ca7b0b06c..30d663f647 100644 --- a/src/hydro_io.h +++ b/src/hydro_io.h @@ -28,8 +28,6 @@ #include "./hydro/Gadget2/hydro_io.h" #elif defined(DEFAULT_SPH) #include "./hydro/Default/hydro_io.h" -#elif defined(NO_SPH) -#include "./hydro/Gadget2/hydro_io.h" #else #error "Invalid choice of SPH variant" #endif diff --git a/src/part.h b/src/part.h index e76a367448..5d4c9c88a1 100644 --- a/src/part.h +++ b/src/part.h @@ -45,8 +45,6 @@ #include "./hydro/Gadget2/hydro_part.h" #elif defined(DEFAULT_SPH) #include "./hydro/Default/hydro_part.h" -#elif defined(NO_SPH) -#include "./hydro/Gadget2/hydro_part.h" #else #error "Invalid choice of SPH variant" #endif -- GitLab