From 91b56f3b722e6ce6a152495c8dfdfb48b6c01ca2 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <schaller@strw.leidenuniv.nl>
Date: Tue, 9 Oct 2018 14:24:42 +0200
Subject: [PATCH] Applied code formatting tool.
---
src/const.h | 4 ++--
src/hydro/Default/hydro_iact.h | 4 ++--
src/hydro/Gadget2/hydro_iact.h | 12 ++++++------
src/hydro/Planetary/hydro.h | 4 ++--
src/hydro/Planetary/hydro_iact.h | 2 +-
src/hydro/Planetary/hydro_io.h | 2 +-
src/hydro/Planetary/hydro_part.h | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/const.h b/src/const.h
index bff000ecba..821e671ac4 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 cbe650d726..72808874c3 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 aeabe93a9f..05b74b6a88 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 09fd7ca88a..1001dbda8b 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 71f616311b..149ad9dda2 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 2320438888..1b84f8d6db 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 5406456ad7..a40d86a53b 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
--
GitLab