Skip to content
Snippets Groups Projects
Commit ffc8fd98 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Schaye08 --> EAGLE for the star formation model name.

parent 64af2707
No related branches found
No related tags found
1 merge request!705Star formation following Schaye08
...@@ -1760,7 +1760,7 @@ case "$with_star_formation" in ...@@ -1760,7 +1760,7 @@ case "$with_star_formation" in
AC_DEFINE([STAR_FORMATION_NONE], [1], [No star formation]) AC_DEFINE([STAR_FORMATION_NONE], [1], [No star formation])
;; ;;
EAGLE) 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]) AC_MSG_ERROR([Unknown star formation model])
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
/* Import the right star formation law definition */ /* Import the right star formation law definition */
#if defined(STAR_FORMATION_NONE) #if defined(STAR_FORMATION_NONE)
#include "./star_formation/none/star_formation.h" #include "./star_formation/none/star_formation.h"
#elif defined(STAR_FORMATION_SCHAYE) #elif defined(STAR_FORMATION_EAGLE)
#include "./star_formation/schaye08/star_formation.h" #include "./star_formation/EAGLE/star_formation.h"
#else #else
#error "Invalid choice of star formation law" #error "Invalid choice of star formation law"
#endif #endif
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*******************************************************************************/ *******************************************************************************/
#ifndef SWIFT_SCHAYE_STARFORMATION_H #ifndef SWIFT_EAGLE_STAR_FORMATION_H
#define SWIFT_SCHAYE_STARFORMATION_H #define SWIFT_EAGLE_STAR_FORMATION_H
/* Some standard headers */ /* Some standard headers */
#include <stdlib.h> #include <stdlib.h>
...@@ -570,4 +570,4 @@ struct star_formation_history { ...@@ -570,4 +570,4 @@ struct star_formation_history {
}; };
}; };
#endif /* SWIFT_SCHAYE_STARFORMATION_H */ #endif /* SWIFT_EAGLE_STAR_FORMATION_H */
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*******************************************************************************/ *******************************************************************************/
#ifndef SWIFT_NO_STARFORMATION_H #ifndef SWIFT_NONE_STAR_FORMATION_H
#define SWIFT_NO_STARFORMATION_H #define SWIFT_NONE_STAR_FORMATION_H
/* Local includes */ /* Local includes */
#include "cosmology.h" #include "cosmology.h"
...@@ -99,4 +99,4 @@ INLINE static void starformation_print_backend( ...@@ -99,4 +99,4 @@ INLINE static void starformation_print_backend(
message("Star formation law is 'No Star Formation'"); message("Star formation law is 'No Star Formation'");
} }
#endif /* SWIFT_NO_STARFORMATION_H */ #endif /* SWIFT_NONE_STAR_FORMATION_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment