Skip to content
Snippets Groups Projects
Commit 1a44222f authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge remote-tracking branch 'origin/master' into parmetis-perm-test

parents bbefa289 e9d05916
Branches
Tags
1 merge request!506Add ParMETIS support
......@@ -123,7 +123,7 @@ void hydro_props_init(struct hydro_props *p,
/* Compute the minimal energy (Note the temp. read is in internal units) */
double u_min = phys_const->const_boltzmann_k / phys_const->const_proton_mass;
u_min *= p->initial_temperature;
u_min *= p->minimal_temperature;
u_min *= hydro_one_over_gamma_minus_one;
/* Correct for hydrogen mass fraction */
......
......@@ -50,6 +50,20 @@ void units_init_cgs(struct unit_system* us) {
us->UnitTemperature_in_cgs = 1.;
}
/**
* @brief Initialises the unit_system structure with SI system
*
* @param us The unit_system to initialize
*/
void units_init_si(struct unit_system* us) {
us->UnitMass_in_cgs = 1000.;
us->UnitLength_in_cgs = 100.;
us->UnitTime_in_cgs = 1.;
us->UnitCurrent_in_cgs = 1.;
us->UnitTemperature_in_cgs = 1.;
}
/**
* @brief Initialise the unit_system with values for the base units.
*
......
......@@ -96,6 +96,7 @@ enum unit_conversion_factor {
};
void units_init_cgs(struct unit_system*);
void units_init_si(struct unit_system*);
void units_init(struct unit_system* us, double U_M_in_cgs, double U_L_in_cgs,
double U_t_in_cgs, double U_C_in_cgs, double U_T_in_cgs);
void units_init_from_params(struct unit_system*, struct swift_params*,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment