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

Fixed conflict due to merge

parent 0bd546eb
Branches
No related tags found
No related merge requests found
......@@ -1358,7 +1358,6 @@ int main(int argc, char *argv[]) {
/* Initialize the space with these data. */
if (myrank == 0) clocks_gettime(&tic);
<<<<<<< HEAD:examples/main.c
space_init(&s, params, &cosmo, dim, &hydro_properties, &gravity_properties,
parts, gparts, sinks, sparts, bparts, Ngas, Ngpart, Nsink,
Nspart, Nbpart, Nnupart, periodic, replicate, remap_ids,
......@@ -1367,15 +1366,6 @@ int main(int argc, char *argv[]) {
with_DM_background_particles,
with_neutrinos, talking, dry_run, nr_nodes);
=======
space_init(&s, params, &cosmo, dim, &hydro_properties, parts, gparts, sinks,
sparts, bparts, Ngas, Ngpart, Nsink, Nspart, Nbpart, Nnupart,
periodic, replicate, remap_ids, generate_gas_in_ics, with_hydro,
with_self_gravity, with_star_formation, with_sinks,
with_DM_particles, with_DM_background_particles, with_neutrinos,
talking, dry_run, nr_nodes);
>>>>>>> master:swift.c
/* Initialise the line of sight properties. */
if (with_line_of_sight) los_init(s.dim, &los_properties, params);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment