diff --git a/src/const.h b/src/const.h index bff000ecba735aa2ca237ccebee526e99c8853fa..821e671ac4ce61334b669f60a4785a7daf12d51d 100644 --- a/src/const.h +++ b/src/const.h @@ -21,8 +21,8 @@ #define SWIFT_CONST_H /* SPH Viscosity constants. */ -/* Cosmology defaults: a=0.8, b=3.0. Planetary defaults: a=1.5, b=4.0 - * Beta is defined as in e.g. Price (2010) Eqn (103) */ +/* Cosmology defaults: a=0.8, b=3.0. Planetary defaults: a=1.5, b=4.0 + * Beta is defined as in e.g. Price (2010) Eqn (103) */ #define const_viscosity_alpha 0.8f #define const_viscosity_beta 3.0f diff --git a/src/hydro/Default/hydro_iact.h b/src/hydro/Default/hydro_iact.h index cbe650d726c1e8cb6f877e2e514d5243c41ef8a3..72808874c3fc6b58005d0e3ad450eafea8aa4b4d 100644 --- a/src/hydro/Default/hydro_iact.h +++ b/src/hydro/Default/hydro_iact.h @@ -226,7 +226,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_force( omega_ij = min(fac_mu * dvdr, 0.f); /* Compute signal velocity */ - v_sig = pi->force.soundspeed + pj->force.soundspeed - + v_sig = pi->force.soundspeed + pj->force.soundspeed - const_viscosity_beta * omega_ij; /* Compute viscosity parameter */ @@ -336,7 +336,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force( omega_ij = min(fac_mu * dvdr, 0.f); /* Compute signal velocity */ - v_sig = pi->force.soundspeed + pj->force.soundspeed - + v_sig = pi->force.soundspeed + pj->force.soundspeed - const_viscosity_beta * omega_ij; /* Compute viscosity parameter */ diff --git a/src/hydro/Gadget2/hydro_iact.h b/src/hydro/Gadget2/hydro_iact.h index aeabe93a9f6bf2dd5742fb62634f335f31e37eb8..05b74b6a88ca49969f14965dd55fee827627c4db 100644 --- a/src/hydro/Gadget2/hydro_iact.h +++ b/src/hydro/Gadget2/hydro_iact.h @@ -741,8 +741,8 @@ runner_iact_nonsym_1_vec_force( vec_mul(ri.v, omega_ij.v)); /* This is 0 or negative */ /* Compute signal velocity */ - v_sig.v = vec_fnma(vec_set1(const_viscosity_beta), - mu_ij.v, vec_add(ci.v, cj.v)); + v_sig.v = + vec_fnma(vec_set1(const_viscosity_beta), mu_ij.v, vec_add(ci.v, cj.v)); /* Now construct the full viscosity term */ rho_ij.v = vec_mul(vec_set1(0.5f), vec_add(pirho.v, pjrho.v)); @@ -928,10 +928,10 @@ runner_iact_nonsym_2_vec_force( v_fac_mu.v, vec_mul(ri_2.v, omega_ij_2.v)); /* This is 0 or negative */ /* Compute signal velocity */ - v_sig.v = vec_fnma(vec_set1(const_viscosity_beta), - mu_ij.v, vec_add(ci.v, cj.v)); - v_sig_2.v = vec_fnma(vec_set1(const_viscosity_beta), - mu_ij_2.v, vec_add(ci.v, cj_2.v)); + v_sig.v = + vec_fnma(vec_set1(const_viscosity_beta), mu_ij.v, vec_add(ci.v, cj.v)); + v_sig_2.v = vec_fnma(vec_set1(const_viscosity_beta), mu_ij_2.v, + vec_add(ci.v, cj_2.v)); /* Now construct the full viscosity term */ rho_ij.v = vec_mul(vec_set1(0.5f), vec_add(pirho.v, pjrho.v)); diff --git a/src/hydro/Planetary/hydro.h b/src/hydro/Planetary/hydro.h index 09fd7ca88aa4f3a3ff01f1a5eed4769a58a6db0b..1001dbda8b6b80a9e1c621a724350be4ec9a55c9 100644 --- a/src/hydro/Planetary/hydro.h +++ b/src/hydro/Planetary/hydro.h @@ -26,7 +26,7 @@ * equations) with multiple materials. * * The thermal variable is the internal energy (u). Simple constant - * viscosity term with the Balsara (1995) switch (optional). + * viscosity term with the Balsara (1995) switch (optional). * No thermal conduction term is implemented. * * This corresponds to equations (43), (44), (45), (101), (103) and (104) with @@ -45,7 +45,7 @@ #include "minmax.h" /* - * Note: Define PLANETARY_SPH_NO_BALSARA to disable the Balsara (1995) switch + * Note: Define PLANETARY_SPH_NO_BALSARA to disable the Balsara (1995) switch * for the artificial viscosity and use the vanilla Monaghan (1992) instead. * i.e. compile with: make CFLAGS=-DPLANETARY_SPH_NO_BALSARA */ diff --git a/src/hydro/Planetary/hydro_iact.h b/src/hydro/Planetary/hydro_iact.h index 71f616311bf0c217555c77ed40fc584733471937..149ad9dda2c2b63cc1cdca1e55280c4c7676b8b6 100644 --- a/src/hydro/Planetary/hydro_iact.h +++ b/src/hydro/Planetary/hydro_iact.h @@ -25,7 +25,7 @@ * @brief Minimal conservative implementation of SPH (Neighbour loop equations) * * The thermal variable is the internal energy (u). Simple constant - * viscosity term with the Balsara (1995) switch (optional). + * viscosity term with the Balsara (1995) switch (optional). * No thermal conduction term is implemented. * * This corresponds to equations (43), (44), (45), (101), (103) and (104) with diff --git a/src/hydro/Planetary/hydro_io.h b/src/hydro/Planetary/hydro_io.h index 23204388887ea4b4aec3db6a9386670f5d566649..1b84f8d6db295694846ffd26a422ce158aad0c60 100644 --- a/src/hydro/Planetary/hydro_io.h +++ b/src/hydro/Planetary/hydro_io.h @@ -25,7 +25,7 @@ * @brief Minimal conservative implementation of SPH (i/o routines) * * The thermal variable is the internal energy (u). Simple constant - * viscosity term with the Balsara (1995) switch (optional). + * viscosity term with the Balsara (1995) switch (optional). * No thermal conduction term is implemented. * * This corresponds to equations (43), (44), (45), (101), (103) and (104) with diff --git a/src/hydro/Planetary/hydro_part.h b/src/hydro/Planetary/hydro_part.h index 5406456ad70c3a738ac9828fa80b765af8558cd8..a40d86a53be371f3d3f50cdb9d263732cb2bdf08 100644 --- a/src/hydro/Planetary/hydro_part.h +++ b/src/hydro/Planetary/hydro_part.h @@ -25,7 +25,7 @@ * @brief Minimal conservative implementation of SPH (Particle definition) * * The thermal variable is the internal energy (u). Simple constant - * viscosity term with the Balsara (1995) switch (optional). + * viscosity term with the Balsara (1995) switch (optional). * No thermal conduction term is implemented. * * This corresponds to equations (43), (44), (45), (101), (103) and (104) with