diff --git a/src/common_io.c b/src/common_io.c index b7a9a887e450b3fcc664650688a19910efcfab3d..f375df85d2d749698938e3179a0bee239a8b94d8 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 bc45a7c49b3bf38253ef129765b6b63f6eaaf9bb..0b756560ca07aefbdf813902e1f45eef3c7ae8c9 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 3efca024d10030c3bf4a9c0f9861ec0dc2f07310..29076bfb61adc9c74bb4187827d3f23fc7da2214 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 c57c60d696105c94af70ad1b24fce197163ce698..e6db5458595ac66c2d8292a12b251b8e45314642 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 b39661185668f71ae4adfe151de127a2a4766189..2f8c1d4cd370d2b148591387ca1fbb384b2d25d4 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 3aaa28939c240bb24fb7053ad949f8b7ec999a88..44adf56762d8a0328a8d9b5fced405930d83ac2f 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"