From cf032f6fa9d770e3b511eabcd70eea1416a5e895 Mon Sep 17 00:00:00 2001 From: Folkert Nobels <nobels@strw.leidenuniv.nl> Date: Wed, 1 May 2019 11:50:39 +0200 Subject: [PATCH] Code formatting --- src/runner.c | 12 ++++++------ src/star_formation/EAGLE/star_formation.h | 9 ++++----- src/stars/EAGLE/stars_io.h | 5 +++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/runner.c b/src/runner.c index 764e6bdadc..8d2dbb76b3 100644 --- a/src/runner.c +++ b/src/runner.c @@ -735,8 +735,8 @@ void runner_do_star_formation(struct runner *r, struct cell *c, int timer) { /* Copy the properties of the gas particle to the star particle */ star_formation_copy_properties(p, xp, sp, e, sf_props, cosmo, - with_cosmology, phys_const, hydro_props, - us, cooling); + with_cosmology, phys_const, + hydro_props, us, cooling); /* Update the Star formation history */ star_formation_logger_log_new_spart(sp, &c->stars.sfh); @@ -1655,10 +1655,10 @@ void runner_do_ghost(struct runner *r, struct cell *c, int timer) { if (((p->h >= hydro_h_max) && (f < 0.f)) || ((p->h <= hydro_h_min) && (f > 0.f))) { - /* We have a particle whose smoothing length is already set (wants - * to be larger but has already hit the maximum OR wants to be - * smaller but has already reached the minimum). So, just tidy up as - * if the smoothing length had converged correctly */ + /* We have a particle whose smoothing length is already set (wants + * to be larger but has already hit the maximum OR wants to be + * smaller but has already reached the minimum). So, just tidy up as + * if the smoothing length had converged correctly */ #ifdef EXTRA_HYDRO_LOOP diff --git a/src/star_formation/EAGLE/star_formation.h b/src/star_formation/EAGLE/star_formation.h index fee1c82db7..4d1013c0f6 100644 --- a/src/star_formation/EAGLE/star_formation.h +++ b/src/star_formation/EAGLE/star_formation.h @@ -244,10 +244,9 @@ INLINE static int star_formation_is_star_forming( /* Calculate the entropy of the particle */ const double entropy = hydro_get_physical_entropy(p, xp, cosmo); - + /* Calculate the entropy EOS of the particle */ - const double entropy_eos = - entropy_floor(p, cosmo, entropy_floor_props); + const double entropy_eos = entropy_floor(p, cosmo, entropy_floor_props); /* Check the Scahye & Dalla Vecchia 2012 EOS-based temperature critrion */ return (entropy < @@ -410,8 +409,8 @@ INLINE static void star_formation_copy_properties( sp->birth_density = hydro_get_physical_density(p, cosmo); /* Store the birth temperature in the star particle */ - sp->birth_temperature = cooling_get_temperature(phys_const, hydro_props, - us, cosmo, cooling, p, xp); + sp->birth_temperature = cooling_get_temperature(phys_const, hydro_props, us, + cosmo, cooling, p, xp); /* Flag that this particle has not done feedback yet */ sp->f_E = -1.f; diff --git a/src/stars/EAGLE/stars_io.h b/src/stars/EAGLE/stars_io.h index 955a1d906b..0c03bee300 100644 --- a/src/stars/EAGLE/stars_io.h +++ b/src/stars/EAGLE/stars_io.h @@ -85,8 +85,9 @@ INLINE static void stars_write_particles(const struct spart *sparts, birth_time); list[8] = io_make_output_field("FeedbackEnergyFraction", FLOAT, 1, UNIT_CONV_NO_UNITS, sparts, f_E); - list[9] = io_make_output_field("BirthTemperature", FLOAT, 1, - UNIT_CONV_TEMPERATURE, sparts, birth_temperature); + list[9] = + io_make_output_field("BirthTemperature", FLOAT, 1, UNIT_CONV_TEMPERATURE, + sparts, birth_temperature); } /** -- GitLab