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
e935de56
Commit
e935de56
authored
7 years ago
by
Jacob Kegerreis
Browse files
Options
Downloads
Patches
Plain Diff
Use a sensible semi-placeholder soundspeed
parent
89e12689
No related branches found
No related tags found
1 merge request
!545
Add support for equations of state related to planetary physics
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/equation_of_state/planetary/tillotson.h
+2
-11
2 additions, 11 deletions
src/equation_of_state/planetary/tillotson.h
with
2 additions
and
11 deletions
src/equation_of_state/planetary/tillotson.h
+
2
−
11
View file @
e935de56
...
...
@@ -45,7 +45,6 @@
struct
Til_params
{
int
mat_id
;
float
rho_0
,
a
,
b
,
A
,
B
,
E_0
,
E_iv
,
E_cv
,
alpha
,
beta
,
eta_min
,
P_min
;
float
c_TEMPORARY
;
};
// Parameter values for each material (cgs units)
...
...
@@ -63,8 +62,6 @@ INLINE static void set_Til_iron(struct Til_params *mat, int mat_id) {
mat
->
beta
=
5
.
0
;
mat
->
eta_min
=
0
.
0
;
mat
->
P_min
=
0
.
0
;
mat
->
c_TEMPORARY
=
9.4e-4
;
}
INLINE
static
void
set_Til_granite
(
struct
Til_params
*
mat
,
int
mat_id
)
{
mat
->
mat_id
=
mat_id
;
...
...
@@ -80,8 +77,6 @@ INLINE static void set_Til_granite(struct Til_params *mat, int mat_id) {
mat
->
beta
=
5
.
0
;
mat
->
eta_min
=
0
.
0
;
mat
->
P_min
=
0
.
0
;
mat
->
c_TEMPORARY
=
9.4e-4
;
}
INLINE
static
void
set_Til_water
(
struct
Til_params
*
mat
,
int
mat_id
)
{
mat
->
mat_id
=
mat_id
;
...
...
@@ -97,8 +92,6 @@ INLINE static void set_Til_water(struct Til_params *mat, int mat_id) {
mat
->
beta
=
5
.
0
;
mat
->
eta_min
=
0
.
915
;
mat
->
P_min
=
0
.
0
;
mat
->
c_TEMPORARY
=
9.4e-4
;
}
// Convert from cgs to internal units
...
...
@@ -112,8 +105,6 @@ INLINE static void convert_units_Til(
mat
->
E_iv
/=
units_cgs_conversion_factor
(
us
,
UNIT_CONV_ENERGY_PER_UNIT_MASS
);
mat
->
E_cv
/=
units_cgs_conversion_factor
(
us
,
UNIT_CONV_ENERGY_PER_UNIT_MASS
);
mat
->
P_min
/=
units_cgs_conversion_factor
(
us
,
UNIT_CONV_PRESSURE
);
mat
->
c_TEMPORARY
/=
units_cgs_conversion_factor
(
us
,
UNIT_CONV_SPEED
);
}
// gas_internal_energy_from_entropy
...
...
@@ -276,7 +267,7 @@ INLINE static float Til_soundspeed_from_internal_energy(
// }
float
c
;
c
=
mat
->
c_TEMPORARY
;
/// VERY TEMPORARY!!!
c
=
sqrt
(
mat
->
A
/
mat
->
rho_0
);
return
c
;
}
...
...
@@ -287,7 +278,7 @@ INLINE static float Til_soundspeed_from_pressure(
float
c
;
c
=
mat
->
c_TEMPORARY
;
/// VERY TEMPORARY!!!
c
=
sqrt
(
mat
->
A
/
mat
->
rho_0
);
return
c
;
}
...
...
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