Skip to content
Snippets Groups Projects
Commit 06ddd2aa authored by William Roper's avatar William Roper
Browse files

Fixed unset dim passed to gravity_props_init since the order of intialisation...

Fixed unset dim passed to  gravity_props_init since the order of intialisation has changed in the zoom branch relative to master
parent acc77024
No related branches found
No related tags found
No related merge requests found
...@@ -1312,14 +1312,25 @@ int main(int argc, char *argv[]) { ...@@ -1312,14 +1312,25 @@ int main(int argc, char *argv[]) {
neutrino_props_init(&neutrino_properties, &prog_const, &us, params, &cosmo, neutrino_props_init(&neutrino_properties, &prog_const, &us, params, &cosmo,
with_neutrinos); with_neutrinos);
/* Get cdim from parameter file for gravity property intialisation */
/* Set the zoom cdim. */
int cdim[3];
cdim[0] = parser_get_opt_param_int(params, "Scheduler:max_top_level_cells",
space_max_top_level_cells_default);
cdim[1] = parser_get_opt_param_int(params, "Scheduler:max_top_level_cells",
space_max_top_level_cells_default);
cdim[2] = parser_get_opt_param_int(params, "Scheduler:max_top_level_cells",
space_max_top_level_cells_default);
/* Initialise the gravity properties */ /* Initialise the gravity properties */
bzero(&gravity_properties, sizeof(struct gravity_props)); bzero(&gravity_properties, sizeof(struct gravity_props));
if (with_self_gravity) if (with_self_gravity)
/* NOTE: In the zoom branch s.cdim is yet to be set by this point */
gravity_props_init(&gravity_properties, params, &prog_const, &cosmo, gravity_props_init(&gravity_properties, params, &prog_const, &cosmo,
with_cosmology, with_external_gravity, with_cosmology, with_external_gravity,
with_baryon_particles, with_DM_particles, with_baryon_particles, with_DM_particles,
with_neutrinos, with_DM_background_particles, periodic, with_neutrinos, with_DM_background_particles, periodic,
s.dim, s.cdim); dim, cdim);
/* Initialize the space with these data. */ /* Initialize the space with these data. */
if (myrank == 0) clocks_gettime(&tic); if (myrank == 0) clocks_gettime(&tic);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment