Skip to content
Snippets Groups Projects
Commit 22affead authored by James Willis's avatar James Willis
Browse files

Commented out the setting of G from the parameter file. This bug will be fixed in the future.

parent 7526caba
Branches
Tags
1 merge request!578Swift velociraptor
......@@ -412,7 +412,7 @@ void engine_clean(struct engine *e);
int engine_estimate_nr_tasks(struct engine *e);
#ifdef HAVE_SETAFFINITY
cpu_set_t *engine_entry_affinity();
cpu_set_t *engine_entry_affinity(void);
#endif
/* Struct dump/restore support. */
......
......@@ -48,8 +48,8 @@ void phys_const_init(const struct unit_system *us, struct swift_params *params,
const_newton_G_cgs / units_general_cgs_conversion_factor(us, dimension_G);
/* Overwrite G if present in the file */
internal_const->const_newton_G = parser_get_opt_param_double(
params, "PhysicalConstants:G", internal_const->const_newton_G);
//internal_const->const_newton_G = parser_get_opt_param_double(
// params, "PhysicalConstants:G", internal_const->const_newton_G);
const float dimension_c[5] = {0, 1, -1, 0, 0}; /* [cm s^-1] */
internal_const->const_speed_light_c =
......
......@@ -82,8 +82,7 @@ void velociraptor_init(struct engine *e) {
e->stf_conv_fac->velocitytokms = units_conversion_factor(e->internal_units, e->stf_units, UNIT_CONV_SPEED); /* 1km/s <=> 1e5cm/s */
e->stf_conv_fac->masstosolarmass = units_conversion_factor(e->internal_units, e->stf_units, UNIT_CONV_MASS); /* 1M_sol <=> 1.99e33g */
e->stf_conv_fac->energyperunitmass = units_conversion_factor(e->internal_units, e->stf_units, UNIT_CONV_ENERGY_PER_UNIT_MASS); /* Conversion for gravitational potential. */
//e->stf_conv_fac->gravity = vel_const.const_newton_G; /* TODO: G = 6.67408e-8 (cgs) */
e->stf_conv_fac->gravity = 4.302051e-06; /* TODO: G = 6.67408e-8 (cgs) */
e->stf_conv_fac->gravity = vel_const.const_newton_G; /* TODO: G = 6.67408e-8 (cgs) */
e->stf_conv_fac->hubbleunit = e->cosmology->H; /* TODO: double check this. */
unit_info = *e->stf_conv_fac;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment