Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
43c7bfba
Commit
43c7bfba
authored
6 years ago
by
Folkert Nobels
Browse files
Options
Downloads
Patches
Plain Diff
Resolve misleading rho_crit and update parameter file
parent
de5de7c1
No related branches found
No related tags found
1 merge request
!705
Star formation following Schaye08
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
examples/parameter_example.yml
+3
-4
3 additions, 4 deletions
examples/parameter_example.yml
src/starformation/schaye08/starformation.h
+2
-2
2 additions, 2 deletions
src/starformation/schaye08/starformation.h
with
5 additions
and
6 deletions
examples/parameter_example.yml
+
3
−
4
View file @
43c7bfba
...
...
@@ -294,11 +294,10 @@ SchayeSF:
SchmidtLawExponent
:
1.4
# The power law of the Kennicutt-Schmidt law
SchmidtLawHighDensExponent
:
2.0
# The high density exponent for the Kennicutt-Schmidt law
SchmidtLawHighDens_thresh_HpCM3
:
1e3
Schaye2004
:
1
# whether to use the metallicity dependent critical star formation of Schaye (2004) (1) or not (0).
thresh_norm_HpCM3
:
0.1
# Critical sf normalization to use (is not a normalization when Schaye2004=0, than it is the value.
thresh_norm_HpCM3
:
0.1
# Critical sf normalization to use
thresh_max_norm_HpCM3
:
10.0
# Maximum norm of the critical sf density
MetDep_Z0
:
0.002
# Scale metallicity to use for the equation
(not used for Schaye2004=0)
MetDep_SFthresh_Slope
:
-0.64
# Scaling of the critical density with the metallicity
(not used for Schaye2004=0)
MetDep_Z0
:
0.002
# Scale metallicity to use for the equation
MetDep_SFthresh_Slope
:
-0.64
# Scaling of the critical density with the metallicity
thresh_MaxPhysDensOn
:
0
# Default is 0.
thresh_MaxOverDens_HpCM3
:
1e5
# Density at which the SF law changes
EOS_Jeans_GammaEffective
:
1.33333
# The polytropic index
...
...
This diff is collapsed.
Click to expand it.
src/starformation/schaye08/starformation.h
+
2
−
2
View file @
43c7bfba
...
...
@@ -144,7 +144,7 @@ INLINE static int star_formation_potential_to_become_star(
/* Read the critical overdensity factor and the critical density of
* the universe to determine the critical density to form stars*/
const
double
rho_crit
=
cosmo
->
critical_density
*
starform
->
min_over_den
;
const
double
rho_crit
_times_min_over_den
=
cosmo
->
critical_density
*
starform
->
min_over_den
;
/* double tempp = cooling_get_temperature() */
double
tempp
;
...
...
@@ -155,7 +155,7 @@ INLINE static int star_formation_potential_to_become_star(
* threshold is reached or if the metallicity dependent
* threshold is reached, after this we calculate if the
* temperature is appropriate */
if
(
p
->
rho
>
rho_crit
)
{
if
(
p
->
rho
>
rho_crit
_times_min_over_den
)
{
/* In this case there are actually multiple possibilities
* because we also need to check if the physical density exceeded
* the appropriate limit */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment