diff --git a/examples/main.c b/examples/main.c
index 7ca517090f96d2cd8e0f315188864695c8788d3c..605b2d330795543c0dcf4c4ca915798bd75aeb48 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -465,7 +465,7 @@ int main(int argc, char *argv[]) {
char outputFieldsFileName[200];
parser_get_param_string(params, "Snapshots:FieldsFilename",
- outputFieldsFileName);
+ outputFieldsFileName);
if (myrank == 0) {
message("Reading runtime output fields from file '%s'",
outputFieldsFileName);
diff --git a/src/chemistry/EAGLE/chemistry_io.h b/src/chemistry/EAGLE/chemistry_io.h
index efef6b07a97f43a1f96165b37c856196122a1dc8..aab8ec240207a47289e35a711af8b245bf2b40fa 100644
--- a/src/chemistry/EAGLE/chemistry_io.h
+++ b/src/chemistry/EAGLE/chemistry_io.h
@@ -49,49 +49,48 @@ int chemistry_write_particles(const struct part* parts, struct io_props* list) {
/* List what we want to write */
list[0] = io_make_output_field("ElementAbundance", FLOAT,
chemistry_element_count, UNIT_CONV_NO_UNITS,
- parts, chemistry_data.metal_mass_fraction, 1);
+ parts, chemistry_data.metal_mass_fraction);
- list[1] =
- io_make_output_field("SmoothedElementAbundance", FLOAT,
- chemistry_element_count, UNIT_CONV_NO_UNITS, parts,
- chemistry_data.smoothed_metal_mass_fraction, 1);
+ list[1] = io_make_output_field(
+ "SmoothedElementAbundance", FLOAT, chemistry_element_count,
+ UNIT_CONV_NO_UNITS, parts, chemistry_data.smoothed_metal_mass_fraction);
list[2] =
io_make_output_field("Metallicity", FLOAT, 1, UNIT_CONV_NO_UNITS, parts,
- chemistry_data.metal_mass_fraction_total, 1);
+ chemistry_data.metal_mass_fraction_total);
list[3] = io_make_output_field(
"SmoothedMetallicity", FLOAT, 1, UNIT_CONV_NO_UNITS, parts,
- chemistry_data.smoothed_metal_mass_fraction_total, 1);
+ chemistry_data.smoothed_metal_mass_fraction_total);
list[4] = io_make_output_field("TotalMassFromSNIa", FLOAT, 1, UNIT_CONV_MASS,
- parts, chemistry_data.mass_from_SNIa, 1);
+ parts, chemistry_data.mass_from_SNIa);
- list[5] = io_make_output_field(
- "MetalMassFracFromSNIa", FLOAT, 1, UNIT_CONV_NO_UNITS, parts,
- chemistry_data.metal_mass_fraction_from_SNIa, 1);
+ list[5] = io_make_output_field("MetalMassFracFromSNIa", FLOAT, 1,
+ UNIT_CONV_NO_UNITS, parts,
+ chemistry_data.metal_mass_fraction_from_SNIa);
list[6] = io_make_output_field("TotalMassFromAGB", FLOAT, 1, UNIT_CONV_MASS,
- parts, chemistry_data.mass_from_AGB, 1);
+ parts, chemistry_data.mass_from_AGB);
- list[7] = io_make_output_field(
- "MetalMassFracFromAGB", FLOAT, 1, UNIT_CONV_NO_UNITS, parts,
- chemistry_data.metal_mass_fraction_from_AGB, 1);
+ list[7] =
+ io_make_output_field("MetalMassFracFromAGB", FLOAT, 1, UNIT_CONV_NO_UNITS,
+ parts, chemistry_data.metal_mass_fraction_from_AGB);
list[8] = io_make_output_field("TotalMassFromSNII", FLOAT, 1, UNIT_CONV_MASS,
- parts, chemistry_data.mass_from_SNII, 1);
+ parts, chemistry_data.mass_from_SNII);
- list[9] = io_make_output_field(
- "MetalMassFracFromSNII", FLOAT, 1, UNIT_CONV_NO_UNITS, parts,
- chemistry_data.metal_mass_fraction_from_SNII, 1);
+ list[9] = io_make_output_field("MetalMassFracFromSNII", FLOAT, 1,
+ UNIT_CONV_NO_UNITS, parts,
+ chemistry_data.metal_mass_fraction_from_SNII);
- list[10] = io_make_output_field(
- "IronMassFracFromSNIa", FLOAT, 1, UNIT_CONV_NO_UNITS, parts,
- chemistry_data.iron_mass_fraction_from_SNIa, 1);
+ list[10] =
+ io_make_output_field("IronMassFracFromSNIa", FLOAT, 1, UNIT_CONV_NO_UNITS,
+ parts, chemistry_data.iron_mass_fraction_from_SNIa);
list[11] = io_make_output_field(
"SmoothedIronMassFracFromSNIa", FLOAT, 1, UNIT_CONV_NO_UNITS, parts,
- chemistry_data.smoothed_iron_mass_fraction_from_SNIa, 1);
+ chemistry_data.smoothed_iron_mass_fraction_from_SNIa);
return 12;
}
diff --git a/src/chemistry/GEAR/chemistry_io.h b/src/chemistry/GEAR/chemistry_io.h
index e1e444cb454d346cac71fb5608251ddec565edb3..bee29dd3b12afe1b08edeb64248e6ec586a3751f 100644
--- a/src/chemistry/GEAR/chemistry_io.h
+++ b/src/chemistry/GEAR/chemistry_io.h
@@ -82,7 +82,7 @@ __attribute__((always_inline)) INLINE static int chemistry_write_particles(
list[2] = io_make_output_field("ElementAbundance", FLOAT,
chemistry_element_count, UNIT_CONV_NO_UNITS,
- parts, chemistry_data.metal_mass_fraction, 1);
+ parts, chemistry_data.metal_mass_fraction);
return 3;
}
diff --git a/src/common_io.c b/src/common_io.c
index f2c60e033ce99435e7f5d31ea8c30b5eae4bc4ef..2051d682e8ee9df6ed627b21d21fd58ca8ae7cc5 100644
--- a/src/common_io.c
+++ b/src/common_io.c
@@ -815,8 +815,8 @@ void io_collect_dm_gparts(const struct gpart* const gparts, size_t Ntot,
*
* @param e The #engine
*/
-void io_check_output_fields(const struct swift_params *output_fields,
- const struct engine *e) {
+void io_check_output_fields(const struct swift_params* output_fields,
+ const struct engine* e) {
if (output_fields->paramCount == 0)
error("You need to provide an output field in %s", output_fields->fileName);
@@ -837,7 +837,6 @@ void io_check_output_fields(const struct swift_params *output_fields,
long long N_total[swift_type_count] = {
(long long)Ngas, (long long)Ndm, 0, 0, (long long)Nstars, 0};
-
/* get all the possible outputs */
for (int ptype = 0; ptype < swift_type_count; ptype++) {
int num_fields = 0;
@@ -849,46 +848,43 @@ void io_check_output_fields(const struct swift_params *output_fields,
/* Write particle fields from the particle structure */
switch (ptype) {
- case swift_type_gas:
- hydro_write_particles(parts, xparts, list, &num_fields);
- num_fields += chemistry_write_particles(parts, list + num_fields);
- break;
+ case swift_type_gas:
+ hydro_write_particles(parts, xparts, list, &num_fields);
+ num_fields += chemistry_write_particles(parts, list + num_fields);
+ break;
- case swift_type_dark_matter:
- darkmatter_write_particles(gparts, list, &num_fields);
- break;
+ case swift_type_dark_matter:
+ darkmatter_write_particles(gparts, list, &num_fields);
+ break;
- case swift_type_star:
- star_write_particles(sparts, list, &num_fields);
- break;
+ case swift_type_star:
+ star_write_particles(sparts, list, &num_fields);
+ break;
- default:
- error("Particle Type %d not yet supported. Aborting", ptype);
- }
+ default:
+ error("Particle Type %d not yet supported. Aborting", ptype);
+ }
/* loop over each parameter */
for (int param_id = 0; param_id < output_fields->paramCount; param_id++) {
- const char *param_name = output_fields->data[param_id].name;
-
+ const char* param_name = output_fields->data[param_id].name;
+
/* skip if wrong part type */
char section_name[200];
sprintf(section_name, "PartType%i", ptype);
- if (strstr(param_name, section_name) == NULL)
- continue;
+ if (strstr(param_name, section_name) == NULL) continue;
int found = 0;
-
+
/* loop over each possible output field */
for (int field_id = 0; field_id < num_fields; field_id++) {
- char field_name[256];
- sprintf(field_name, "PartType%i:%s", ptype, list[field_id].name);
- if (strcmp(param_name, field_name) == 0) {
- found = 1;
- continue;
- }
+ char field_name[256];
+ sprintf(field_name, "PartType%i:%s", ptype, list[field_id].name);
+ if (strcmp(param_name, field_name) == 0) {
+ found = 1;
+ continue;
+ }
}
- if (!found)
- error("Unable to find field corresponding to %s", param_name);
+ if (!found) error("Unable to find field corresponding to %s", param_name);
}
}
-
}
diff --git a/src/common_io.h b/src/common_io.h
index 0aba3be1e0fa6ba5ccacd836917905bedf5b4e36..fd8434b09ab23f9ca7de87853ddf3d8b4f7d4b00 100644
--- a/src/common_io.h
+++ b/src/common_io.h
@@ -100,7 +100,7 @@ void io_duplicate_star_gparts(struct threadpool* tp, struct spart* const sparts,
struct gpart* const gparts, size_t Nstars,
size_t Ndm);
-void io_check_output_fields(const struct swift_params *output_fields,
- const struct engine *e);
+void io_check_output_fields(const struct swift_params* output_fields,
+ const struct engine* e);
#endif /* SWIFT_COMMON_IO_H */
diff --git a/src/gravity/Default/gravity_io.h b/src/gravity/Default/gravity_io.h
index d69310f2fc5e8d689659ffedaaea855a4731a11e..b1cddae1a297568ad5dbbab15b315dbdd28ca889 100644
--- a/src/gravity/Default/gravity_io.h
+++ b/src/gravity/Default/gravity_io.h
@@ -111,9 +111,8 @@ __attribute__((always_inline)) INLINE static void darkmatter_write_particles(
"Velocities", FLOAT, 3, UNIT_CONV_SPEED, gparts, convert_gpart_vel);
list[2] =
io_make_output_field("Masses", FLOAT, 1, UNIT_CONV_MASS, gparts, mass);
- list[3] =
- io_make_output_field("ParticleIDs", ULONGLONG, 1, UNIT_CONV_NO_UNITS,
- gparts, id_or_neg_offset);
+ list[3] = io_make_output_field("ParticleIDs", ULONGLONG, 1,
+ UNIT_CONV_NO_UNITS, gparts, id_or_neg_offset);
list[4] = io_make_output_field("Potential", FLOAT, 1, UNIT_CONV_POTENTIAL,
gparts, potential);
}
diff --git a/src/hydro/Default/hydro_io.h b/src/hydro/Default/hydro_io.h
index 490f9f47f62f3c56604d0adb94c15c520c484d47..c7a0953eba5e5c713caa4f01cb9e8bd20f6b065f 100644
--- a/src/hydro/Default/hydro_io.h
+++ b/src/hydro/Default/hydro_io.h
@@ -128,9 +128,8 @@ void hydro_write_particles(const struct part* parts, const struct xpart* xparts,
list[0] = io_make_output_field_convert_part("Coordinates", DOUBLE, 3,
UNIT_CONV_LENGTH, parts, xparts,
convert_part_pos);
- list[1] =
- io_make_output_field_convert_part("Velocities", FLOAT, 3, UNIT_CONV_SPEED,
- parts, xparts, convert_part_vel);
+ list[1] = io_make_output_field_convert_part(
+ "Velocities", FLOAT, 3, UNIT_CONV_SPEED, parts, xparts, convert_part_vel);
list[2] =
io_make_output_field("Masses", FLOAT, 1, UNIT_CONV_MASS, parts, mass);
list[3] = io_make_output_field("SmoothingLength", FLOAT, 1, UNIT_CONV_LENGTH,
@@ -139,11 +138,11 @@ void hydro_write_particles(const struct part* parts, const struct xpart* xparts,
UNIT_CONV_ENERGY_PER_UNIT_MASS, parts, u);
list[5] = io_make_output_field("ParticleIDs", ULONGLONG, 1,
UNIT_CONV_NO_UNITS, parts, id);
- list[6] = io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts,
- rho);
- list[7] = io_make_output_field_convert_part(
- "Potential", FLOAT, 1, UNIT_CONV_POTENTIAL, parts, xparts,
- convert_part_potential);
+ list[6] =
+ io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts, rho);
+ list[7] = io_make_output_field_convert_part("Potential", FLOAT, 1,
+ UNIT_CONV_POTENTIAL, parts,
+ xparts, convert_part_potential);
}
/**
diff --git a/src/hydro/Gadget2/hydro_io.h b/src/hydro/Gadget2/hydro_io.h
index 3ed358ebb17bbb026bd2b8249755d1c76a023c0c..dab03600a8732258e31776296995202550b5f5ad 100644
--- a/src/hydro/Gadget2/hydro_io.h
+++ b/src/hydro/Gadget2/hydro_io.h
@@ -56,22 +56,22 @@ __attribute__((always_inline)) INLINE static void hydro_read_particles(
}
__attribute__((always_inline)) INLINE static void convert_part_u(
- const struct engine* e, const struct part* p,
- const struct xpart* xp, float* ret) {
+ const struct engine* e, const struct part* p, const struct xpart* xp,
+ float* ret) {
ret[0] = hydro_get_comoving_internal_energy(p);
}
__attribute__((always_inline)) INLINE static void convert_part_P(
- const struct engine* e, const struct part* p,
- const struct xpart* xp, float* ret) {
+ const struct engine* e, const struct part* p, const struct xpart* xp,
+ float* ret) {
ret[0] = hydro_get_comoving_pressure(p);
}
__attribute__((always_inline)) INLINE static void convert_part_pos(
- const struct engine* e, const struct part* p,
- const struct xpart* xp, double* ret) {
+ const struct engine* e, const struct part* p, const struct xpart* xp,
+ double* ret) {
if (e->s->periodic) {
ret[0] = box_wrap(p->x[0], 0.0, e->s->dim[0]);
@@ -85,8 +85,8 @@ __attribute__((always_inline)) INLINE static void convert_part_pos(
}
__attribute__((always_inline)) INLINE static void convert_part_vel(
- const struct engine* e, const struct part* p,
- const struct xpart* xp, float* ret) {
+ const struct engine* e, const struct part* p, const struct xpart* xp,
+ float* ret) {
const int with_cosmology = (e->policy & engine_policy_cosmology);
const struct cosmology* cosmo = e->cosmology;
@@ -120,8 +120,8 @@ __attribute__((always_inline)) INLINE static void convert_part_vel(
}
__attribute__((always_inline)) INLINE static void convert_part_potential(
- const struct engine* e, const struct part* p,
- const struct xpart* xp, float* ret) {
+ const struct engine* e, const struct part* p, const struct xpart* xp,
+ float* ret) {
if (p->gpart != NULL)
ret[0] = gravity_get_comoving_potential(p->gpart);
@@ -137,8 +137,8 @@ __attribute__((always_inline)) INLINE static void convert_part_potential(
* @param num_fields The number of i/o fields to write.
*/
__attribute__((always_inline)) INLINE static void hydro_write_particles(
- const struct part* parts, const struct xpart* xparts,
- struct io_props* list, int* num_fields) {
+ const struct part* parts, const struct xpart* xparts, struct io_props* list,
+ int* num_fields) {
*num_fields = 10;
@@ -146,9 +146,8 @@ __attribute__((always_inline)) INLINE static void hydro_write_particles(
list[0] = io_make_output_field_convert_part("Coordinates", DOUBLE, 3,
UNIT_CONV_LENGTH, parts, xparts,
convert_part_pos);
- list[1] =
- io_make_output_field_convert_part("Velocities", FLOAT, 3, UNIT_CONV_SPEED,
- parts, xparts, convert_part_vel);
+ list[1] = io_make_output_field_convert_part(
+ "Velocities", FLOAT, 3, UNIT_CONV_SPEED, parts, xparts, convert_part_vel);
list[2] =
io_make_output_field("Masses", FLOAT, 1, UNIT_CONV_MASS, parts, mass);
list[3] = io_make_output_field("SmoothingLength", FLOAT, 1, UNIT_CONV_LENGTH,
@@ -157,18 +156,17 @@ __attribute__((always_inline)) INLINE static void hydro_write_particles(
"Entropy", FLOAT, 1, UNIT_CONV_ENTROPY_PER_UNIT_MASS, parts, entropy);
list[5] = io_make_output_field("ParticleIDs", ULONGLONG, 1,
UNIT_CONV_NO_UNITS, parts, id);
- list[6] = io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts,
- rho);
+ list[6] =
+ io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts, rho);
list[7] = io_make_output_field_convert_part("InternalEnergy", FLOAT, 1,
UNIT_CONV_ENERGY_PER_UNIT_MASS,
parts, xparts, convert_part_u);
- list[8] = io_make_output_field_convert_part("Pressure", FLOAT, 1,
- UNIT_CONV_PRESSURE, parts, xparts,
- convert_part_P);
+ list[8] = io_make_output_field_convert_part(
+ "Pressure", FLOAT, 1, UNIT_CONV_PRESSURE, parts, xparts, convert_part_P);
- list[9] = io_make_output_field_convert_part(
- "Potential", FLOAT, 1, UNIT_CONV_POTENTIAL, parts, xparts,
- convert_part_potential);
+ list[9] = io_make_output_field_convert_part("Potential", FLOAT, 1,
+ UNIT_CONV_POTENTIAL, parts,
+ xparts, convert_part_potential);
#ifdef DEBUG_INTERACTIONS_SPH
@@ -193,7 +191,8 @@ __attribute__((always_inline)) INLINE static void hydro_write_particles(
* @brief Writes the current model of SPH to the file
* @param h_grpsph The HDF5 group in which to write
*/
-__attribute__((always_inline)) INLINE static void hydro_write_flavour(hid_t h_grpsph) {
+__attribute__((always_inline)) INLINE static void hydro_write_flavour(
+ hid_t h_grpsph) {
/* Viscosity and thermal conduction */
io_write_attribute_s(h_grpsph, "Thermal Conductivity Model",
diff --git a/src/hydro/GizmoMFM/hydro_io.h b/src/hydro/GizmoMFM/hydro_io.h
index f12a6e08cac31e220d314545097616e3755bbc3f..94127b3fa954446e8d8de804430ca7319ff35381 100644
--- a/src/hydro/GizmoMFM/hydro_io.h
+++ b/src/hydro/GizmoMFM/hydro_io.h
@@ -185,9 +185,8 @@ void hydro_write_particles(const struct part* parts, const struct xpart* xparts,
list[0] = io_make_output_field_convert_part("Coordinates", DOUBLE, 3,
UNIT_CONV_LENGTH, parts, xparts,
convert_part_pos);
- list[1] =
- io_make_output_field_convert_part("Velocities", FLOAT, 3, UNIT_CONV_SPEED,
- parts, xparts, convert_part_vel);
+ list[1] = io_make_output_field_convert_part(
+ "Velocities", FLOAT, 3, UNIT_CONV_SPEED, parts, xparts, convert_part_vel);
list[2] = io_make_output_field("Masses", FLOAT, 1, UNIT_CONV_MASS, parts,
conserved.mass);
@@ -207,9 +206,9 @@ void hydro_write_particles(const struct part* parts, const struct xpart* xparts,
list[9] = io_make_output_field_convert_part(
"TotEnergy", FLOAT, 1, UNIT_CONV_ENERGY, parts, xparts, convert_Etot);
- list[10] = io_make_output_field_convert_part(
- "Potential", FLOAT, 1, UNIT_CONV_POTENTIAL, parts, xparts,
- convert_part_potential);
+ list[10] = io_make_output_field_convert_part("Potential", FLOAT, 1,
+ UNIT_CONV_POTENTIAL, parts,
+ xparts, convert_part_potential);
}
/**
diff --git a/src/hydro/Minimal/hydro_io.h b/src/hydro/Minimal/hydro_io.h
index 1f3c159968f285a42c0e48999a234d02d3673c3a..846462a287ca9f90b762c55a5c0d12d88632d7ff 100644
--- a/src/hydro/Minimal/hydro_io.h
+++ b/src/hydro/Minimal/hydro_io.h
@@ -155,9 +155,8 @@ void hydro_write_particles(const struct part* parts, const struct xpart* xparts,
list[0] = io_make_output_field_convert_part("Coordinates", DOUBLE, 3,
UNIT_CONV_LENGTH, parts, xparts,
convert_part_pos);
- list[1] =
- io_make_output_field_convert_part("Velocities", FLOAT, 3, UNIT_CONV_SPEED,
- parts, xparts, convert_part_vel);
+ list[1] = io_make_output_field_convert_part(
+ "Velocities", FLOAT, 3, UNIT_CONV_SPEED, parts, xparts, convert_part_vel);
list[2] =
io_make_output_field("Masses", FLOAT, 1, UNIT_CONV_MASS, parts, mass);
list[3] = io_make_output_field("SmoothingLength", FLOAT, 1, UNIT_CONV_LENGTH,
@@ -166,17 +165,17 @@ void hydro_write_particles(const struct part* parts, const struct xpart* xparts,
UNIT_CONV_ENERGY_PER_UNIT_MASS, parts, u);
list[5] = io_make_output_field("ParticleIDs", ULONGLONG, 1,
UNIT_CONV_NO_UNITS, parts, id);
- list[6] = io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts,
- rho);
+ list[6] =
+ io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts, rho);
list[7] = io_make_output_field_convert_part("Entropy", FLOAT, 1,
UNIT_CONV_ENTROPY_PER_UNIT_MASS,
parts, xparts, convert_S);
list[8] = io_make_output_field_convert_part(
"Pressure", FLOAT, 1, UNIT_CONV_PRESSURE, parts, xparts, convert_P);
- list[9] = io_make_output_field_convert_part(
- "Potential", FLOAT, 1, UNIT_CONV_POTENTIAL, parts, xparts,
- convert_part_potential);
+ list[9] = io_make_output_field_convert_part("Potential", FLOAT, 1,
+ UNIT_CONV_POTENTIAL, parts,
+ xparts, convert_part_potential);
}
/**
diff --git a/src/hydro/PressureEntropy/hydro_io.h b/src/hydro/PressureEntropy/hydro_io.h
index 18c5c0fc3b08afa5b9b51a06a0e4f3e7e8e8ac1f..59c49c0665f22eed3ef9b68de054e04533e80daa 100644
--- a/src/hydro/PressureEntropy/hydro_io.h
+++ b/src/hydro/PressureEntropy/hydro_io.h
@@ -152,9 +152,8 @@ void hydro_write_particles(const struct part* parts, const struct xpart* xparts,
list[0] = io_make_output_field_convert_part("Coordinates", DOUBLE, 3,
UNIT_CONV_LENGTH, parts, xparts,
convert_part_pos);
- list[1] =
- io_make_output_field_convert_part("Velocities", FLOAT, 3, UNIT_CONV_SPEED,
- parts, xparts, convert_part_vel);
+ list[1] = io_make_output_field_convert_part(
+ "Velocities", FLOAT, 3, UNIT_CONV_SPEED, parts, xparts, convert_part_vel);
list[2] =
io_make_output_field("Masses", FLOAT, 1, UNIT_CONV_MASS, parts, mass);
list[3] = io_make_output_field("SmoothingLength", FLOAT, 1, UNIT_CONV_LENGTH,
@@ -163,8 +162,8 @@ void hydro_write_particles(const struct part* parts, const struct xpart* xparts,
"Entropy", FLOAT, 1, UNIT_CONV_ENTROPY_PER_UNIT_MASS, parts, entropy);
list[5] = io_make_output_field("ParticleIDs", ULONGLONG, 1,
UNIT_CONV_NO_UNITS, parts, id);
- list[6] = io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts,
- rho);
+ list[6] =
+ io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts, rho);
list[7] = io_make_output_field_convert_part("InternalEnergy", FLOAT, 1,
UNIT_CONV_ENERGY_PER_UNIT_MASS,
parts, xparts, convert_u);
@@ -172,9 +171,9 @@ void hydro_write_particles(const struct part* parts, const struct xpart* xparts,
"Pressure", FLOAT, 1, UNIT_CONV_PRESSURE, parts, xparts, convert_P);
list[9] = io_make_output_field("WeightedDensity", FLOAT, 1, UNIT_CONV_DENSITY,
parts, rho_bar);
- list[10] = io_make_output_field_convert_part(
- "Potential", FLOAT, 1, UNIT_CONV_POTENTIAL, parts, xparts,
- convert_part_potential);
+ list[10] = io_make_output_field_convert_part("Potential", FLOAT, 1,
+ UNIT_CONV_POTENTIAL, parts,
+ xparts, convert_part_potential);
}
/**
diff --git a/src/io_properties.h b/src/io_properties.h
index 565dbef33da6608ee139eade42a56967daa0e5ca..037d32338f015975489f6cbca4f7dfafac413e5f 100644
--- a/src/io_properties.h
+++ b/src/io_properties.h
@@ -97,7 +97,6 @@ struct io_props {
/* Conversion function for gpart */
conversion_func_gpart_float convert_gpart_f;
conversion_func_gpart_double convert_gpart_d;
-
};
/**
@@ -147,7 +146,7 @@ INLINE static struct io_props io_make_input_field_(
/**
* @brief Constructs an #io_props from its parameters
*/
-#define io_make_output_field(name, type, dim, units, part, field) \
+#define io_make_output_field(name, type, dim, units, part, field) \
io_make_output_field_(name, type, dim, units, (char*)(&(part[0]).field), \
sizeof(part[0]))
@@ -189,10 +188,9 @@ INLINE static struct io_props io_make_output_field_(
* @brief Constructs an #io_props (with conversion) from its parameters
*/
#define io_make_output_field_convert_part(name, type, dim, units, part, xpart, \
- convert) \
- io_make_output_field_convert_part_##type(name, type, dim, units, \
- sizeof(part[0]), part, xpart, \
- convert)
+ convert) \
+ io_make_output_field_convert_part_##type( \
+ name, type, dim, units, sizeof(part[0]), part, xpart, convert)
/**
* @brief Construct an #io_props from its parameters
@@ -277,9 +275,9 @@ INLINE static struct io_props io_make_output_field_convert_part_DOUBLE(
/**
* @brief Constructs an #io_props (with conversion) from its parameters
*/
-#define io_make_output_field_convert_gpart(name, type, dim, units, gpart, \
- convert) \
- io_make_output_field_convert_gpart_##type(name, type, dim, units, \
+#define io_make_output_field_convert_gpart(name, type, dim, units, gpart, \
+ convert) \
+ io_make_output_field_convert_gpart_##type(name, type, dim, units, \
sizeof(gpart[0]), gpart, convert)
/**
diff --git a/src/stars/Default/star_io.h b/src/stars/Default/star_io.h
index 9989130539b45daa74f94ef38301058e202ed514..2d7caacc05a837fca43d7af9ec9cd26bf331e340 100644
--- a/src/stars/Default/star_io.h
+++ b/src/stars/Default/star_io.h
@@ -61,8 +61,8 @@ __attribute__((always_inline)) INLINE static void star_write_particles(
/* List what we want to read */
list[0] = io_make_output_field("Coordinates", DOUBLE, 3, UNIT_CONV_LENGTH,
sparts, x);
- list[1] = io_make_output_field("Velocities", FLOAT, 3, UNIT_CONV_SPEED,
- sparts, v);
+ list[1] =
+ io_make_output_field("Velocities", FLOAT, 3, UNIT_CONV_SPEED, sparts, v);
list[2] =
io_make_output_field("Masses", FLOAT, 1, UNIT_CONV_MASS, sparts, mass);
list[3] = io_make_output_field("ParticleIDs", LONGLONG, 1, UNIT_CONV_NO_UNITS,