Skip to content
Snippets Groups Projects
Commit e935de56 authored by Jacob Kegerreis's avatar Jacob Kegerreis
Browse files

Use a sensible semi-placeholder soundspeed

parent 89e12689
No related branches found
No related tags found
1 merge request!545Add support for equations of state related to planetary physics
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
struct Til_params { struct Til_params {
int mat_id; int mat_id;
float rho_0, a, b, A, B, E_0, E_iv, E_cv, alpha, beta, eta_min, P_min; 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) // Parameter values for each material (cgs units)
...@@ -63,8 +62,6 @@ INLINE static void set_Til_iron(struct Til_params *mat, int mat_id) { ...@@ -63,8 +62,6 @@ INLINE static void set_Til_iron(struct Til_params *mat, int mat_id) {
mat->beta = 5.0; mat->beta = 5.0;
mat->eta_min = 0.0; mat->eta_min = 0.0;
mat->P_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) { INLINE static void set_Til_granite(struct Til_params *mat, int mat_id) {
mat->mat_id = mat_id; mat->mat_id = mat_id;
...@@ -80,8 +77,6 @@ INLINE static void set_Til_granite(struct Til_params *mat, int mat_id) { ...@@ -80,8 +77,6 @@ INLINE static void set_Til_granite(struct Til_params *mat, int mat_id) {
mat->beta = 5.0; mat->beta = 5.0;
mat->eta_min = 0.0; mat->eta_min = 0.0;
mat->P_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) { INLINE static void set_Til_water(struct Til_params *mat, int mat_id) {
mat->mat_id = mat_id; mat->mat_id = mat_id;
...@@ -97,8 +92,6 @@ INLINE static void set_Til_water(struct Til_params *mat, int mat_id) { ...@@ -97,8 +92,6 @@ INLINE static void set_Til_water(struct Til_params *mat, int mat_id) {
mat->beta = 5.0; mat->beta = 5.0;
mat->eta_min = 0.915; mat->eta_min = 0.915;
mat->P_min = 0.0; mat->P_min = 0.0;
mat->c_TEMPORARY = 9.4e-4;
} }
// Convert from cgs to internal units // Convert from cgs to internal units
...@@ -112,8 +105,6 @@ INLINE static void convert_units_Til( ...@@ -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_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->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->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 // gas_internal_energy_from_entropy
...@@ -276,7 +267,7 @@ INLINE static float Til_soundspeed_from_internal_energy( ...@@ -276,7 +267,7 @@ INLINE static float Til_soundspeed_from_internal_energy(
// } // }
float c; float c;
c = mat->c_TEMPORARY; /// VERY TEMPORARY!!! c = sqrt(mat->A / mat->rho_0);
return c; return c;
} }
...@@ -287,7 +278,7 @@ INLINE static float Til_soundspeed_from_pressure( ...@@ -287,7 +278,7 @@ INLINE static float Til_soundspeed_from_pressure(
float c; float c;
c = mat->c_TEMPORARY; /// VERY TEMPORARY!!! c = sqrt(mat->A / mat->rho_0);
return c; return c;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment