Commit 3e6cbe0c authored by Matthieu Schaller's avatar Matthieu Schaller

Merge branch 'birth_struct_fix' into 'master'

Bug fix to star formation spart writting

See merge request !1058
parents e8b4adc6 cb989052
......@@ -2319,6 +2319,7 @@ void io_check_output_fields(const struct swift_params* params,
num_fields += chemistry_write_sparticles(NULL, list + num_fields);
num_fields += tracers_write_sparticles(NULL, list + num_fields,
/*with_cosmology=*/1);
num_fields += star_formation_write_sparticles(NULL, list + num_fields);
num_fields += fof_write_sparts(NULL, list + num_fields);
num_fields += velociraptor_write_sparts(NULL, list + num_fields);
break;
......@@ -2438,6 +2439,7 @@ void io_write_output_field_parameter(const char* filename) {
num_fields += chemistry_write_sparticles(NULL, list + num_fields);
num_fields += tracers_write_sparticles(NULL, list + num_fields,
/*with_cosmology=*/1);
num_fields += star_formation_write_sparticles(NULL, list + num_fields);
num_fields += fof_write_sparts(NULL, list + num_fields);
num_fields += velociraptor_write_sparts(NULL, list + num_fields);
break;
......
......@@ -1831,8 +1831,8 @@ void write_output_parallel(struct engine* e, const char* baseName,
chemistry_write_sparticles(sparts_written, list + num_fields);
num_fields += tracers_write_sparticles(
sparts_written, list + num_fields, with_cosmology);
num_fields +=
star_formation_write_sparticles(sparts, list + num_fields);
num_fields += star_formation_write_sparticles(sparts_written,
list + num_fields);
if (with_fof) {
num_fields += fof_write_sparts(sparts_written, list + num_fields);
}
......
......@@ -1438,8 +1438,8 @@ void write_output_serial(struct engine* e, const char* baseName,
chemistry_write_sparticles(sparts_written, list + num_fields);
num_fields += tracers_write_sparticles(
sparts_written, list + num_fields, with_cosmology);
num_fields +=
star_formation_write_sparticles(sparts, list + num_fields);
num_fields += star_formation_write_sparticles(sparts_written,
list + num_fields);
if (with_fof) {
num_fields +=
fof_write_sparts(sparts_written, list + num_fields);
......
......@@ -1226,8 +1226,8 @@ void write_output_single(struct engine* e, const char* baseName,
chemistry_write_sparticles(sparts_written, list + num_fields);
num_fields += tracers_write_sparticles(
sparts_written, list + num_fields, with_cosmology);
num_fields +=
star_formation_write_sparticles(sparts, list + num_fields);
num_fields += star_formation_write_sparticles(sparts_written,
list + num_fields);
if (with_fof) {
num_fields += fof_write_sparts(sparts_written, list + num_fields);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment