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
41436dcb
Commit
41436dcb
authored
5 years ago
by
Loic Hausammann
Committed by
Loic Hausammann
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
GEAR: remove sigma in SFR
parent
389d10d8
No related branches found
No related tags found
1 merge request
!1052
Gear cosmological simulations
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/pressure_floor/GEAR/pressure_floor.h
+2
-2
2 additions, 2 deletions
src/pressure_floor/GEAR/pressure_floor.h
src/star_formation/GEAR/star_formation.h
+3
-5
3 additions, 5 deletions
src/star_formation/GEAR/star_formation.h
with
5 additions
and
7 deletions
src/pressure_floor/GEAR/pressure_floor.h
+
2
−
2
View file @
41436dcb
...
...
@@ -103,8 +103,8 @@ pressure_floor_get_comoving_pressure(const struct part* p,
/* Compute the pressure floor */
float
floor
=
kernel_gamma
*
kernel_gamma
*
p
->
h
*
p
->
h
*
rho
*
pressure_floor_props
.
constants
;
floor
-=
p
->
pressure_floor_data
.
sigma2
*
cosmo
->
a
*
cosmo
->
a
;
pressure_floor_props
.
constants
*
cosmo
->
a_inv
;
floor
-=
p
->
pressure_floor_data
.
sigma2
;
floor
*=
a_coef
*
rho
*
hydro_one_over_gamma
;
return
fmaxf
(
pressure_comoving
,
floor
);
...
...
This diff is collapsed.
Click to expand it.
src/star_formation/GEAR/star_formation.h
+
3
−
5
View file @
41436dcb
...
...
@@ -75,11 +75,10 @@ INLINE static int star_formation_is_star_forming(
}
/* Get the required variables */
const
float
sigma2
=
p
->
pressure_floor_data
.
sigma2
*
cosmo
->
a
*
cosmo
->
a
;
const
float
density
=
hydro_get_physical_density
(
p
,
cosmo
)
;
const
float
n_jeans_2_3
=
starform
->
n_jeans_2_3
;
const
float
h
=
p
->
h
*
kernel_gamma
*
cosmo
->
a
;
const
float
density
=
hydro_get_physical_density
(
p
,
cosmo
);
// TODO use GRACKLE */
const
float
mu
=
hydro_props
->
mu_neutral
;
...
...
@@ -88,9 +87,8 @@ INLINE static int star_formation_is_star_forming(
const
float
coef
=
M_PI_4
/
(
phys_const
->
const_newton_G
*
n_jeans_2_3
*
h
*
h
);
const
float
density_criterion
=
coef
*
(
hydro_gamma
*
phys_const
->
const_boltzmann_k
*
temperature
/
(
mu
*
phys_const
->
const_proton_mass
)
+
sigma2
);
coef
*
hydro_gamma
*
phys_const
->
const_boltzmann_k
*
temperature
/
(
mu
*
phys_const
->
const_proton_mass
);
/* Check the density criterion */
return
density
>
density_criterion
;
...
...
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