Skip to content
Snippets Groups Projects
Commit 08c2e811 authored by Loic Hausammann's avatar Loic Hausammann
Browse files

Add Gear star formation

parent 6e0b12e0
Branches
Tags
1 merge request!741Add iact for star formation
...@@ -1278,7 +1278,7 @@ case "$with_subgrid" in ...@@ -1278,7 +1278,7 @@ case "$with_subgrid" in
with_subgrid_tracers=none with_subgrid_tracers=none
with_subgrid_entropy_floor=none with_subgrid_entropy_floor=none
with_subgrid_stars=GEAR with_subgrid_stars=GEAR
with_subgrid_star_formation=none with_subgrid_star_formation=GEAR
with_subgrid_feedback=thermal with_subgrid_feedback=thermal
;; ;;
EAGLE) EAGLE)
...@@ -1787,7 +1787,7 @@ esac ...@@ -1787,7 +1787,7 @@ esac
# Star formation # Star formation
AC_ARG_WITH([star-formation], AC_ARG_WITH([star-formation],
[AS_HELP_STRING([--with-star-formation=<sfm>], [AS_HELP_STRING([--with-star-formation=<sfm>],
[star formation @<:@none, EAGLE, default: none@:>@] [star formation @<:@none, EAGLE, GEAR, default: none@:>@]
)], )],
[with_star_formation="$withval"], [with_star_formation="$withval"],
[with_star_formation="none"] [with_star_formation="none"]
...@@ -1807,6 +1807,9 @@ case "$with_star_formation" in ...@@ -1807,6 +1807,9 @@ case "$with_star_formation" in
EAGLE) EAGLE)
AC_DEFINE([STAR_FORMATION_EAGLE], [1], [EAGLE star formation model (Schaye and Dalla Vecchia (2008))]) AC_DEFINE([STAR_FORMATION_EAGLE], [1], [EAGLE star formation model (Schaye and Dalla Vecchia (2008))])
;; ;;
GEAR)
AC_DEFINE([STAR_FORMATION_GEAR], [1], [GEAR star formation model (Revaz and Jablonka (2018))])
;;
*) *)
AC_MSG_ERROR([Unknown star formation model]) AC_MSG_ERROR([Unknown star formation model])
;; ;;
......
...@@ -146,6 +146,8 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h ...@@ -146,6 +146,8 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h
star_formation/none/star_formation_io.h \ star_formation/none/star_formation_io.h \
star_formation/EAGLE/star_formation.h star_formation/EAGLE/star_formation_struct.h \ star_formation/EAGLE/star_formation.h star_formation/EAGLE/star_formation_struct.h \
star_formation/EAGLE/star_formation_io.h \ star_formation/EAGLE/star_formation_io.h \
star_formation/GEAR/star_formation.h star_formation/GEAR/star_formation_struct.h \
star_formation/GEAR/star_formation_io.h \
cooling/none/cooling.h cooling/none/cooling_struct.h \ cooling/none/cooling.h cooling/none/cooling_struct.h \
cooling/none/cooling_io.h \ cooling/none/cooling_io.h \
cooling/Compton/cooling.h cooling/Compton/cooling_struct.h \ cooling/Compton/cooling.h cooling/Compton/cooling_struct.h \
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
#include "./star_formation/none/star_formation.h" #include "./star_formation/none/star_formation.h"
#elif defined(STAR_FORMATION_EAGLE) #elif defined(STAR_FORMATION_EAGLE)
#include "./star_formation/EAGLE/star_formation.h" #include "./star_formation/EAGLE/star_formation.h"
#elif defined(STAR_FORMATION_GEAR)
#include "./star_formation/GEAR/star_formation.h"
#else #else
#error "Invalid choice of star formation law" #error "Invalid choice of star formation law"
#endif #endif
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
#include "./star_formation/none/star_formation_io.h" #include "./star_formation/none/star_formation_io.h"
#elif defined(STAR_FORMATION_EAGLE) #elif defined(STAR_FORMATION_EAGLE)
#include "./star_formation/EAGLE/star_formation_io.h" #include "./star_formation/EAGLE/star_formation_io.h"
#elif defined(STAR_FORMATION_GEAR)
#include "./star_formation/GEAR/star_formation_io.h"
#else #else
#error "Invalid choice of star formation model." #error "Invalid choice of star formation model."
#endif #endif
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
#include "./star_formation/none/star_formation_struct.h" #include "./star_formation/none/star_formation_struct.h"
#elif defined(STAR_FORMATION_EAGLE) #elif defined(STAR_FORMATION_EAGLE)
#include "./star_formation/EAGLE/star_formation_struct.h" #include "./star_formation/EAGLE/star_formation_struct.h"
#elif defined(STAR_FORMATION_GEAR)
#include "./star_formation/GEAR/star_formation_struct.h"
#else #else
#error "Invalid choice of star formation structure." #error "Invalid choice of star formation structure."
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment