From 83f4a0fa42f9bde5c3f0c46b0ff664d27b181286 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Wed, 4 Dec 2019 14:53:08 +0000
Subject: [PATCH] for BINT : put nucsyn_metallicity outside NUCSYN
update CHANGES for binary_c_help
---
CHANGES | 4 ++++
src/binary_c_debug.h | 10 +++++-----
src/binary_c_structures.h | 3 ++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/CHANGES b/CHANGES
index c9883caff..c8e28d2f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+V2.1.6
+
+Add binary_c_help API function (for David).
+
V2.1.5
Updates to the meson build to make it more efficient and work on more platforms.
diff --git a/src/binary_c_debug.h b/src/binary_c_debug.h
index 4a417bf35..02e528c9d 100644
--- a/src/binary_c_debug.h
+++ b/src/binary_c_debug.h
@@ -100,11 +100,11 @@
* this is not shown.
*/
-#define Debug_show_expression " #=%ld Jorb=%g a=%g P=%g omegaorb=%g ",\
- (long int)stardata->model.model_number, \
- stardata->common.orbit.angular_momentum, \
- stardata->common.orbit.separation,\
- stardata->common.orbit.period,\
+#define Debug_show_expression " #=%ld Jorb=%g a=%g P=%g omegaorb=%g ", \
+ (long int)stardata->model.model_number, \
+ stardata->common.orbit.angular_momentum, \
+ stardata->common.orbit.separation, \
+ stardata->common.orbit.period, \
stardata->common.orbit.angular_frequency
//#undef Debug_show_expression
diff --git a/src/binary_c_structures.h b/src/binary_c_structures.h
index 1f01472ea..e3a74e2aa 100644
--- a/src/binary_c_structures.h
+++ b/src/binary_c_structures.h
@@ -1846,8 +1846,9 @@ struct common_t {
#endif//ADAPTIVE_RLOF
double monte_carlo_kick_normfac;
-#ifdef NUCSYN
Abundance nucsyn_metallicity; // Z to pass to SNe routines for GCE
+#ifdef NUCSYN
+
#ifdef LOG_BARIUM_STARS
double barium_prevt;
--
GitLab