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
df0bb44e
Commit
df0bb44e
authored
5 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Code formatting
parent
69205ae5
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!942
EAGLE star formation update
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/star_formation/EAGLE/star_formation.h
+4
-5
4 additions, 5 deletions
src/star_formation/EAGLE/star_formation.h
with
4 additions
and
5 deletions
src/star_formation/EAGLE/star_formation.h
+
4
−
5
View file @
df0bb44e
...
@@ -199,8 +199,8 @@ INLINE static double EOS_pressure(const double n_H,
...
@@ -199,8 +199,8 @@ INLINE static double EOS_pressure(const double n_H,
* @return The pressure on the equation of state in internal units.
* @return The pressure on the equation of state in internal units.
*/
*/
INLINE
static
double
EOS_entropy
(
const
double
n_H
,
INLINE
static
double
EOS_entropy
(
const
double
n_H
,
const
struct
star_formation
*
starform
,
const
struct
star_formation
*
starform
,
const
double
rho
)
{
const
double
rho
)
{
return
gas_entropy_from_pressure
(
rho
,
EOS_pressure
(
n_H
,
starform
));
return
gas_entropy_from_pressure
(
rho
,
EOS_pressure
(
n_H
,
starform
));
}
}
...
@@ -268,9 +268,8 @@ INLINE static int star_formation_is_star_forming(
...
@@ -268,9 +268,8 @@ INLINE static int star_formation_is_star_forming(
/* Calculate the entropy that will be used to calculate
/* Calculate the entropy that will be used to calculate
* the off-set, this is the maximum between the entropy
* the off-set, this is the maximum between the entropy
* floor and the star formation polytropic EOS. */
* floor and the star formation polytropic EOS. */
const
double
entropy_eos
=
const
double
entropy_eos
=
max
(
entropy_floor
(
p
,
cosmo
,
entropy_floor_props
),
max
(
entropy_floor
(
p
,
cosmo
,
entropy_floor_props
),
EOS_entropy
(
n_H
,
starform
,
physical_density
));
EOS_entropy
(
n_H
,
starform
,
physical_density
));
/* Check the Scahye & Dalla Vecchia 2012 EOS-based temperature critrion */
/* Check the Scahye & Dalla Vecchia 2012 EOS-based temperature critrion */
return
(
entropy
<
return
(
entropy
<
...
...
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