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

Rename the 'COLIBRE' cooling model to 'PS2020'

parent ec7cd083
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 43 additions and 44 deletions
configure.ac
+ 11
− 12
View file @ d2193a89
......@@ -1858,7 +1858,7 @@ case "$with_subgrid" in
enable_fof=yes
;;
EAGLE-XL)
with_subgrid_cooling=COLIBRE
with_subgrid_cooling=PS2020
with_subgrid_chemistry=EAGLE
with_subgrid_tracers=EAGLE
with_subgrid_entropy_floor=EAGLE
......@@ -2293,7 +2293,7 @@ fi
# Cooling function
AC_ARG_WITH([cooling],
[AS_HELP_STRING([--with-cooling=<model>],
[cooling function @<:@none, const-du, const-lambda, QLA, EAGLE, COLIBRE, Wiersma, Ploeckinger, grackle_* default: none@:>@.
[cooling function @<:@none, const-du, const-lambda, QLA, EAGLE, PS2020, Wiersma, grackle_* default: none@:>@.
For Grackle, you need to provide the primordial chemistry parameter (e.g. grackle_0)]
)],
[with_cooling="$withval"],
......@@ -2349,22 +2349,21 @@ case "$with_cooling" in
AC_DEFINE([COOLING_EAGLE], [1], [Cooling following the EAGLE model (Wiersma+09 tables)])
with_cooling_name="EAGLE (Wiersma+09 tables)"
;;
COLIBRE)
AC_DEFINE([COOLING_COLIBRE], [1], [Cooling following the COLIBRE model (Ploeckinger+20 tables)])
with_cooling_name="COLIBRE (Ploeckinger+20 tables)"
PS2020)
AC_DEFINE([COOLING_PS2020], [1], [Cooling following the PS2020 model (Ploeckinger+20 tables)])
with_cooling_name="PS2020 (Ploeckinger+20 tables)"
;;
Ploeckinger)
AC_DEFINE([COOLING_COLIBRE], [1], [Cooling following the COLIBRE model (Ploeckinger+20 tables)])
with_cooling_name="COLIBRE (Ploeckinger+20 tables)"
COLIBRE)
AC_MSG_ERROR([This cooling model changed name. Please use 'PS2020'.])
;;
*)
AC_MSG_ERROR([Unknown cooling function: $with_cooling])
;;
esac
if test "$with_cooling" = "EAGLE" || test "$with_cooling" = "COLIBRE"; then
if test "$with_cooling" = "EAGLE" || test "$with_cooling" = "PS2020"; then
if test "$with_chemistry" = "none"; then
AC_MSG_ERROR([Cannot run with EAGLE or COLIBRE cooling without chemistry. Please pick a chemistry model])
AC_MSG_ERROR([Cannot run with EAGLE or PS2020 cooling without chemistry. Please pick a chemistry model])
fi
fi
......@@ -2870,8 +2869,8 @@ AM_CONDITIONAL([HAVEQLAEAGLECOOLING], [test "$with_cooling" = "QLA-EAGLE"])
# Check if using EAGLE cooling
AM_CONDITIONAL([HAVEEAGLECOOLING], [test "$with_cooling" = "EAGLE"])
# Check if using COLIBRE cooling
AM_CONDITIONAL([HAVECOLIBRECOOLING], [test "$with_cooling" = "COLIBRE"])
# Check if using PS2020 cooling
AM_CONDITIONAL([HAVEPS2020COOLING], [test "$with_cooling" = "PS2020"])
# Check if using EAGLE feedback
AM_CONDITIONAL([HAVEEAGLETHERMALFEEDBACK], [test "${with_feedback%-thermal}" = "EAGLE"])
......
doc/Doxyfile.in
+ 1
− 1
View file @ d2193a89
......@@ -833,7 +833,7 @@ INPUT = @top_srcdir@ \
@top_srcdir@/src/cooling/const_lambda \
@top_srcdir@/src/cooling/Compton \
@top_srcdir@/src/cooling/EAGLE \
@top_srcdir@/src/cooling/COLIBRE \
@top_srcdir@/src/cooling/PS2020 \
@top_srcdir@/src/cooling/grackle \
@top_srcdir@/src/chemistry/EAGLE \
@top_srcdir@/src/chemistry/GEAR \
......
examples/Cooling/CoolingBox/coolingBox.yml
+ 1
− 1
View file @ d2193a89
......@@ -82,7 +82,7 @@ EAGLEChemistry: # Solar abundances
GEARPressureFloor:
jeans_factor: 0. # Number of particles required to suppose a resolved clump and avoid the pressure floor.
COLIBRECooling:
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/EAGLE_ICs/EAGLE_100/eagle_100.yml
+ 2
− 2
View file @ d2193a89
......@@ -130,8 +130,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
+ 2
− 2
View file @ d2193a89
......@@ -129,8 +129,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
+ 2
− 2
View file @ d2193a89
......@@ -129,8 +129,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/EAGLE_ICs/EAGLE_25_low_res/eagle_25.yml
+ 2
− 2
View file @ d2193a89
......@@ -126,8 +126,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
+ 2
− 2
View file @ d2193a89
......@@ -127,8 +127,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/EAGLE_ICs/EAGLE_50_low_res/eagle_50.yml
+ 2
− 2
View file @ d2193a89
......@@ -126,8 +126,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/EAGLE_ICs/EAGLE_6/eagle_6.yml
+ 2
− 2
View file @ d2193a89
......@@ -129,8 +129,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
+ 2
− 2
View file @ d2193a89
......@@ -112,8 +112,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5
H_reion_z: 11.5
H_reion_eV_p_H: 2.0
......
examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
+ 2
− 2
View file @ d2193a89
......@@ -120,8 +120,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5
H_reion_z: 11.5
H_reion_eV_p_H: 2.0
......
examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
+ 2
− 2
View file @ d2193a89
......@@ -111,8 +111,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5
H_reion_z: 11.5
H_reion_eV_p_H: 2.0
......
examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
+ 2
− 2
View file @ d2193a89
......@@ -123,8 +123,8 @@ EAGLECooling:
He_reion_z_sigma: 0.5
He_reion_eV_p_H: 2.0
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5
H_reion_z: 11.5
H_reion_eV_p_H: 2.0
......
examples/IdealisedCluster/IdealisedCluster_M13/idealised_cluster_M13.yml
+ 2
− 2
View file @ d2193a89
......@@ -100,8 +100,8 @@ EAGLEChemistry:
init_abundance_Silicon: 0.000222 # Inital fraction of particle mass in Silicon
init_abundance_Iron: 0.000431 # Inital fraction of particle mass in Iron
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/IdealisedCluster/IdealisedCluster_M13/run.sh
+ 2
− 2
View file @ d2193a89
......@@ -8,8 +8,8 @@ fi
if [ ! -e UV_dust1_CR1_G1_shield1.hdf5 ]
then
echo "Fetching PS20 cooling tables for the isolated galaxy example..."
../getPS20CoolingTables.sh
echo "Fetching PS2020 cooling tables for the isolated galaxy example..."
../getPS2020CoolingTables.sh
fi
if [ ! -e yieldtables ]
......
examples/IdealisedCluster/IdealisedCluster_M135/idealised_cluster_M135.yml
+ 2
− 2
View file @ d2193a89
......@@ -100,8 +100,8 @@ EAGLEChemistry:
init_abundance_Silicon: 0.000222 # Inital fraction of particle mass in Silicon
init_abundance_Iron: 0.000431 # Inital fraction of particle mass in Iron
# COLIBRE cooling parameters
COLIBRECooling:
# PS2020 cooling parameters
PS2020Cooling:
dir_name: ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
H_reion_z: 7.5 # Redshift of Hydrogen re-ionization (Planck 2018)
H_reion_eV_p_H: 2.0
......
examples/IdealisedCluster/IdealisedCluster_M135/run.sh
+ 2
− 2
View file @ d2193a89
......@@ -8,8 +8,8 @@ fi
if [ ! -e UV_dust1_CR1_G1_shield1.hdf5 ]
then
echo "Fetching PS20 cooling tables for the isolated galaxy example..."
../getPS20CoolingTables.sh
echo "Fetching PS2020 cooling tables for the isolated galaxy example..."
../getPS2020CoolingTables.sh
fi
if [ ! -e yieldtables ]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment