From 97c7c027b7e747b759968d6bbe5b6b9de98e45b6 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Sat, 13 Feb 2016 17:47:54 +0000 Subject: [PATCH] LEGACY_GADGET2_SPH --> GADGET2_SPH --- src/common_io.c | 2 +- src/const.h | 2 +- src/debug.c | 2 +- src/hydro.h | 2 +- src/hydro_io.h | 2 +- src/part.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common_io.c b/src/common_io.c index b7a9a887e4..f375df85d2 100644 --- a/src/common_io.c +++ b/src/common_io.c @@ -287,7 +287,7 @@ void writeSPHflavour(hid_t h_file) { writeAttribute_f(h_grpsph, "Delta N_ngb", const_delta_nwneigh); writeAttribute_f(h_grpsph, "Hydro gamma", const_hydro_gamma); -#ifdef LEGACY_GADGET2_SPH +#ifdef GADGET2_SPH writeAttribute_s(h_grpsph, "Thermal Conductivity Model", "(No treatment) Legacy Gadget-2 as in Springel (2005)"); writeAttribute_s(h_grpsph, "Viscosity Model", diff --git a/src/const.h b/src/const.h index bc45a7c49b..0b756560ca 100644 --- a/src/const.h +++ b/src/const.h @@ -66,7 +66,7 @@ #define const_iepsilon6 (const_iepsilon3* const_iepsilon3) /* SPH variant to use */ -#define LEGACY_GADGET2_SPH +#define GADGET2_SPH /* System of units */ #define const_unit_length_in_cgs 1 /* 3.08567810e16 /\* 1Mpc *\/ */ diff --git a/src/debug.c b/src/debug.c index 3efca024d1..29076bfb61 100644 --- a/src/debug.c +++ b/src/debug.c @@ -28,7 +28,7 @@ #include "debug.h" /* Import the right hydro definition */ -#ifdef LEGACY_GADGET2_SPH +#ifdef GADGET2_SPH #include "./hydro/Gadget2/hydro_debug.h" #else #include "./hydro/Default/hydro_debug.h" diff --git a/src/hydro.h b/src/hydro.h index c57c60d696..e6db545859 100644 --- a/src/hydro.h +++ b/src/hydro.h @@ -22,7 +22,7 @@ #include "./const.h" /* Import the right functions */ -#ifdef LEGACY_GADGET2_SPH +#ifdef GADGET2_SPH #include "./hydro/Gadget2/hydro.h" #include "./hydro/Gadget2/hydro_iact.h" #else diff --git a/src/hydro_io.h b/src/hydro_io.h index b396611856..2f8c1d4cd3 100644 --- a/src/hydro_io.h +++ b/src/hydro_io.h @@ -22,7 +22,7 @@ #include "./const.h" /* Import the right functions */ -#ifdef LEGACY_GADGET2_SPH +#ifdef GADGET2_SPH #include "./hydro/Gadget2/hydro_io.h" #else #include "./hydro/Default/hydro_io.h" diff --git a/src/part.h b/src/part.h index 3aaa28939c..44adf56762 100644 --- a/src/part.h +++ b/src/part.h @@ -38,7 +38,7 @@ #define xpart_align 32 /* Import the right particle definition */ -#ifdef LEGACY_GADGET2_SPH +#ifdef GADGET2_SPH #include "./hydro/Gadget2/hydro_part.h" #else #include "./hydro/Default/hydro_part.h" -- GitLab