From cf2f6f277591a0f369d65a977b9124deb39550f2 Mon Sep 17 00:00:00 2001
From: Folkert Nobels <nobels@strw.leidenuniv.nl>
Date: Wed, 20 Mar 2019 09:58:46 +0100
Subject: [PATCH] Rename entropy to entropy_floor in the star_formation.h files
---
src/star_formation/EAGLE/star_formation.h | 4 ++--
src/star_formation/GEAR/star_formation.h | 2 +-
src/star_formation/none/star_formation.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/star_formation/EAGLE/star_formation.h b/src/star_formation/EAGLE/star_formation.h
index de9c39f254..92ddcc1c5e 100644
--- a/src/star_formation/EAGLE/star_formation.h
+++ b/src/star_formation/EAGLE/star_formation.h
@@ -209,7 +209,7 @@ INLINE static int star_formation_is_star_forming(
const struct hydro_props* restrict hydro_props,
const struct unit_system* restrict us,
const struct cooling_function_data* restrict cooling,
- const struct entropy_floor_properties* restrict entropy) {
+ const struct entropy_floor_properties* restrict entropy_floor) {
/* Minimal density (converted from critical density) for star formation */
const double rho_crit_times_min_over_den =
@@ -246,7 +246,7 @@ INLINE static int star_formation_is_star_forming(
us, cosmo, cooling, p, xp);
/* Temperature on the equation of state */
- const double temperature_eos = entropy_floor_temperature(p, cosmo, entropy);
+ const double temperature_eos = entropy_floor_temperature(p, cosmo, entropy_floor);
/* Check the Scahye & Dalla Vecchia 2012 EOS-based temperature critrion */
return (temperature <
diff --git a/src/star_formation/GEAR/star_formation.h b/src/star_formation/GEAR/star_formation.h
index d679cb30f9..05bb584a53 100644
--- a/src/star_formation/GEAR/star_formation.h
+++ b/src/star_formation/GEAR/star_formation.h
@@ -52,7 +52,7 @@ INLINE static int star_formation_is_star_forming(
const struct hydro_props* restrict hydro_props,
const struct unit_system* restrict us,
const struct cooling_function_data* restrict cooling,
- const struct entropy_floor_properties* restrict entropy) {
+ const struct entropy_floor_properties* restrict entropy_floor) {
return 0;
}
diff --git a/src/star_formation/none/star_formation.h b/src/star_formation/none/star_formation.h
index 62c91a521d..25c0bcee6a 100644
--- a/src/star_formation/none/star_formation.h
+++ b/src/star_formation/none/star_formation.h
@@ -55,7 +55,7 @@ INLINE static int star_formation_is_star_forming(
const struct hydro_props* restrict hydro_props,
const struct unit_system* restrict us,
const struct cooling_function_data* restrict cooling,
- const struct entropy_floor_properties* restrict entropy) {
+ const struct entropy_floor_properties* restrict entropy_floor) {
return 0;
}
--
GitLab