Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
SWIFTsim
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
69
Issues
69
List
Boards
Labels
Milestones
Merge Requests
11
Merge Requests
11
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
SWIFT
SWIFTsim
Commits
422568ad
Commit
422568ad
authored
Apr 08, 2019
by
Alexei Borissov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove change to mandatory parameters in yml file for feedback
parent
d1824f60
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
26 deletions
+29
-26
examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
...solatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
+6
-4
examples/StellarEvolution/stellar_evolution.yml
examples/StellarEvolution/stellar_evolution.yml
+5
-3
src/engine_marktasks.c
src/engine_marktasks.c
+0
-1
src/stars/EAGLE/imf.h
src/stars/EAGLE/imf.h
+1
-2
src/stars/EAGLE/stars.h
src/stars/EAGLE/stars.h
+2
-2
src/stars/EAGLE/stars_io.h
src/stars/EAGLE/stars_io.h
+9
-10
tests/testFeedback.yml
tests/testFeedback.yml
+6
-4
No files found.
examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
View file @
422568ad
...
...
@@ -109,9 +109,11 @@ EAGLEEntropyFloor:
Cool_temperature_norm_K
:
8000
# Temperature of the EAGLE Cool limiter entropy floor at the density threshold expressed in Kelvin.
Cool_gamma_effective
:
1.
# Slope the of the EAGLE Cool limiter entropy floor
E
agleStellarEvolution
:
E
AGLEFeedback
:
filename
:
/cosma5/data/Eagle/BG_Tables/YieldTables/
imf_model
:
Chabrier
EAGLEFeedback
:
lifetime_flag
:
2
continuous_heating_switch
:
0
SNIa_timescale_Gyr
:
2.0
SNIa_efficiency
:
2.e-3
SNII_wind_delay_Gyr
:
0.03
SNe_heating_temperature_K
:
3.16228e7
examples/StellarEvolution/stellar_evolution.yml
View file @
422568ad
...
...
@@ -90,9 +90,11 @@ EAGLEChemistry: # Solar abundances
init_abundance_Silicon
:
0.0
init_abundance_Iron
:
0.0
E
agleStellarEvolution
:
E
AGLEFeedback
:
filename
:
/cosma5/data/Eagle/BG_Tables/YieldTables/
imf_model
:
Chabrier
EAGLEFeedback
:
continuous_heating_switch
:
0
SNIa_timescale_Gyr
:
2.0
SNIa_efficiency
:
2.e-3
SNII_wind_delay_Gyr
:
0.03
SNe_heating_temperature_K
:
3.16228e7
src/engine_marktasks.c
View file @
422568ad
...
...
@@ -678,7 +678,6 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
*/
int
engine_marktasks
(
struct
engine
*
e
)
{
message
(
"marktask"
);
struct
scheduler
*
s
=
&
e
->
sched
;
const
ticks
tic
=
getticks
();
int
rebuild_space
=
0
;
...
...
src/stars/EAGLE/imf.h
View file @
422568ad
...
...
@@ -396,8 +396,7 @@ inline static double dying_mass_msun(double age_Gyr, float metallicity,
}
/**
* @brief Calculate lifetime of star poputlation in Gyr. Lifetime model is
* specified by stellar_lifetime_flag read in from yml file. Approach based on
* @brief Calculate lifetime of star poputlation in Gyr. Approach based on
* Portinari et al. 1998
*
* @param mass
...
...
src/stars/EAGLE/stars.h
View file @
422568ad
...
...
@@ -809,9 +809,9 @@ inline static void stars_evolve_init(struct swift_params* params,
stars
->
feedback
.
log10_SNIa_max_mass_msun
=
0
.
90308999
f
;
// log10(8).
/* Yield table filepath */
parser_get_param_string
(
params
,
"E
agleStellarEvolution
:filename"
,
parser_get_param_string
(
params
,
"E
AGLEFeedback
:filename"
,
stars
->
feedback
.
yield_table_path
);
parser_get_param_string
(
params
,
"E
agleStellarEvolution
:imf_model"
,
parser_get_param_string
(
params
,
"E
AGLEFeedback
:imf_model"
,
stars
->
feedback
.
IMF_Model
);
/* Initialise IMF */
...
...
src/stars/EAGLE/stars_io.h
View file @
422568ad
...
...
@@ -133,27 +133,26 @@ INLINE static void stars_props_init(struct stars_props *sp,
sp
->
log_max_h_change
=
logf
(
powf
(
max_volume_change
,
hydro_dimension_inv
));
/* Read SNIa timscale */
sp
->
feedback
.
SNIa_timescale_Gyr
=
parser_get_
opt_
param_float
(
params
,
"EAGLEFeedback:SNIa_timescale_Gyr"
,
2
.
f
);
sp
->
feedback
.
SNIa_timescale_Gyr
=
parser_get_param_float
(
params
,
"EAGLEFeedback:SNIa_timescale_Gyr"
);
/* Read the efficiency of producing SNIa */
sp
->
feedback
.
SNIa_efficiency
=
parser_get_
opt_
param_float
(
params
,
"EAGLEFeedback:SNIa_efficiency"
,
2.e-3
);
sp
->
feedback
.
SNIa_efficiency
=
parser_get_param_float
(
params
,
"EAGLEFeedback:SNIa_efficiency"
);
/* Are we doing continuous heating? */
sp
->
feedback
.
continuous_heating
=
parser_get_
opt_
param_int
(
params
,
"EAGLEFeedback:continuous_heating_switch"
,
0
);
sp
->
feedback
.
continuous_heating
=
parser_get_param_int
(
params
,
"EAGLEFeedback:continuous_heating_switch"
);
/* Set the delay time before SNII occur */
const
float
Gyr_in_cgs
=
3.154e16
;
sp
->
feedback
.
SNII_wind_delay
=
parser_get_opt_param_float
(
params
,
"EAGLEFeedback:SNII_wind_delay_Gyr"
,
0
.
03
)
*
parser_get_param_float
(
params
,
"EAGLEFeedback:SNII_wind_delay_Gyr"
)
*
Gyr_in_cgs
/
units_cgs_conversion_factor
(
us
,
UNIT_CONV_TIME
);
/* Read the temperature change to use in stochastic heating */
sp
->
feedback
.
SNe_deltaT_desired
=
parser_get_
opt_
param_float
(
params
,
"EAGLEFeedback:SNe_heating_temperature_K"
,
3.16228e7
);
sp
->
feedback
.
SNe_deltaT_desired
=
parser_get_param_float
(
params
,
"EAGLEFeedback:SNe_heating_temperature_K"
);
sp
->
feedback
.
SNe_deltaT_desired
/=
units_cgs_conversion_factor
(
us
,
UNIT_CONV_TEMPERATURE
);
...
...
tests/testFeedback.yml
View file @
422568ad
...
...
@@ -20,9 +20,11 @@ SPH:
resolution_eta
:
1.2348
# Target smoothing length in units of the mean inter-particle separation
CFL_condition
:
0.1
# Courant-Friedrich-Levy condition for time integration.
E
agleStellarEvolution
:
E
AGLEFeedback
:
filename
:
/cosma5/data/Eagle/BG_Tables/YieldTables/
imf_model
:
Chabrier
EAGLEFeedback
:
lifetime_flag
:
2
continuous_heating_switch
:
0
SNIa_timescale_Gyr
:
2.0
SNIa_efficiency
:
2.e-3
SNII_wind_delay_Gyr
:
0.03
SNe_heating_temperature_K
:
3.16228e7
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment