From 1840ad36d77e97c4a2dceb007c73f6b70eabef45 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Mon, 9 Sep 2019 14:52:42 +0100
Subject: [PATCH] remove purity
---
src/evolution/start_of_evolution.c | 1 +
src/nucsyn/nucsyn_parameters.h | 2 +-
src/setup/cmd_line_args.h | 2 +-
src/setup/set_metallicities.c | 2 +-
src/setup/setup_prototypes.h | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/evolution/start_of_evolution.c b/src/evolution/start_of_evolution.c
index bb7416a07..ce3f222ee 100644
--- a/src/evolution/start_of_evolution.c
+++ b/src/evolution/start_of_evolution.c
@@ -13,6 +13,7 @@ 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/nucsyn/nucsyn_parameters.h b/src/nucsyn/nucsyn_parameters.h
index c53527665..0b67abc82 100644
--- a/src/nucsyn/nucsyn_parameters.h
+++ b/src/nucsyn/nucsyn_parameters.h
@@ -740,7 +740,7 @@ undances with s-process
/* define NUCSYN_GCE to modify yield output for gce.pl
* NB this just activates other defines, and turns some off.
*/
-#define NUCSYN_GCE
+//#define NUCSYN_GCE
#ifdef NUCSYN_GCE
diff --git a/src/setup/cmd_line_args.h b/src/setup/cmd_line_args.h
index 57e03b802..7f60137c3 100644
--- a/src/setup/cmd_line_args.h
+++ b/src/setup/cmd_line_args.h
@@ -3100,7 +3100,7 @@ struct cmd_line_arg_t
{ \
ARG_SECTION_NUCSYN, \
"nucsyn_metallicity", \
- "This sets the metallicity of the nucleosynthesis algorithms, i.e. the amount (by mass) of matter which is not hydrogen or helium. Usually you'd just set this with the metallicity parameter, but if you want the nucleosynthesis to be outside the range of the stellar evolution algorithm (e.g. Z=0 or Z=0.04) then you need to use gce_metallicity. That said, it's also outside the range of some of the nucleosynthesis algorithms as well, so you have been warned!", \
+ "This sets the metallicity of the nucleosynthesis algorithms, i.e. the amount (by mass) of matter which is not hydrogen or helium. Usually you'd just set this with the metallicity parameter, but if you want the nucleosynthesis to be outside the range of the stellar evolution algorithm (e.g. Z=0 or Z=0.04) then you need to use nucsyn_metallicity. That said, it's also outside the range of some of the nucleosynthesis algorithms as well, so you have been warned!", \
ARG_FLOAT, \
"DEFAULT_TO_METALLICITY", \
NUCSYN_METALLICITY_VAR, \
diff --git a/src/setup/set_metallicities.c b/src/setup/set_metallicities.c
index 4c87562fa..336195a5a 100644
--- a/src/setup/set_metallicities.c
+++ b/src/setup/set_metallicities.c
@@ -4,7 +4,7 @@
*/
#include "../binary_c.h"
-void Pure_function set_metallicities(struct stardata_t * RESTRICT const stardata)
+void set_metallicities(struct stardata_t * RESTRICT const stardata)
{
/*
* If the effective or nucsyn metallicity are < 0,
diff --git a/src/setup/setup_prototypes.h b/src/setup/setup_prototypes.h
index c5248c1af..bd6f91391 100644
--- a/src/setup/setup_prototypes.h
+++ b/src/setup/setup_prototypes.h
@@ -91,7 +91,7 @@ void new_system(struct stardata_t ** stardata,
void set_cmd_line_macro_pairs(struct stardata_t * RESTRICT const stardata,
struct cmd_line_arg_t * const cmd_line_args2,
unsigned int arg_count);
-void Pure_function set_metallicities(struct stardata_t * RESTRICT const stardata);
+void set_metallicities(struct stardata_t * RESTRICT const stardata);
#endif /* SETUP_PROTOYPES_H */
--
GitLab