From ffc8fd98b92a2895be9c9c8e98f8bf811286459e Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <schaller@strw.leidenuniv.nl> Date: Wed, 30 Jan 2019 16:08:58 +1100 Subject: [PATCH] Schaye08 --> EAGLE for the star formation model name. --- configure.ac | 2 +- src/star_formation.h | 4 ++-- src/star_formation/{schaye08 => EAGLE}/star_formation.h | 6 +++--- src/star_formation/none/star_formation.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) rename src/star_formation/{schaye08 => EAGLE}/star_formation.h (99%) diff --git a/configure.ac b/configure.ac index 19392a2ad6..fc54cf79d5 100644 --- a/configure.ac +++ b/configure.ac @@ -1760,7 +1760,7 @@ case "$with_star_formation" in AC_DEFINE([STAR_FORMATION_NONE], [1], [No star formation]) ;; EAGLE) - AC_DEFINE([STAR_FORMATION_SCHAYE], [1], [Schaye and Dalla Vecchia (2008) star formation]) + AC_DEFINE([STAR_FORMATION_EAGLE], [1], [EAGLE star formation model (Schaye and Dalla Vecchia (2008))]) ;; *) AC_MSG_ERROR([Unknown star formation model]) diff --git a/src/star_formation.h b/src/star_formation.h index f54ceb93b9..040233c87d 100644 --- a/src/star_formation.h +++ b/src/star_formation.h @@ -30,8 +30,8 @@ /* Import the right star formation law definition */ #if defined(STAR_FORMATION_NONE) #include "./star_formation/none/star_formation.h" -#elif defined(STAR_FORMATION_SCHAYE) -#include "./star_formation/schaye08/star_formation.h" +#elif defined(STAR_FORMATION_EAGLE) +#include "./star_formation/EAGLE/star_formation.h" #else #error "Invalid choice of star formation law" #endif diff --git a/src/star_formation/schaye08/star_formation.h b/src/star_formation/EAGLE/star_formation.h similarity index 99% rename from src/star_formation/schaye08/star_formation.h rename to src/star_formation/EAGLE/star_formation.h index e07a2ff972..2a7cdaabce 100644 --- a/src/star_formation/schaye08/star_formation.h +++ b/src/star_formation/EAGLE/star_formation.h @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * *******************************************************************************/ -#ifndef SWIFT_SCHAYE_STARFORMATION_H -#define SWIFT_SCHAYE_STARFORMATION_H +#ifndef SWIFT_EAGLE_STAR_FORMATION_H +#define SWIFT_EAGLE_STAR_FORMATION_H /* Some standard headers */ #include <stdlib.h> @@ -570,4 +570,4 @@ struct star_formation_history { }; }; -#endif /* SWIFT_SCHAYE_STARFORMATION_H */ +#endif /* SWIFT_EAGLE_STAR_FORMATION_H */ diff --git a/src/star_formation/none/star_formation.h b/src/star_formation/none/star_formation.h index e4f5949d96..ad6d6b2d18 100644 --- a/src/star_formation/none/star_formation.h +++ b/src/star_formation/none/star_formation.h @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * *******************************************************************************/ -#ifndef SWIFT_NO_STARFORMATION_H -#define SWIFT_NO_STARFORMATION_H +#ifndef SWIFT_NONE_STAR_FORMATION_H +#define SWIFT_NONE_STAR_FORMATION_H /* Local includes */ #include "cosmology.h" @@ -99,4 +99,4 @@ INLINE static void starformation_print_backend( message("Star formation law is 'No Star Formation'"); } -#endif /* SWIFT_NO_STARFORMATION_H */ +#endif /* SWIFT_NONE_STAR_FORMATION_H */ -- GitLab