From d509fada76d5924f541921a603167183c5a14466 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Mon, 9 Sep 2019 14:55:03 +0100
Subject: [PATCH] cleanup
---
src/evolution/start_of_evolution.c | 1 -
src/setup/set_metallicities.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/evolution/start_of_evolution.c b/src/evolution/start_of_evolution.c
index ce3f222ee..bb7416a07 100644
--- a/src/evolution/start_of_evolution.c
+++ b/src/evolution/start_of_evolution.c
@@ -13,7 +13,6 @@ void start_of_evolution(struct stardata_t *stardata)
/*************************************/
/** set up variables and parameters **/
/*************************************/
- printf("SET MET\n");
set_metallicities(stardata);
#ifdef BSE
/* set metallicity parameters */
diff --git a/src/setup/set_metallicities.c b/src/setup/set_metallicities.c
index 336195a5a..a749ae1bc 100644
--- a/src/setup/set_metallicities.c
+++ b/src/setup/set_metallicities.c
@@ -10,13 +10,13 @@ void set_metallicities(struct stardata_t * RESTRICT const stardata)
* If the effective or nucsyn metallicity are < 0,
* set it to the metallicity
*/
- if(stardata->common.effective_metallicity < -TINY)
+ if(Negative_nonzero(stardata->common.effective_metallicity))
{
stardata->common.effective_metallicity =
stardata->common.metallicity;
}
#ifdef NUCSYN
- if(stardata->common.nucsyn_metallicity < -TINY)
+ if(Negative_nonzero(stardata->common.nucsyn_metallicity))
{
stardata->common.nucsyn_metallicity =
stardata->common.metallicity;
--
GitLab