From 0787bf5afc0c9970e3b1103a1a077ef802dab371 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Fri, 18 Oct 2019 17:04:44 +0200
Subject: [PATCH] set nova timestep multiplier to 0.1
clean up the nova code : removed debugging
turned off nova logging by default
---
src/binary_c_parameters.h | 20 +-
src/binary_c_structures.h | 13 +-
...ar_mass_and_angular_momentum_derivatives.c | 23 +-
.../limit_accretion_rates.c | 24 +-
src/evolution/evolution_difflog.c | 18 +-
src/logging/log_every_timestep.c | 4 +-
src/novae/nova_event_handler.c | 42 +-
src/novae/novae_prototypes.h | 3 +-
src/setup/cmd_line_args.h | 668 +++++++++---------
src/setup/cmd_line_macros.h | 6 -
src/timestep/timestep_limits.c | 15 +-
.../timestep_set_default_multipliers.c | 2 +-
12 files changed, 406 insertions(+), 432 deletions(-)
diff --git a/src/binary_c_parameters.h b/src/binary_c_parameters.h
index ca7d451f6..634e1c7b2 100644
--- a/src/binary_c_parameters.h
+++ b/src/binary_c_parameters.h
@@ -713,21 +713,6 @@
*/
#define NOVA_RETENTION_FRACTION_DEFAULT 1e-3
-/*
- * Define TIME_RESOLVE_NOVAE to time-resolve novae to within
- * NOVAE_TIMESTEP_FACTOR of the recurrance time
- * (time between nova explosions).
- */
-#define TIME_RESOLVE_NOVAE
-//#define NOVAE_TIMESTEP_FACTOR 0.1
-
-/*
- * Define this to have individual nova explosions
- * rather than time-averaged derivatives.
- * (Experimental!)
- */
-#define INDIVIDUAL_NOVAE
-#define INDIVIDUAL_NOVAE_EVENTS
/* deprecated: accretion from nova explosions */
//#define NOVA_BACK_ACCRETION
@@ -1618,6 +1603,11 @@
//#define LOG_NOVAE
+/*
+ * testing log for individual_novae
+ */
+//#define LOG_INDIVIDUAL_NOVAE
+
/* Here you can set the angular momentum (just prior to SN?) checks */
//#define ANG_MOM_CHECKS
diff --git a/src/binary_c_structures.h b/src/binary_c_structures.h
index cf032a6f1..21057d23c 100644
--- a/src/binary_c_structures.h
+++ b/src/binary_c_structures.h
@@ -958,14 +958,12 @@ struct preferences_t {
/* Boolean parameters */
-#ifdef INDIVIDUAL_NOVAE
- Boolean individual_novae;
-#endif//INDIVIDUAL_NOVAE
#ifdef HRDIAG
Boolean hrdiag_output;
#endif//HRDIAG
+ Boolean individual_novae;
Boolean use_fixed_timestep[NUMBER_OF_FIXED_TIMESTEPS];
/* when events are better tested, this will be removed */
@@ -1056,9 +1054,7 @@ struct diffstats_t
double orbital_eccentricity;
double orbital_angular_frequency;
double novarate[NUMBER_OF_STARS],v_eq_ratio[NUMBER_OF_STARS];
-#ifdef INDIVIDUAL_NOVAE
int novastate[NUMBER_OF_STARS];
-#endif//INDIVIDUAL_NOVAE
double time;
Stellar_type stellar_type[NUMBER_OF_STARS],hybrid_HeCOWD[NUMBER_OF_STARS];
Supernova_type SN_type[NUMBER_OF_STARS];
@@ -1363,14 +1359,9 @@ struct star_t {
double interpulse_period;
double mc_1tp; /* core mass at first pulse */
double lambda_3dup;
-#ifdef TIME_RESOLVE_NOVAE
double time_prev_nova,time_next_nova,dtnova;
-#endif// TIME_RESOLVE_NOVAE
-#ifdef INDIVIDUAL_NOVAE
double dm_novaH,nova_timeout;
-#endif //INDIVIDUAL_NOVAE
-
double nova_beta,nova_faml;
#ifdef RUNAWAY_STARS
@@ -1512,9 +1503,7 @@ struct star_t {
Stellar_type stellar_type; /* stellar type */
Stellar_type detached_stellar_type; /* stellar type when detached */
Star_number starnum; // set to 0 for primary, 1 for secondary. useful for logging
-#ifdef INDIVIDUAL_NOVAE
int novastate;
-#endif //INDIVIDUAL_NOVAE
#ifdef DISCS
int ndiscs;
diff --git a/src/binary_star_functions/apply_stellar_mass_and_angular_momentum_derivatives.c b/src/binary_star_functions/apply_stellar_mass_and_angular_momentum_derivatives.c
index 04808f334..7470fc2e7 100644
--- a/src/binary_star_functions/apply_stellar_mass_and_angular_momentum_derivatives.c
+++ b/src/binary_star_functions/apply_stellar_mass_and_angular_momentum_derivatives.c
@@ -240,17 +240,18 @@ void apply_stellar_mass_and_angular_momentum_derivatives(struct stardata_t * RES
}
}
-#ifdef INDIVIDUAL_NOVAE
- /*
- * Update the surface hydrogen layer mass when we have
- * individual novae
- */
- apply_derivative(stardata,
- &star->dm_novaH,
- star->derivative,
- dt,
- DERIVATIVE_STELLAR_H_LAYER_MASS);
-#endif // INDIVIDUAL_NOVAE
+ if(stardata->preferences->individual_novae == TRUE)
+ {
+ /*
+ * Grow the surface hydrogen layer mass when we have
+ * individual novae
+ */
+ apply_derivative(stardata,
+ &star->dm_novaH,
+ star->derivative,
+ dt,
+ DERIVATIVE_STELLAR_H_LAYER_MASS);
+ }
/*
* Update the stellar type as a result of accretion:
diff --git a/src/binary_star_functions/limit_accretion_rates.c b/src/binary_star_functions/limit_accretion_rates.c
index a7c1261cd..eadbe7c99 100644
--- a/src/binary_star_functions/limit_accretion_rates.c
+++ b/src/binary_star_functions/limit_accretion_rates.c
@@ -337,8 +337,7 @@ void limit_accretion_rates(struct stardata_t * RESTRICT const stardata)
Pythag2(vrat,1.0) * geometric_accretion_fraction *
1.0 / (q*(1.0 + q)) / accretor->mass;
-#ifdef INDIVIDUAL_NOVAE
- if(stardata->preferences->individual_novae==TRUE)
+ if(stardata->preferences->individual_novae == TRUE)
{
/*
* Novae are modelled individually
@@ -367,8 +366,7 @@ void limit_accretion_rates(struct stardata_t * RESTRICT const stardata)
* Increase the surface hydrogen layer mass.
*/
accretor->derivative[DERIVATIVE_STELLAR_H_LAYER_MASS] = accretion_rate;
-
-#ifdef INDIVIDUAL_NOVAE_EVENTS
+
/*
* Check if we have sufficient mass for explosion
*/
@@ -406,7 +404,11 @@ void limit_accretion_rates(struct stardata_t * RESTRICT const stardata)
Safe_free(new_nova);
}
}
-#else
+#ifdef __DEPRECATED
+ /*
+ * The following code was for before we used
+ * the events framework for individiual novae.
+ */
/*
* Check if we have sufficient mass for explosion
@@ -469,7 +471,7 @@ void limit_accretion_rates(struct stardata_t * RESTRICT const stardata)
accretor->novastate = NOVA_STATE_TRIGGER;
}
}
-#endif // INDIVIDUAL_NOVAE_EVENTS
+#endif // __DEPRECATED (was INDIVIDUAL_NOVAE_EVENTS)
else
{
@@ -493,7 +495,6 @@ void limit_accretion_rates(struct stardata_t * RESTRICT const stardata)
}
}
else
-#endif // INDIVIDUAL_NOVAE
{
/*
@@ -545,9 +546,8 @@ void limit_accretion_rates(struct stardata_t * RESTRICT const stardata)
* helium flashes underneath which would leave to
* helium novae. These should be caught here.
*/
-#ifdef INDIVIDUAL_NOVAE
accretor->novastate = NOVA_STATE_NONE;
-#endif // INDIVIDUAL_NOVAE
+
if(accretion_rate < new_envelope_rate)
{
/*
@@ -572,18 +572,15 @@ void limit_accretion_rates(struct stardata_t * RESTRICT const stardata)
}
}
else
- {
-#ifdef INDIVIDUAL_NOVAE
+ {
/*
* No longer a compact object : cannot have novae
*/
accretor->novastate = NOVA_STATE_NONE;
-#endif // INDIVIDUAL_NOVAE
}
} // accretion rate > 0 check
else
{
-#ifdef INDIVIDUAL_NOVAE
/*
* We may have had novae, but are no longer transferring mass.
* In this case, force the NOVA_STATE_QUIESCENT to prevent
@@ -599,7 +596,6 @@ void limit_accretion_rates(struct stardata_t * RESTRICT const stardata)
{
accretor->nova = TRUE;
}
-#endif
}
}
}
diff --git a/src/evolution/evolution_difflog.c b/src/evolution/evolution_difflog.c
index a62434d91..46a6af0a9 100644
--- a/src/evolution/evolution_difflog.c
+++ b/src/evolution/evolution_difflog.c
@@ -385,9 +385,7 @@ static void set_diffstats(struct stardata_t * stardata,
now->accretion_luminosity[k] = star->accretion_luminosity;
now->luminosity[k] = star->luminosity;
now->novarate[k] = star->derivative[DERIVATIVE_STELLAR_MASS_NOVA];
-#ifdef INDIVIDUAL_NOVAE
now->novastate[k] = star->nova;
-#endif
now->v_eq_ratio[k] = star->v_eq_ratio;
now->SN_type[k] = star->SN_type;
now->artificial_accretion =
@@ -454,7 +452,7 @@ static void cf_diffstats(struct stardata_t * RESTRICT const stardata,
}
/* blue stragglers */
- Boolean blue_straggler =
+ const Boolean blue_straggler =
Boolean_(ON_MAIN_SEQUENCE(now->stellar_type[k]) &&
stardata->model.time - stardata->model.dtm > now->tms[k] &&
now->mass[k] > star->pms_mass + BLUE_STRAGGLER_ACCRETED_MASS_THRESHOLD);
@@ -475,11 +473,11 @@ static void cf_diffstats(struct stardata_t * RESTRICT const stardata,
/* novae */
if(now->sgl == FALSE)
{
-#ifdef INDIVIDUAL_NOVAE
- Boolean novae = Boolean_(now->novastate[k] != NOVA_STATE_NONE);
-#else
- Boolean novae = Boolean_(now->novarate[k] < 0.0);
-#endif
+ const Boolean novae =
+ stardata->preferences->individual_novae == TRUE ?
+ Boolean_(now->novastate[k] != NOVA_STATE_NONE) :
+ Boolean_(now->novarate[k] < 0.0);
+
if((novae == TRUE) &&
lockflags[k][LOCK_NOVAE] == FALSE)
{
@@ -496,7 +494,7 @@ static void cf_diffstats(struct stardata_t * RESTRICT const stardata,
}
/* AGB star shrinkage */
- Boolean agb = Boolean_(AGB(now->stellar_type[k]));
+ const Boolean agb = Boolean_(AGB(now->stellar_type[k]));
if(agb ==TRUE &&
lockflags[k][LOCK_shrinkAGB] == FALSE &&
AGB(prev->stellar_type[k]) &&
@@ -513,7 +511,7 @@ static void cf_diffstats(struct stardata_t * RESTRICT const stardata,
/* symbiotics (k=accretor, Other_star(k)=donor) */
{
- Boolean symb = now->sgl == TRUE ? FALSE :
+ const Boolean symb = now->sgl == TRUE ? FALSE :
Boolean_(now->accretion_luminosity[k] > 10.0 ||
now->accretion_luminosity[k] > now->luminosity[Other_star(k)]*0.01);
if(symb==TRUE &&
diff --git a/src/logging/log_every_timestep.c b/src/logging/log_every_timestep.c
index b91c49d03..dfee32b1c 100644
--- a/src/logging/log_every_timestep.c
+++ b/src/logging/log_every_timestep.c
@@ -2188,7 +2188,7 @@ void log_every_timestep(struct stardata_t * RESTRICT const stardata)
stardata->common.orbit.separation);
*/
-#ifdef INDIVIDUAL_NOVAE
+#ifdef LOG_INDIVIDUAL_NOVAE
if(WHITE_DWARF(stardata->star[0].stellar_type))
{
printf("NOVAE %20.12e %20.12e %20.12e %20.12e %20.12e %20.12e %20.12e %20.12e %20.12e %d %20.12e %20.12e %20.12e %g %g\n",
@@ -2209,7 +2209,7 @@ void log_every_timestep(struct stardata_t * RESTRICT const stardata)
stardata->star[1].dmacc
);
}
-#endif//INDIVIDUAL_NOVAE
+#endif//LOG_INDIVIDUAL_NOVAE
#ifdef UNIT_TESTS
unit_tests(stardata);
diff --git a/src/novae/nova_event_handler.c b/src/novae/nova_event_handler.c
index 8b6c9861f..a595dfce1 100644
--- a/src/novae/nova_event_handler.c
+++ b/src/novae/nova_event_handler.c
@@ -1,14 +1,20 @@
#include "../binary_c.h"
-#ifdef INDIVIDUAL_NOVAE
/*
- * Event handling function for novae
+ * Event handling function for novae: when
+ * stardata->preferences->individual_novae is TRUE this
+ * function is called to update the stars and orbit
+ * when a nova happens.
*
* When you choose individual_novae to be on, nova
* derivatives (in star->derivative and stardata->model.derivative)
- * are zero. Instead, novae are treated as instanteous events
- * here, much like a supernova would be.
+ * are zero on input to this function. We set them here so the
+ * various logging functions (which follow this function call) know what
+ * the approximate nova rates would be.
+ *
+ * Novae are treated as instanteous events here, much like
+ * a supernova would be.
*/
Event_handler_function nova_event_handler(void * const eventp,
@@ -23,7 +29,7 @@ Event_handler_function nova_event_handler(void * const eventp,
struct star_t * const donor = nova_data->donor;
struct star_t * const exploder = nova_data->accretor;
- printf("caught nova event at %20.12g : exploder = %d with H-layer mass %g, donor = %d : f = %g\n",
+ Dprint("caught nova event at %20.12g : exploder = %d with H-layer mass %g, donor = %d : f = %g\n",
stardata->model.time,
exploder->starnum,
exploder->dm_novaH,
@@ -44,13 +50,12 @@ Event_handler_function nova_event_handler(void * const eventp,
const double dm_gain = exploder->nova_beta * dm_lost;
const double dm_gain_rate = +dm_gain / stardata->model.dt;
-
/*
* Simulate a nova in the derivative
* (although this is only really useful for logging)
*/
exploder->derivative[DERIVATIVE_STELLAR_MASS_NOVA] = dm_loss_rate;
- exploder->derivative[DERIVATIVE_STELLAR_MASS_NOVA] = dm_gain_rate;
+ donor->derivative[DERIVATIVE_STELLAR_MASS_NOVA] = dm_gain_rate;
/*
* Remove material from the white dwarf:
@@ -65,7 +70,7 @@ Event_handler_function nova_event_handler(void * const eventp,
exploder->mass -= dm_lost;
exploder->novastate = NOVA_STATE_POST;
-
+#ifdef NUCSYN
/*
* calculate nova yield abundances
*/
@@ -87,7 +92,7 @@ Event_handler_function nova_event_handler(void * const eventp,
exploder->starnum,
YIELD_NOT_FINAL,
NUCSYN_SOURCE_NOVAE);
-
+#endif
/*
* Accrete some on the companion?
@@ -100,12 +105,14 @@ Event_handler_function nova_event_handler(void * const eventp,
* in the accretion layer, let it get mixed
* on the next timestep
*/
+ donor->mass += dm_gain;
+ donor->dmacc += dm_gain;
+
+#ifdef NUCSYN
nucsyn_dilute_shell(
donor->dmacc,donor->Xacc,
dm_gain,Xnova
);
- donor->mass += dm_gain;
- donor->dmacc += dm_gain;
/*
* "negative-yield" accreted material
@@ -119,6 +126,7 @@ Event_handler_function nova_event_handler(void * const eventp,
exploder->starnum,
YIELD_NOT_FINAL,
NUCSYN_SOURCE_NOVAE);
+#endif // NUCSYN
}
/*
@@ -135,8 +143,9 @@ Event_handler_function nova_event_handler(void * const eventp,
);
exploder->angular_momentum += dJstar;
stardata->common.orbit.angular_momentum += dJorb;
- fprintf(stderr,"NOVA exploder %g %g\n",dJstar,dJorb);
-
+ exploder->derivative[DERIVATIVE_STELLAR_ANGMOM_NOVA] += dJstar/stardata->model.dt;
+ stardata->model.derivative[DERIVATIVE_ORBIT_ANGMOM_NOVA] += dJorb/stardata->model.dt;
+
/*
* update stellar and orbital angular momenta
* caused by mass gained onto the donor
@@ -150,19 +159,18 @@ Event_handler_function nova_event_handler(void * const eventp,
);
donor->angular_momentum += dJstar;
stardata->common.orbit.angular_momentum += dJorb;
- fprintf(stderr,"NOVA gainer (reaccretion) %g %g\n",dJstar,dJorb);
+ stardata->model.derivative[DERIVATIVE_ORBIT_ANGMOM_NOVA] += dJorb/stardata->model.dt;
+ donor->derivative[DERIVATIVE_STELLAR_ANGMOM_NOVA] += dJstar/stardata->model.dt;
/*
* update orbit
*/
- fprintf(stderr,"sep was %20.12e .. ",stardata->common.orbit.separation);
update_orbital_variables(stardata,
&stardata->common.orbit,
&stardata->star[0],
&stardata->star[1]);
- fprintf(stderr,"now %20.12e\n",stardata->common.orbit.separation);
+
return NULL;
}
-#endif // INDIVIDUAL_NOVAE
diff --git a/src/novae/novae_prototypes.h b/src/novae/novae_prototypes.h
index d4f14ac32..f3c28af42 100644
--- a/src/novae/novae_prototypes.h
+++ b/src/novae/novae_prototypes.h
@@ -20,14 +20,13 @@ double Pure_function dwarf_nova_critical_mass_transfer_rate(struct stardata_t *
struct star_t * const donor,
struct star_t * const accretor);
-#ifdef INDIVIDUAL_NOVAE
Event_handler_function nova_event_handler(void * const eventp,
struct stardata_t * const stardata,
void * data);
+
Event_handler_function nova_erase_event_handler(void * eventp,
struct stardata_t * stardata,
void * data);
-#endif // INDIVIDUAL_NOVAE
void nova_angular_momentum_changes(
struct stardata_t * const stardata,
diff --git a/src/setup/cmd_line_args.h b/src/setup/cmd_line_args.h
index 296a6fc89..980997d4d 100644
--- a/src/setup/cmd_line_args.h
+++ b/src/setup/cmd_line_args.h
@@ -531,7 +531,7 @@ struct cmd_line_arg_t
"disc_n_monte_carlo_guesses", \
"Number of monte carlo guesses to try in the disc solver if the normal list of guesses fails (0).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
DISC_N_MONTE_CARLO_GUESSES_VAR, \
1.0 \
}, \
@@ -541,27 +541,27 @@ struct cmd_line_arg_t
"disc_log", \
"If 1, turn on the disc log. Requires DISC_LOG to be defined on build.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
DISC_LOG_VAR, \
1.0 \
}, \
\
{ \
ARG_SECTION_BINARY, \
- "disc_log2d", \
+ "disc_log2d", \
"If 1, turn on the 2d disc log. Requires DISC_LOG to be defined on build.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
DISC_LOG2D_VAR, \
1.0 \
}, \
\
{ \
ARG_SECTION_BINARY, \
- "disc_log_dt", \
+ "disc_log_dt", \
"If non-zero, only allows disc log output every disc_log_dt Myr.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
DISC_LOG_DT_VAR, \
1.0 \
}, \
@@ -581,7 +581,7 @@ struct cmd_line_arg_t
"cbdisc_eccentricity_pumping_method", \
"Select from various eccentricity-pumping methods when there is a circumbinary disc. Requires DISCS. 0 = off.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_ECCENTRICITY_PUMPING_METHOD_VAR, \
1.0 \
}, \
@@ -591,7 +591,7 @@ struct cmd_line_arg_t
"cbdisc_viscous_photoevaporation_coupling", \
"Set to 1 to turn on viscous-photoevaporation coupling in circumbinary discs. Requires DISCS. 0 = off.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_VISCOUS_PHOTOEVAPORATION_COUPLING_VAR, \
1.0 \
}, \
@@ -601,7 +601,7 @@ struct cmd_line_arg_t
"cbdisc_inner_edge_stripping_timescale", \
"Defines the timescale for mass loss from by inner edge stripping. 0 = instant, 1 = very long, 2 = viscous at Revap_in, 3 = orbital at Revap_in.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_INNER_EDGE_TIMESCALE_VAR, \
1.0 \
}, \
@@ -611,7 +611,7 @@ struct cmd_line_arg_t
"cbdisc_outer_edge_stripping_timescale", \
"Defines the timescale for mass loss from by outer edge stripping. 0 = instant, 1 = very long, 2 = viscous at Revap_in, 3 = orbital at Revap_out.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_OUTER_EDGE_TIMESCALE_VAR, \
1.0 \
}, \
@@ -621,7 +621,7 @@ struct cmd_line_arg_t
"cbdisc_viscous_L2_coupling", \
"Set to 1 to turn on viscous-L2-loss coupling in circumbinary discs. Requires DISCS. 0 = off.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_VISCOUS_L2_COUPLING_VAR, \
1.0 \
}, \
@@ -631,7 +631,7 @@ struct cmd_line_arg_t
"gravitational_radiation_model", \
"Model for gravitational radiation from the system. 0=Hurley et al 2002 (Landau and Lifshitz 1951). 1 = as 0 but only when there is no RLOF. 2 = none.", \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->gravitational_radiation_model), \
1.0 \
}, \
@@ -641,17 +641,17 @@ struct cmd_line_arg_t
"nova_irradiation_multiplier", \
"Multiplier for nova-radiative induced mass loss. (Shara+1986)", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nova_irradiation_multiplier), \
1.0 \
}, \
\
{ \
ARG_SECTION_BINARY, \
- "gravitational_radiation_modulator_J", \
+ "gravitational_radiation_modulator_J", \
"Modulator for gravitational wave radiation angular momentum loss rate (1.0).", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->gravitational_radiation_modulator_J), \
1.0 \
}, \
@@ -660,7 +660,7 @@ struct cmd_line_arg_t
"gravitational_radiation_modulator_e", \
"Modulator for gravitational wave radiation eccentricity pumping rate (1.0).", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->gravitational_radiation_modulator_e), \
1.0 \
}, \
@@ -670,18 +670,18 @@ struct cmd_line_arg_t
"nova_faml_multiplier", \
"Nova friction-induced angular momentum loss multiplier. (Shara+1986)", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nova_faml_multiplier), \
1.0 \
}, \
\
{ \
ARG_SECTION_BINARY, \
- "RLOF_angular_momentum_transfer_model", \
+ "RLOF_angular_momentum_transfer_model", \
"Choose angular momentum transfer model in RLOF. 0=BSE (with discs), 1=conservative", \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
- &(stardata->preferences->RLOF_angular_momentum_transfer_model), \
+ WTTS_USE_DEFAULT, \
+ &(stardata->preferences->RLOF_angular_momentum_transfer_model), \
1.0 \
}, \
\
@@ -690,7 +690,7 @@ struct cmd_line_arg_t
"post_SN_orbit_method", \
"Method by which the post-SN orbit is calculated. 0=BSE, 1=Tauris&Taken 1998.", \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->post_SN_orbit_method), \
1.0 \
}, \
@@ -700,7 +700,7 @@ struct cmd_line_arg_t
"evolution_splitting", \
"If True, turn on splitting of an evolutionary run if splitpoint (e.g. supernova) occurs.", \
ARG_BOOLEAN, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
EVOLUTION_SPLITTING_VAR, \
1.0 \
}, \
@@ -710,7 +710,7 @@ struct cmd_line_arg_t
"disable_events", \
"Whether to disable the new events code (defaults to False, so we use events by default)\n", \
ARG_BOOLEAN, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->disable_events), \
1.0 \
}, \
@@ -720,7 +720,7 @@ struct cmd_line_arg_t
"evolution_splitting_sn_n", \
"Number of runs to split into when a SN occurs.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
EVOLUTION_SPLITTING_SN_N_VAR, \
1.0 \
}, \
@@ -729,7 +729,7 @@ struct cmd_line_arg_t
"evolution_splitting_maxdepth", \
"Max number of splits in an evolutionary run.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
EVOLUTION_SPLITTING_MAXDEPTH_VAR, \
1.0 \
}, \
@@ -747,7 +747,7 @@ struct cmd_line_arg_t
"random_skip", \
"Skip the first <random_seed> random numbers that are generated. Usually this is 0 so they are all used.", \
ARG_LONG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->random_skip), \
1.0 \
} , \
@@ -756,7 +756,7 @@ struct cmd_line_arg_t
"idum", \
"[NB: deprecated, please use 'random_seed' instead.] Random number seed, usually a (possibly negative) integer. Useful for exactly reproducing the evolution of a system which involves a kick (which is a Monte-Carlo, i.e. pseudorandom, process)." , \
ARG_LONG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->cmd_line_random_seed), \
1.0 \
} , \
@@ -765,7 +765,7 @@ struct cmd_line_arg_t
"repeat", \
"If > 1, repeats the system as many times as required. Handy if you're using Monte-Carlo kicks and want to sample the parameter space well. Also, if you are running speed tests this is good to give a statistically more reasonable result. (See e.g. 'tbse pgo')." , \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->repeat), \
1.0 \
} , \
@@ -774,7 +774,7 @@ struct cmd_line_arg_t
"random_systems", \
"Experimental. Use this to apply random initial system parameters (masses, separations, etc.). Useful for testing only." , \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
RANDOM_SYSTEMS_VAR, \
1.0 \
} , \
@@ -783,7 +783,7 @@ struct cmd_line_arg_t
"stellar_type_1", \
"Set the stellar type of star 1, usually 1 (main sequence)", \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->initial_stellar_type1) , \
1 \
}, \
@@ -792,7 +792,7 @@ struct cmd_line_arg_t
"equation_of_state_algorithm", \
"Set the equation of state algorithm. 0 = Paczynski.", \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
EQUATION_OF_STATE_VAR, \
1 \
}, \
@@ -801,7 +801,7 @@ struct cmd_line_arg_t
"opacity_algorithm", \
"Set the opacity algorithm. 0 = Paczynski, 1 = Ferguson/Opal.", \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
OPACITY_VAR, \
1 \
}, \
@@ -819,7 +819,7 @@ struct cmd_line_arg_t
"gbwind", \
"Wind prescription for first red giant branch stars. 0=Reimers (Hurley et al 2000/2002; choose gb_reimers_eta=0.5 for their mass loss rate), 1=Schroeder+Cuntz 2005 (set gb_reimers_eta=1.0 for their mass loss rate).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->gbwind), \
1.0 \
}, \
@@ -828,7 +828,7 @@ struct cmd_line_arg_t
"mattsson_Orich_tpagbwind", \
"Experimental : turns on Mattsson's TPAGB wind when the star is oxygen rich. Requires MATTSSON_MASS_LOSS.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
MATTSSON_ORICH_TPAGBWIND_VAR, \
1.0 \
}, \
@@ -838,7 +838,7 @@ struct cmd_line_arg_t
"magnetic_braking_factor", \
"Multiplier for the magnetic braking angular momentum loss rate.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->magnetic_braking_factor), \
1.0 \
}, \
@@ -847,16 +847,16 @@ struct cmd_line_arg_t
"magnetic_braking_gamma", \
"gamma factor in Rappaport style magnetic braking expression.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->magnetic_braking_gamma), \
1.0 \
}, \
{ \
ARG_SECTION_STARS, \
- "magnetic_braking_algorithm", \
+ "magnetic_braking_algorithm", \
"Algorithm for the magnetic braking angular momentum loss rate. 0 = Hurley et al. 2002, 1 = Andronov, Pinnsonneault and Sills 2003, 2 = Barnes and Kim 2010 ", \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->magnetic_braking_algorithm), \
1.0 \
}, \
@@ -865,7 +865,7 @@ struct cmd_line_arg_t
"gb_reimers_eta", \
"First red giant branch wind multiplication factor, cf. eta in Reimers' mass loss formula. (This multiplies the 4e-13 in Reimers' formula, or the 8e-14 in Schroeder and Cuntz.)", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->gb_reimers_eta), \
1.0 \
}, \
@@ -874,7 +874,7 @@ struct cmd_line_arg_t
"gbwindfac", \
"Multiplier for the giant branch wind mass loss rate", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->gbwindfac), \
1.0 \
}, \
@@ -883,7 +883,7 @@ struct cmd_line_arg_t
"agbwindfac", \
"Multiplier for the AGB wind mass loss rate", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->agbwindfac), \
1.0 \
}, \
@@ -892,7 +892,7 @@ struct cmd_line_arg_t
"tpagbwind", \
"Wind prescription during the TPAGB. 0=Karakas 2002 (a modified Vassiliadis and Wood 1993), 1=Hurley et al 2000/2002 (Vassiliadis and Wood 1993), 2=Reimers, 3=Bloecker, 4=Van Loon, 5=Rob's C-wind (broken?), 6,7=Vassiliadis and Wood 1993 (Karakas,Hurley variants respectively) when C/O>1, 8=Mattsson", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->tpagbwind), \
1.0 \
}, \
@@ -902,7 +902,7 @@ struct cmd_line_arg_t
"vwind_multiplier", \
"Multiplier for the wind velocity as a function of the star's escape speed. In BSE (Hurley et al 2000/2002) this is 1/8=0.125. Does NOT apply on the AGB, when the Vassiliadis and Wood wind velocity is used instead.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->vwind_multiplier), \
1.0 \
}, \
@@ -911,7 +911,7 @@ struct cmd_line_arg_t
"superwind_mira_switchon", \
"In the Vassiliadis and Wood (1993) AGB wind prescription, the superwind is turned on at a given Mira period, usually 500 days. You can vary when this switch-on happens with this parameter.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->tpagb_superwind_mira_switchon), \
1.0 \
}, \
@@ -920,7 +920,7 @@ struct cmd_line_arg_t
"vw93_mira_shift", \
"In the Vassiliadis and Wood (1993) AGB wind prescription, the wind loss rate depends on the Mira period plus this offset. Requires VW93_MIRA_SHIFT.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
VW93_MIRA_SHIFT_VAR, \
1.0 \
}, \
@@ -929,7 +929,7 @@ struct cmd_line_arg_t
"vw93_multiplier", \
"In the Vassiliadis and Wood (1993) AGB wind prescription, the wind loss rate is multiplied by this factor. Requires VW93_MULTIPLIER.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
VW93_MULTIPLIER_VAR, \
1.0 \
}, \
@@ -938,7 +938,7 @@ struct cmd_line_arg_t
"tpagb_reimers_eta", \
"TPAGB Reimers wind multiplication factor, cf. eta in Reimers' mass loss formula. (This multiplies the 4e-13 in Reimers' formula, or the 8e-14 in Schroeder and Cuntz.) Note that Reimers is not the default TPAGB wind prescription. See also tpagbwind.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->tpagb_reimers_eta), \
1.0 \
}, \
@@ -948,7 +948,7 @@ struct cmd_line_arg_t
"mass_accretion_rate1", \
"Constant mass accretion rate on star 1.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->mass_accretion_rate1), \
1.0 \
}, \
@@ -958,7 +958,7 @@ struct cmd_line_arg_t
"mass_accretion_rate2", \
"Constant mass accretion rate on star 2.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->mass_accretion_rate2), \
1.0 \
}, \
@@ -968,7 +968,7 @@ struct cmd_line_arg_t
"angular_momentum_accretion_rate1", \
"Constant angular momentum accretion rate on star 1.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->angular_momentum_accretion_rate1), \
1.0 \
}, \
@@ -978,7 +978,7 @@ struct cmd_line_arg_t
"angular_momentum_accretion_rate2", \
"Constant angular momentum accretion rate on star 2.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->angular_momentum_accretion_rate2), \
1.0 \
}, \
@@ -988,7 +988,7 @@ struct cmd_line_arg_t
"angular_momentum_accretion_rate_orbit", \
"Constant angular momentum accretion rate on the orbit.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->angular_momentum_accretion_rate_orbit), \
1.0 \
}, \
@@ -998,7 +998,7 @@ struct cmd_line_arg_t
"accretion_start_time", \
"Time at which artificial accretion stars. Ignored if <0 (default is -1).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->accretion_start_time), \
1.0 \
}, \
@@ -1008,7 +1008,7 @@ struct cmd_line_arg_t
"accretion_end_time", \
"Time at which artificial accretion ends. Ignored if <0 (default is -1).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->accretion_end_time), \
1.0 \
}, \
@@ -1018,7 +1018,7 @@ struct cmd_line_arg_t
"wr_wind", \
"Massive-star (WR) wind prescription. 0 = Hurley et al 2000/2002, 1=Maeder and Meynet, 2=Nugis and Lamers, 3=John Eldridge's version of Vink's early-2000s wind (See Lynnette Dray's thesis, or John Eldridge's thesis)", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->wr_wind), \
1.0 \
}, \
@@ -1028,7 +1028,7 @@ struct cmd_line_arg_t
"wr_wind_fac", \
"Massive-star (WR) wind multiplication factor.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->wr_wind_fac), \
1.0 \
}, \
@@ -1037,7 +1037,7 @@ struct cmd_line_arg_t
"wrwindfac", \
"Massive-star (WR) wind multiplication factor. Synonymous with wr_wind_fac (which you should use instead).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->wr_wind_fac), \
1.0 \
}, \
@@ -1046,7 +1046,7 @@ struct cmd_line_arg_t
"accretion_limit_eddington_multiplier", \
"Accretion is limited by the Eddington instability, with limiting rate given by the accretion_limit_eddington_multiplier * the normal (spherically symmetric) Eddington rate. This is known in the trade as the Eddington factor, and anything greater than 1.0 potentially gives you super-Eddington accretion.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->accretion_limit_eddington_multiplier), \
1.0 \
}, \
@@ -1055,7 +1055,7 @@ struct cmd_line_arg_t
"accretion_limit_thermal_multiplier", \
"Mass transfer onto a MS, HG or CHeB star is limited by the accretor's thermal rate times this multiplier.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->accretion_limit_thermal_multiplier), \
1.0 \
}, \
@@ -1064,7 +1064,7 @@ struct cmd_line_arg_t
"accretion_limit_dynamical_multiplier", \
"Mass transfer is limited by the accretor's dynamical rate times this multiplier.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->accretion_limit_dynamical_multiplier), \
1.0 \
}, \
@@ -1073,7 +1073,7 @@ struct cmd_line_arg_t
"donor_limit_envelope_multiplier", \
"Mass transfer by RLOF is limited by this fraction of the donor's envelope mass per timestep", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->donor_limit_envelope_multiplier), \
1.0 \
}, \
@@ -1082,7 +1082,7 @@ struct cmd_line_arg_t
"donor_limit_thermal_multiplier", \
"Mass transfer by RLOF is limited by the accretor's thermal rate times this multiplier.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->donor_limit_thermal_multiplier), \
1.0 \
}, \
@@ -1091,7 +1091,7 @@ struct cmd_line_arg_t
"donor_limit_dynamical_multiplier", \
"Mass transfer by RLOF is limited by the donor's dynamical rate times this multiplier.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->donor_limit_dynamical_multiplier), \
1.0 \
}, \
@@ -1100,7 +1100,7 @@ struct cmd_line_arg_t
"Bondi_Hoyle_accretion_factor", \
"Wind accretion rate, as calculated by the Bondi-Hoyle-Littleton formula, multiplcation factor. (Used to be called 'acc2' which is now deprecated.) Hurley et al 2002 use 1.5, which is the default.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->Bondi_Hoyle_accretion_factor), \
1.0 \
}, \
@@ -1109,7 +1109,7 @@ struct cmd_line_arg_t
"BH_prescription", \
"Black hole mass prescrition: relates the mass of a newly formed black hole to its progenitor's (CO) core mass. 0=Hurley et al 2000/2002, 1=Belczynski (early 2000s).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->BH_prescription), \
1.0 \
}, \
@@ -1118,7 +1118,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_II", \
"Set the distribution of speeds applied to kick type II core collapse supernova systems. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_II]), \
1.0 \
}, \
@@ -1127,7 +1127,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_ECAP", \
"Set the distribution of speeds applied to the remnants of electron-capture supernovae. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_ECAP]), \
1.0 \
}, \
@@ -1136,7 +1136,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_NS_NS", \
"Set the distribution of speeds applied to kick neutron stars and black holes that survive a NS-NS merger. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_NS_NS]), \
1.0 \
}, \
@@ -1145,7 +1145,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_IBC", \
"Set the distribution of speeds applied to kick newly-born neutron stars and black holes after a type Ib/c core-collapse supernova. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_IBC]), \
1.0 \
}, \
@@ -1154,7 +1154,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_GRB_COLLAPSAR", \
"Set the distribution of speeds applied to kick newly-born neutron stars and black holes after a type Ib/c core-collapse supernova which is also a collapsar. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_GRB_COLLAPSAR]), \
1.0 \
}, \
@@ -1163,7 +1163,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_TZ", \
"Set the distribution of speeds applied to kick newly-born neutron stars and black holes at the death of a Thorne-Zytkow object. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_TZ]), \
1.0 \
}, \
@@ -1172,7 +1172,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_AIC_BH", \
"Set the distribution of speeds applied to kick newly-born neutron stars black holes after accretion induced collapse of a neutron star. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_AIC_BH]), \
1.0 \
}, \
@@ -1181,7 +1181,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_BH_BH", \
"Set the distribution of speeds applied to black holes formed by the merger of two black holes. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_BH_BH]), \
1.0 \
}, \
@@ -1190,7 +1190,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_BH_NS", \
"Set the distribution of speeds applied to black holes formed by the merger of a neutron star and a black holes. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_BH_NS]), \
1.0 \
}, \
@@ -1199,7 +1199,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_IA_Hybrid_HeCOWD", \
"Set the distribution of speeds applied to any survivor of a hybrid He-COWD SNIa explosion. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_IA_Hybrid_HeCOWD]), \
1.0 \
}, \
@@ -1208,7 +1208,7 @@ struct cmd_line_arg_t
"sn_kick_distribution_IA_Hybrid_HeCOWD_subluminous", \
"Set the distribution of speeds applied to any survivor of a subluminous hybrid He-COWD SNIa explosion. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_distribution[SN_IA_Hybrid_HeCOWD_subluminous]), \
1.0 \
}, \
@@ -1217,7 +1217,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_II", \
"Set the dispersion of speeds applied to kick type II core collapse supernova systems. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_II]), \
1.0 \
}, \
@@ -1226,7 +1226,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_ECAP", \
"Set the dispersion of speeds applied to the remnants of electron-capture supernovae. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_ECAP]), \
1.0 \
}, \
@@ -1235,7 +1235,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_NS_NS", \
"Set the dispersion of speeds applied to kick neutron stars and black holes that survive a NS-NS merger. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_NS_NS]), \
1.0 \
}, \
@@ -1244,7 +1244,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_IBC", \
"Set the dispersion of speeds applied to kick newly-born neutron stars and black holes after a type Ib/c core-collapse supernova. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_IBC]), \
1.0 \
}, \
@@ -1253,7 +1253,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_GRB_COLLAPSAR", \
"Set the dispersion of speeds applied to kick newly-born neutron stars and black holes after a type Ib/c core-collapse supernova which is also a collapsar. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_GRB_COLLAPSAR]), \
1.0 \
}, \
@@ -1262,7 +1262,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_TZ", \
"Set the dispersion of speeds applied to kick newly-born neutron stars and black holes at the death of a Thorne-Zytkow object. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_TZ]), \
1.0 \
}, \
@@ -1271,7 +1271,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_AIC_BH", \
"Set the dispersion of speeds applied to kick newly-born neutron stars black holes after accretion induced collapse of a neutron star. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_AIC_BH]), \
1.0 \
}, \
@@ -1280,7 +1280,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_BH_BH", \
"Set the dispersion of speeds applied to black holes formed by the merger of two black holes. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_BH_BH]), \
1.0 \
}, \
@@ -1289,7 +1289,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_BH_NS", \
"Set the dispersion of speeds applied to black holes formed by the merger of a neutron star and a black holes. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_BH_NS]), \
1.0 \
}, \
@@ -1298,7 +1298,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_IA_Hybrid_HeCOWD", \
"Set the dispersion of speeds applied to the survivor of a SNIa explosion of a hybrid He-COWD. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_IA_Hybrid_HeCOWD]), \
1.0 \
}, \
@@ -1307,7 +1307,7 @@ struct cmd_line_arg_t
"sn_kick_dispersion_IA_Hybrid_HeCOWD_subluminous", \
"Set the dispersion of speeds applied to the survivor of a subluminous SNIa explosion of a hybrid He-COWD. 0=fixed, 1=maxwellian (hurley/BSE), 2=custom function (see monte_carlo_kicks.c).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_dispersion[SN_IA_Hybrid_HeCOWD_subluminous]), \
1.0 \
}, \
@@ -1316,7 +1316,7 @@ struct cmd_line_arg_t
"sn_kick_companion_IA_He", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a Ia He supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_IA_He]), \
1.0 \
}, \
@@ -1325,7 +1325,7 @@ struct cmd_line_arg_t
"sn_kick_companion_IA_ELD", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a Ia ELD (sub-Mch) supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_IA_ELD]), \
1.0 \
}, \
@@ -1334,7 +1334,7 @@ struct cmd_line_arg_t
"sn_kick_companion_IA_CHAND", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a Ia Mch supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_IA_CHAND]), \
1.0 \
}, \
@@ -1343,7 +1343,7 @@ struct cmd_line_arg_t
"sn_kick_companion_AIC", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when an accretion induced collapse (supernova) occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_AIC]), \
1.0 \
}, \
@@ -1352,7 +1352,7 @@ struct cmd_line_arg_t
"sn_kick_companion_ECAP", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when an electron capture supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_ECAP]), \
1.0 \
}, \
@@ -1361,7 +1361,7 @@ struct cmd_line_arg_t
"sn_kick_companion_IA_He_Coal", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a Ia helium merger supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_IA_He_Coal]), \
1.0 \
}, \
@@ -1370,7 +1370,7 @@ struct cmd_line_arg_t
"sn_kick_companion_IA_CHAND_Coal", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a Ia Mch merger supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_IA_CHAND_Coal]), \
1.0 \
}, \
@@ -1379,7 +1379,7 @@ struct cmd_line_arg_t
"sn_kick_companion_NS_NS", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a neutron-star neutron-star merger. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_NS_NS]), \
1.0 \
}, \
@@ -1388,7 +1388,7 @@ struct cmd_line_arg_t
"sn_kick_companion_GRB_COLLAPSAR", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a GRB Collapsar (rapidly rotating SN Ibc) supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_GRB_COLLAPSAR]), \
1.0 \
}, \
@@ -1397,7 +1397,7 @@ struct cmd_line_arg_t
"sn_kick_companion_HeStarIa", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a He-star Ia supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_HeStarIa]), \
1.0 \
}, \
@@ -1406,7 +1406,7 @@ struct cmd_line_arg_t
"sn_kick_companion_IBC", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a type Ib/c supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_IBC]), \
1.0 \
}, \
@@ -1415,7 +1415,7 @@ struct cmd_line_arg_t
"sn_kick_companion_II", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a type II supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_II]), \
1.0 \
}, \
@@ -1424,7 +1424,7 @@ struct cmd_line_arg_t
"sn_kick_companion_IIa", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a type IIa supernova occurs. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_IIa]), \
1.0 \
}, \
@@ -1433,7 +1433,7 @@ struct cmd_line_arg_t
"sn_kick_companion_WDKICK", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a WD is kicked. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_WDKICK]), \
1.0 \
}, \
@@ -1442,7 +1442,7 @@ struct cmd_line_arg_t
"sn_kick_companion_TZ", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a Thorne-Zytkow object is formed. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_TZ]), \
1.0 \
}, \
@@ -1451,7 +1451,7 @@ struct cmd_line_arg_t
"sn_kick_companion_AIC_BH", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a neutron star collapses to a black hole. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_AIC_BH]), \
1.0 \
}, \
@@ -1460,7 +1460,7 @@ struct cmd_line_arg_t
"sn_kick_companion_BH_BH", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when two black holes merge. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_BH_BH]), \
1.0 \
}, \
@@ -1469,7 +1469,7 @@ struct cmd_line_arg_t
"sn_kick_companion_BH_NS", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the, kick on the companion when a black hole merges with a neutron star. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_BH_NS]), \
1.0 \
}, \
@@ -1478,7 +1478,7 @@ struct cmd_line_arg_t
"sn_kick_companion_IA_Hybrid_HeCOWD", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the kick on the companion, if it survives, in a hybrid He-COWD type Ia explosion. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_IA_Hybrid_HeCOWD]), \
1.0 \
}, \
@@ -1487,7 +1487,7 @@ struct cmd_line_arg_t
"sn_kick_companion_IA_Hybrid_HeCOWD_subluminous", \
"Set the speed (if >=0) of, or the algothim (if <0) used to calculate the kick on the companion, if it survives, in a subluminous hybrid He-COWD type Ia explosion. 0 = none, 1 = Liu+2015, 2 = Wheeler+ 1975.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->sn_kick_companion[SN_IA_Hybrid_HeCOWD_subluminous]), \
1.0 \
}, \
@@ -1496,7 +1496,7 @@ struct cmd_line_arg_t
"wd_sigma", \
"Set the speed at which white dwarfs are kicked when they form, in km/s. Default is zero (i.e. no kick). Requires WD_KICKS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
WD_SIGMA_VAR, \
1.0 \
}, \
@@ -1505,7 +1505,7 @@ struct cmd_line_arg_t
"wd_kick_direction", \
"Set the direction of white dwarf kicks. 0 = random, 1 = up, 2 = forward, 3 = backward, 4 = inward, 5 = outward. Requires WD_KICKS.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
WD_KICK_DIRECTION_VAR, \
1.0 \
}, \
@@ -1514,7 +1514,7 @@ struct cmd_line_arg_t
"wd_kick_when", \
"Decide when to kick a white dwarf. 0=at birth, 1=at first RLOF, 2=at given pulse number (see wd_kick_pulse_number), 3 at every pulse Requires WD_KICKS.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
WD_KICK_WHEN_VAR, \
1.0 \
}, \
@@ -1523,7 +1523,7 @@ struct cmd_line_arg_t
"wd_kick_pulse_number", \
"Apply a kick to a star at a desired pulse number on the TPAGB (i.e. pre-WD). Requires WD_KICKS.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
WD_KICK_PULSE_NUMBER_VAR, \
1.0 \
}, \
@@ -1532,7 +1532,7 @@ struct cmd_line_arg_t
"max_tpagb_core_mass", \
"Maximum mass of the core during the TPAGB. Typically around 1.38Msun.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->max_tpagb_core_mass), \
1.0 \
}, \
@@ -1541,7 +1541,7 @@ struct cmd_line_arg_t
"minimum_helium_ignition_core_mass", \
"Minimum helium core mass required to ignite helium in the case that the hydrogen envelope is stripped on the giant branch, e.g. to make an sdB or sdO star. Typically 0.4, if 0.0 then the BSE algorithm (based on the total mass) is used.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->minimum_helium_ignition_core_mass), \
1.0 \
}, \
@@ -1550,7 +1550,7 @@ struct cmd_line_arg_t
"minimum_mass_for_carbon_ignition", \
"Minimum core mass for carbon ignition. Typically around 1.6Msun.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->minimum_mass_for_carbon_ignition), \
1.0 \
}, \
@@ -1559,7 +1559,7 @@ struct cmd_line_arg_t
"minimum_mass_for_neon_ignition", \
"Minimum core mass for neon ignition. Typically around 2.85Msun.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->minimum_mass_for_neon_ignition), \
1.0 \
}, \
@@ -1568,7 +1568,7 @@ struct cmd_line_arg_t
"max_neutron_star_mass", \
"Maximum mass of a neutron star before it collapses to a black hole. Typically around 1.8Msun.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->max_neutron_star_mass), \
1.0 \
}, \
@@ -1577,7 +1577,7 @@ struct cmd_line_arg_t
"chandrasekhar_mass", \
"The Chandrasekhar mass, usually 1.44Msun", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->chandrasekhar_mass), \
1.0 \
}, \
@@ -1586,7 +1586,7 @@ struct cmd_line_arg_t
"delta_mcmin", \
"A parameter to reduce the minimum core mass for third dredge up to occur on the TPAGB. As used by Izzard and Tout (2004) to increase the amount of dredge up, hence carbon, in Magellanic cloud stars.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_DELTA_MCMIN_VAR, \
1.0 \
}, \
@@ -1595,7 +1595,7 @@ struct cmd_line_arg_t
"lambda_min", \
"A parameter to increase the efficiency of third dredge up on the TPAGB. The efficiency is lambda * lambda_mult, and setting lambda_min>0 implies that, once Mc>Mcmin (see delta_mcmin) lambda=Max(lambda(fit to Karakas), lambda_min). As used by Izzard and Tout (2004) to increase the amount of dredge up, hence carbon, in Magellanic cloud stars. See also lambda_multiplier.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_LAMBDA_MIN_VAR, \
1.0 \
}, \
@@ -1604,7 +1604,7 @@ struct cmd_line_arg_t
"lambda_multiplier", \
"A parameter to increase the efficiency of third dredge up on the TPAGB. The efficiency is lambda * lambda_mult, and setting lambda_min>0 implies that, once Mc>Mcmin (see delta_mcmin) lambda=Max(lambda(fit to Karakas), lambda_min). As used by Izzard and Tout (2004) to increase the amount of dredge up, hence carbon, in Magellanic cloud stars.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_LAMBDA_MULTIPLIER_VAR, \
1.0 \
}, \
@@ -1613,7 +1613,7 @@ struct cmd_line_arg_t
"minimum_envelope_mass_for_third_dredgeup", \
"The minimum envelope mass for third dredge up on the TPAGB. Early, solar metallicity models by Straniero et al suggested 0.5Msun is typical. However, circumstantial evidence (Izzard et al 2009) as well as newer models by Stancliffe and Karakas suggest that at low metallicity a value nearer zero is more appropriate.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_MINIMUM_ENVELOPE_MASS_FOR_THIRD_DREDGE_UP_VAR, \
1.0, \
}, \
@@ -1622,7 +1622,7 @@ struct cmd_line_arg_t
"mass_of_pmz", \
"The mass in the partial mixing zone of a TPAGB star, using the Karakas 2012 tables. Ask Carlo Abate for more details, or see the series of papers Abate et al 2012, 2013, 2014. Requires NUCSYN and USE_TABULAR_INTERSHELL_ABUNDANCES_KARAKAS_2012.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_MASS_OF_PMZ_VAR, \
1.0, \
}, \
@@ -1631,7 +1631,7 @@ struct cmd_line_arg_t
"c13_eff", \
"The \"efficiency\" of partial mixing in a TPAGB star intershell region, when using the s-process tables of Gallino, Busso, Lugaro et al. as provided by Maria Lugaro for the Izzard et al. 2009 paper. Requires NUCSYN and NUCSYN_S_PROCESS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_C13_EFF_VAR, \
1.0, \
}, \
@@ -1640,7 +1640,7 @@ struct cmd_line_arg_t
"mc13_pocket_multiplier", \
"Multiplies the mass in the partial mixing zone of a TPAGB star, when using the s-process tables of Gallino, Busso, Lugaro et al. as provided by Maria Lugaro for the Izzard et al. 2009 paper. Requires NUCSYN and NUCSYN_S_PROCESS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_MC13_POCKET_MULTIPLIER_VAR, \
1.0, \
}, \
@@ -1649,7 +1649,7 @@ struct cmd_line_arg_t
"E2_prescription", \
"Choose how to calculate the E2 structural parameter (used in tidal timescale calculations). 0=Hurley 1=Izzard (see Siess et al 2013)", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->E2_prescription), \
1.0, \
}, \
@@ -1658,7 +1658,7 @@ struct cmd_line_arg_t
"dtfac", \
"A parameter to decrease the timestep ONLY during the TPAGB phase.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_DTFAC_VAR, \
1.0 \
}, \
@@ -1667,7 +1667,7 @@ struct cmd_line_arg_t
"hbbtfac", \
"A parameter to modulate the temperature at the base of the hot-bottom burning zone in TPAGB stars. (Works only if NUCSYN is defined)", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_HBBTFAC_VAR, \
1.0, \
}, \
@@ -1676,7 +1676,7 @@ struct cmd_line_arg_t
"tidal_strength_factor", \
"A modulator for the tidal strength. If this factor > 1 then tides are stronger, i.e. tidal timescales are reduced." , \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->tidal_strength_factor), \
1.0, \
}, \
@@ -1685,7 +1685,7 @@ struct cmd_line_arg_t
"hachisu_qcrit", \
"Critical q=Maccretor/Mdonor above which Hachisu's disk wind turns on.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->hachisu_qcrit), \
1.0, \
}, \
@@ -1694,7 +1694,7 @@ struct cmd_line_arg_t
"hachisu_disk_wind", \
"Set to True to turn on Hachisu's disk wind when material accretes too fast onto a white dwarf. This helps to make more SNeIa. See also hachisu_qcrit.", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->hachisu_disk_wind), \
1.0, \
}, \
@@ -1703,7 +1703,7 @@ struct cmd_line_arg_t
"mass_accretion_for_eld", \
"The mass that must be accreted onto a COWD for it to ignite as an edge-lit detonation SNIa.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->mass_accretion_for_eld), \
1.0, \
}, \
@@ -1712,7 +1712,7 @@ struct cmd_line_arg_t
"WDWD_merger_algorithm", \
"Algorithm to be used when merging two white dwarfs. 0 = Hurley et al. (2002), 1 = Perets+ (2019), 2 = Chen+ (2016, todo) ", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->WDWD_merger_algorithm), \
1.0, \
}, \
@@ -1721,7 +1721,7 @@ struct cmd_line_arg_t
"type_Ia_MCh_supernova_algorithm", \
"Algorithm to be used when calculating type Ia yields from Chandrasekhar-mass exploders. 0 = DD7 (Iwamoto 1999), 1 = Seitenzahl 2013 3D hydro yields (you must also set Seitenzahl2013_model) ", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_TYPE_IA_MCH_SUPERNOVA_ALGORITHM_VAR, \
1.0, \
}, \
@@ -1739,7 +1739,7 @@ struct cmd_line_arg_t
"type_Ia_sub_MCh_supernova_algorithm", \
"Algorithm to be used when calculating type Ia yields from sub-Chandrasekhar-mass exploders. (Currently unused.)", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_TYPE_IA_SUB_MCH_SUPERNOVA_ALGORITHM_VAR, \
1.0, \
}, \
@@ -1748,7 +1748,7 @@ struct cmd_line_arg_t
"max_HeWD_mass", \
"The maximum mass a HeWD can have before it ignites helium (0.7).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->max_HeWD_mass), \
1.0, \
}, \
@@ -1757,17 +1757,17 @@ struct cmd_line_arg_t
"merger_angular_momentum_factor", \
"When two stars merge the resulting single star retains a fraction of the total system angular momentum (or the critical spin angular momentum, if it is smaller) multiplied by this factor.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->merger_angular_momentum_factor), \
1.0, \
}, \
{ \
ARG_SECTION_BINARY, \
- "wind_angular_momentum_loss", \
+ "wind_angular_momentum_loss", \
"Prescription for losing angular momentum in a stellar wind. 0=Hurley et al 2002 ('Tout') prescription, 1=lw i.e. a factor multiplying the specific orbital angular momentum, 2=lw hybrid for fast winds. Set wind_djorb_fac to the desired factor..", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
- &(stardata->preferences->wind_angular_momentum_loss), \
+ WTTS_USE_DEFAULT, \
+ &(stardata->preferences->wind_angular_momentum_loss), \
1.0, \
}, \
{ \
@@ -1775,7 +1775,7 @@ struct cmd_line_arg_t
"wind_djorb_fac", \
"Factor multiplying angular momentum loss in a stellar wind when wind_angular_momentum_loss=0 (the Tout/Hurley et al 2002 prescription). See wind_angular_momentum_loss.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->wind_djorb_fac), \
1.0, \
}, \
@@ -1784,7 +1784,7 @@ struct cmd_line_arg_t
"lw", \
"Factor multiplying angular momentum loss in a stellar wind when wind_angular_momentum_loss=1,2 (the 'lw' prescription). See wind_angular_momentum_loss.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->lw), \
1.0, \
}, \
@@ -1793,25 +1793,25 @@ struct cmd_line_arg_t
"yields_dt", \
"When doing yield calculations, yields are output every yields_dt Myr. Requires NUCSYN and NUCSYN_SPARSE_YIELDS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_YIELDS_DT_VAR, \
1.0, \
}, \
{ \
ARG_SECTION_OUTPUT, \
- "yields_logdt", \
+ "yields_logdt", \
"When doing yield calculations, and when logyieldtimes is set, yields are output every yields_logdt Myr. Requires NUCSYN and NUCSYN_SPARSE_YIELDS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_YIELDS_LOGDT_VAR, \
1.0, \
}, \
{ \
ARG_SECTION_OUTPUT, \
"yields_startlogtime", \
- "Start log yields at yields_startlogtime.", \
+ "Start log yields at yields_startlogtime.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_YIELDS_STARTLOGTIME_VAR, \
1.0, \
}, \
@@ -1820,7 +1820,7 @@ struct cmd_line_arg_t
"yields_logtimes", \
"When doing yield calculations, set this to output at log times rather than linear times.", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_YIELDS_LOGTIMES_VAR, \
1.0, \
}, \
@@ -1829,7 +1829,7 @@ struct cmd_line_arg_t
"reverse_time", \
"Make time go backwards. To be considered very experimental!", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
REVERSE_TIME_VAR, \
1.0, \
}, \
@@ -1838,7 +1838,7 @@ struct cmd_line_arg_t
"start_time", \
"Start time for the simulation.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->start_time), \
1.0, \
}, \
@@ -1847,7 +1847,7 @@ struct cmd_line_arg_t
"CEMP_logg_maximum", \
"Maximum logg that CEMP stars are allowed to have. See Izzard et al 2009. See also CEMP_cfe_minimum, CEMP_minimum_age.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_CEMP_LOGG_MAXIMUM_VAR, \
1.0, \
}, \
@@ -1856,7 +1856,7 @@ struct cmd_line_arg_t
"CEMP_cfe_minimum", \
"Minimum [C/Fe] that CEMP stars are required to have. See Izzard et al 2009. See also CEMP_logg_maximum, CEMP_minimum_age.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_CEMP_CFE_MINIMUM_VAR, \
1.0, \
}, \
@@ -1865,7 +1865,7 @@ struct cmd_line_arg_t
"thick_disc_start_age", \
"Lookback time for the start of the thick disc star formation, e.g. 13e3 Myr. Units = Myr.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
THICK_DISC_START_AGE, \
1.0, \
}, \
@@ -1874,7 +1874,7 @@ struct cmd_line_arg_t
"thick_disc_end_age", \
"Lookback time for the end of the thick disc star formation, e.g. 4e3 Myr. Units = Myr.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
THICK_DISC_END_AGE, \
1.0, \
}, \
@@ -1883,7 +1883,7 @@ struct cmd_line_arg_t
"thick_disc_logg_min", \
"Minimum logg for thick disc giants to be logged.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
THICK_DISC_LOGG_MIN, \
1.0, \
}, \
@@ -1892,7 +1892,7 @@ struct cmd_line_arg_t
"thick_disc_logg_max", \
"Maximum logg for thick disc giants to be logged.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
THICK_DISC_LOGG_MAX, \
1.0, \
}, \
@@ -1901,7 +1901,7 @@ struct cmd_line_arg_t
"CEMP_minimum_age", \
"Minimum age that CEMP stars are required to have. See Izzard et al 2009. See also CEMP_cfe_minimum, CEMP_logg_maximum.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_CEMP_MINIMUM_AGE_VAR, \
1.0, \
}, \
@@ -1910,7 +1910,7 @@ struct cmd_line_arg_t
"escape_velocity", \
"A parameter used in constructing galactic chemical evolution (GCE) models. If the stellar wind velocity exceeds this value, any chemical yield from the wind is ignored, i.e. assumed lost. (km/s) Requires NUCSYN_GCE_OUTFLOW_CHECKS. Default 1e9 km/s. See also escape_fraction.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_ESCAPE_VELOCITY_VAR, \
1.0, \
}, \
@@ -1919,7 +1919,7 @@ struct cmd_line_arg_t
"escape_fraction", \
"A parameter used in constructing galactic chemical evolution (GCE) models. If the stellar wind velocity exceeds this value, any chemical yield from the wind is ignored, i.e. assumed lost. (km/s) Requires NUCSYN_GCE_OUTFLOW_CHECKS. Default 0.0. See also escape_velocity.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_ESCAPE_FRACTION_VAR, \
1.0, \
}, \
@@ -1928,7 +1928,7 @@ struct cmd_line_arg_t
"pre_main_sequence", \
"Set to True to turn on pre-main sequence evolution. Currently this is not a special stellar type, rather the first (small) fraction of the main sequence has increased radii to match the Railton et al 2014 fits to Tout's pre-main sequence stars. Requires PRE_MAIN_SEQUENCE. See also pre_main_sequence_fit_lobes.", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
PRE_MAIN_SEQUENCE_VAR, \
1.0, \
}, \
@@ -1937,7 +1937,7 @@ struct cmd_line_arg_t
"pre_main_sequence_fit_lobes", \
"Set to True force a pre-main sequence star into its Roche lobe. This is done by artificially aging it. Requires PRE_MAIN_SEQUENCE", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
PRE_MAIN_SEQUENCE_FIT_LOBES_VAR, \
1.0, \
}, \
@@ -1946,7 +1946,7 @@ struct cmd_line_arg_t
"rlperi", \
"Set this to True to use the Roche lobe radius at periastron, rather than (the default to) assume a circular orbit. This will be useful one day when we treat RLOF in eccentric orbits properly, hopefully.", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->rlperi), \
1.0 \
}, \
@@ -1955,7 +1955,7 @@ struct cmd_line_arg_t
"qcrit_LMMS", \
"Apply critical q=Mdonor/Maccretor value for low-mass main sequence stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[LOW_MASS_MAIN_SEQUENCE]), \
1.0 \
}, \
@@ -1964,7 +1964,7 @@ struct cmd_line_arg_t
"qcrit_MS", \
"Apply critical q=Mdonor/Maccretor value for (non-low mass) main sequence stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[MAIN_SEQUENCE]), \
1.0 \
}, \
@@ -1973,7 +1973,7 @@ struct cmd_line_arg_t
"qcrit_HG", \
"Apply critical q=Mdonor/Maccretor value for Hertzsprung gap stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[HERTZSPRUNG_GAP]), \
1.0 \
}, \
@@ -1982,7 +1982,7 @@ struct cmd_line_arg_t
"qcrit_GB", \
"Apply critical q=Mdonor/Maccretor value for first red giant branch stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[GIANT_BRANCH]), \
1.0 \
}, \
@@ -1991,7 +1991,7 @@ struct cmd_line_arg_t
"qcrit_CHeB", \
"Apply critical q=Mdonor/Maccretor value for core helium burning stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[CHeB]), \
1.0 \
}, \
@@ -2000,7 +2000,7 @@ struct cmd_line_arg_t
"qcrit_EAGB", \
"Apply critical q=Mdonor/Maccretor value for early-AGB stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[EAGB]), \
1.0 \
}, \
@@ -2009,7 +2009,7 @@ struct cmd_line_arg_t
"qcrit_TPAGB", \
"Apply critical q=Mdonor/Maccretor value for TP-AGB stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[TPAGB]), \
1.0 \
}, \
@@ -2018,7 +2018,7 @@ struct cmd_line_arg_t
"qcrit_HeMS", \
"Apply critical q=Mdonor/Maccretor value for helium main sequence stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[HeMS]), \
1.0 \
}, \
@@ -2027,7 +2027,7 @@ struct cmd_line_arg_t
"qcrit_HeHG", \
"Apply critical q=Mdonor/Maccretor value for helium Hertzsprung gap stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[HeHG]), \
1.0 \
}, \
@@ -2036,7 +2036,7 @@ struct cmd_line_arg_t
"qcrit_HeGB", \
"Apply critical q=Mdonor/Maccretor value for helium red giant stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[HeGB]), \
1.0 \
}, \
@@ -2045,7 +2045,7 @@ struct cmd_line_arg_t
"qcrit_HeWD", \
"Apply critical q=Mdonor/Maccretor value for helium white dwarf stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[HeWD]), \
1.0 \
}, \
@@ -2054,7 +2054,7 @@ struct cmd_line_arg_t
"qcrit_COWD", \
"Apply critical q=Mdonor/Maccretor value for carbon-oxygen white dwarf stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[COWD]), \
1.0 \
}, \
@@ -2063,7 +2063,7 @@ struct cmd_line_arg_t
"qcrit_ONeWD", \
"Apply critical q=Mdonor/Maccretor value for oxygen-neon white dwarf stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[ONeWD]), \
1.0 \
}, \
@@ -2072,7 +2072,7 @@ struct cmd_line_arg_t
"qcrit_NS", \
"Apply critical q=Mdonor/Maccretor value for neutron stars to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[NEUTRON_STAR]), \
1.0 \
}, \
@@ -2081,7 +2081,7 @@ struct cmd_line_arg_t
"qcrit_BH", \
"Apply critical q=Mdonor/Maccretor value for black holes to determine the stability of Roche-lobe overflow for non-degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit[BLACK_HOLE]), \
1.0 \
}, \
@@ -2090,7 +2090,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_LMMS", \
"Apply critical q=Mdonor/Maccretor value for (low mass) main sequence stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[MAIN_SEQUENCE]), \
1.0 \
}, \
@@ -2099,7 +2099,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_MS", \
"Apply critical q=Mdonor/Maccretor value for (non-low mass) main sequence stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[MAIN_SEQUENCE]), \
1.0 \
}, \
@@ -2108,7 +2108,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_HG", \
"Apply critical q=Mdonor/Maccretor value for Hertzsprung gap stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[HERTZSPRUNG_GAP]), \
1.0 \
}, \
@@ -2117,7 +2117,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_GB", \
"Apply critical q=Mdonor/Maccretor value for first red giant branch stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[GIANT_BRANCH]), \
1.0 \
}, \
@@ -2126,7 +2126,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_CHeB", \
"Apply critical q=Mdonor/Maccretor value for core helium burning stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[CHeB]), \
1.0 \
}, \
@@ -2135,7 +2135,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_EAGB", \
"Apply critical q=Mdonor/Maccretor value for early-AGB stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[EAGB]), \
1.0 \
}, \
@@ -2144,7 +2144,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_TPAGB", \
"Apply critical q=Mdonor/Maccretor value for TP-AGB stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[TPAGB]), \
1.0 \
}, \
@@ -2153,7 +2153,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_HeMS", \
"Apply critical q=Mdonor/Maccretor value for helium main sequence stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[HeMS]), \
1.0 \
}, \
@@ -2162,7 +2162,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_HeHG", \
"Apply critical q=Mdonor/Maccretor value for helium Hertzsprung gap stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[HeHG]), \
1.0 \
}, \
@@ -2171,7 +2171,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_HeGB", \
"Apply critical q=Mdonor/Maccretor value for helium red giant stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[HeGB]), \
1.0 \
}, \
@@ -2180,7 +2180,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_HeWD", \
"Apply critical q=Mdonor/Maccretor value for helium white dwarf stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[HeWD]), \
1.0 \
}, \
@@ -2189,7 +2189,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_COWD", \
"Apply critical q=Mdonor/Maccretor value for carbon-oxygen white dwarf stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[COWD]), \
1.0 \
}, \
@@ -2198,7 +2198,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_ONeWD", \
"Apply critical q=Mdonor/Maccretor value for oxygen-neon white dwarf stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[ONeWD]), \
1.0 \
}, \
@@ -2207,7 +2207,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_NS", \
"Apply critical q=Mdonor/Maccretor value for neutron stars to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[NEUTRON_STAR]), \
1.0 \
}, \
@@ -2216,7 +2216,7 @@ struct cmd_line_arg_t
"qcrit_degenerate_BH", \
"Apply critical q=Mdonor/Maccretor value for black holes to determine the stability of Roche-lobe overflow for degenerate accretors. See also qcrits_*, qcrits_degenerate_*.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->qcrit_degenerate[BLACK_HOLE]), \
1.0 \
}, \
@@ -2225,7 +2225,7 @@ struct cmd_line_arg_t
"mass_for_Hestar_Ia_upper", \
"Only helium stars below this mass can explode as SNIa. Default is zero, i.e. it never happens. See also mass_for_Hestar_Ia_lower.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->mass_for_Hestar_Ia_upper), \
1.0, \
}, \
@@ -2234,7 +2234,7 @@ struct cmd_line_arg_t
"mass_for_Hestar_Ia_lower", \
"Only helium stars above this mass can explode as SNIa. Default is zero, i.e. it never happens. See also mass_for_Hestar_Ia_upper.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->mass_for_Hestar_Ia_lower), \
1.0, \
}, \
@@ -2244,7 +2244,7 @@ struct cmd_line_arg_t
"alphaCB", \
"Circumbinary disk viscosity parameter, alpha." , \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ALPHACB_VAR, \
1.0, \
}, \
@@ -2253,7 +2253,7 @@ struct cmd_line_arg_t
"minimum_donor_menv_for_comenv", \
"Minimum donor envelope mass for common envelope evolution to be triggered (Msun). Default 0." , \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->minimum_donor_menv_for_comenv), \
1.0, \
}, \
@@ -2262,7 +2262,7 @@ struct cmd_line_arg_t
"comenv_prescription", \
"Use this to choose which common envelope prescription you should use. 0=Hurley et al 2002 (based on the Paczyński energy model) or 1=Nelemans and Tout (angular momentum model). See also alpha_ce, comenv_ms_accretion_mass, comenv_ms_accretion_fraction, comenv_ns_accretion_fraction, comenv_ns_accretion_mass, nelemans_gamma, nelemans_minq, nelemans_max_frac_j_change, nelemans_n_comenvs, lambda_ce, lambda_ionisation.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->comenv_prescription), \
1.0 \
}, \
@@ -2271,7 +2271,7 @@ struct cmd_line_arg_t
"comenv_ejection_spin_method", \
"When a common envelope is ejected, we need to decide how fast the stars are left spinning. COMENV_EJECTION_SPIN_METHOD_DO_NOTHING (0) is the default, this just leaves the stars/stellar cores spinning with the same spin rate (omega = angular velocity) with which they entered the common envelope phase. COMENV_EJECTION_SPIN_METHOD_SYCHRONIZE instead tidally synchronizes the stars with their new orbital angular velocity.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->comenv_ejection_spin_method), \
1.0 \
}, \
@@ -2280,7 +2280,7 @@ struct cmd_line_arg_t
"comenv_merger_spin_method", \
"When a common envelope binary merges, we need to decide how fast the resulting single star is left spinning. COMENV_MERGER_SPIN_METHOD_SPECIFIC (0) is the default, this preserves angular momentum but limits the specific angular momentum of the merged star to the specific angular momentum of the system at the onset of common envelope evolution. COMENV_MERGER_SPIN_METHOD_CONSERVE_ANGMOM (1) sets the merger's angular momentum to be that of the system at the onset of common envelope evolution (which means the star may be rotating supercritically). COMENV_MERGER_SPIN_METHOD_CONSERVE_OMEGA (2) sets the spin rate (angular frequency = omega) of the merged star to be that of the orbit just at the onset of common envelope evolution.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->comenv_merger_spin_method), \
1.0 \
}, \
@@ -2289,7 +2289,7 @@ struct cmd_line_arg_t
"comenv_ms_accretion_mass", \
"Experimental. During common envelope evolution, a main sequence star may accrete some of the envelope's mass. Requires COMENV_MS_ACCRETION. See also comenv_ms_accretion_fraction.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CE_MS_ACCRETION_MASS_VAR, \
1.0 \
}, \
@@ -2298,7 +2298,7 @@ struct cmd_line_arg_t
"comenv_ms_accretion_fraction", \
"Experimental. During common envelope evolution, a main sequence may accrete a fraction of the envelope's mass. Requires COMENV_MS_ACCRETION. See also comenv_ms_accretion_mass.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CE_MS_ACCRETION_FRACTION_VAR, \
1.0 \
}, \
@@ -2307,7 +2307,7 @@ struct cmd_line_arg_t
"comenv_ns_accretion_mass", \
"Experimental. During common envelope evolution, a neutron star may accrete some of the envelope's mass. Requires COMENV_NS_ACCRETION. See also comenv_ns_accretion_fraction.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CE_NS_ACCRETION_MASS_VAR, \
1.0 \
}, \
@@ -2316,7 +2316,7 @@ struct cmd_line_arg_t
"comenv_ns_accretion_fraction", \
"Experimental. During common envelope evolution, a neutron star may accrete a fraction of the envelope's mass. Requires COMENV_NS_ACCRETION. See also comenv_ns_accretion_mass.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CE_NS_ACCRETION_FRACTION_VAR, \
1.0 \
}, \
@@ -2325,7 +2325,7 @@ struct cmd_line_arg_t
"alpha_ce", \
"Common envelope energy formalism parameter. A fraction alpha of the orbital energy is used to eject the envelope. See Hurley et al 2002 for details." , \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->alpha_ce), \
1.0, \
}, \
@@ -2334,7 +2334,7 @@ struct cmd_line_arg_t
"lambda_ce", \
"Common envelope parameter. The binding energy of the common envelope is G*M*Menv/(lambda*R). Typically this is taken to be 0.5, but if set to -1 binary_c uses the Dewi and Tauris fits instead, -2 uses the formalism of Wang, Jia and Li (2016) and if -3 then a polytropic formalism is used (see also comenv_splitmass).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->lambda_ce), \
1.0, \
}, \
@@ -2343,7 +2343,7 @@ struct cmd_line_arg_t
"comenv_splitmass", \
"When lambda_ce=-2, the envelope binding energy, lambda, is calculated using a polytropic formalism. The comenv_splitmass defines the point, in the units of the core mass, above which material is ejected.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
COMENV_SPLITMASS_VAR, \
1.0, \
}, \
@@ -2352,7 +2352,7 @@ struct cmd_line_arg_t
"nelemans_recalc_eccentricity", \
"If True, recalculate the eccentricity after angular momentum is removed. " , \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nelemans_recalc_eccentricity), \
1.0, \
}, \
@@ -2361,7 +2361,7 @@ struct cmd_line_arg_t
"comenv_post_eccentricity", \
"Eccentricity remaining after common envelope ejection." , \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->comenv_post_eccentricity), \
1.0, \
}, \
@@ -2370,7 +2370,7 @@ struct cmd_line_arg_t
"nelemans_gamma", \
"Set the fraction of the orbital specific angular momentum that is used to eject the common envelope according to the Nelemans and Tout prescription. See also nelemans_minq, nelemans_max_frac_j_change, nelemans_n_comenvs." , \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nelemans_gamma), \
1.0, \
}, \
@@ -2379,7 +2379,7 @@ struct cmd_line_arg_t
"nelemans_minq", \
"Only activate the Nelemans and Tout common envelope prescription for q>nelemans_minq. See also nelemans_gamma, nelemans_max_frac_j_change, nelemans_n_comenvs." , \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nelemans_minq), \
1.0, \
}, \
@@ -2388,7 +2388,7 @@ struct cmd_line_arg_t
"nelemans_max_frac_j_change", \
"Maximum fractional angular momentum change in the Nelemans and Tout common envelope prescription. See also nelemans_gamma, nelemans_minq, nelemans_n_comenvs." , \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nelemans_max_frac_j_change), \
1.0, \
}, \
@@ -2397,7 +2397,7 @@ struct cmd_line_arg_t
"nelemans_n_comenvs", \
"Set the maximum number of common envelope ejections allowed to follow the Nelemans and Tout prescription, after which the standard alpha prescription is used." , \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nelemans_n_comenvs), \
1.0, \
}, \
@@ -2406,7 +2406,7 @@ struct cmd_line_arg_t
"lambda_ionisation", \
"A fraction lambda_ionisation of the recombination energy in the common envelope goes into ejecting the envelope. This is usually 0.0, but a positive value can make a big difference to the outcome of common envelope evolution.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->lambda_ionisation), \
1.0, \
}, \
@@ -2415,7 +2415,7 @@ struct cmd_line_arg_t
"lambda_enthalpy", \
"A fraction of the enthalpy to be included in the common envelope evolution binding energy. Only used for the Wang 2016 prescription (so far).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->lambda_enthalpy), \
1.0, \
}, \
@@ -2424,7 +2424,7 @@ struct cmd_line_arg_t
"cbdisc_gamma", \
"Circumbinary disc gamma (equation of state) parameter. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_GAMMA_VAR, \
1.0, \
}, \
@@ -2433,7 +2433,7 @@ struct cmd_line_arg_t
"cbdisc_alpha", \
"Circumbinary disc alpha (viscosity) parameter. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_ALPHA_VAR, \
1.0, \
}, \
@@ -2442,7 +2442,7 @@ struct cmd_line_arg_t
"cbdisc_kappa", \
"Circumbinary disc kappa (opacity) parameter. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_KAPPA_VAR, \
1.0, \
}, \
@@ -2451,7 +2451,7 @@ struct cmd_line_arg_t
"cbdisc_minimum_evaporation_timescale", \
"Circumbinary disc minimum evaporation timescale (years). If (slow, not edge stripped) mass loss would evaporate the disc on a timescale less than this, simply evaporate the disc immediated. Usually set to 1y, ignore if zero. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MINIMUM_EVAPORATION_TIMESCALE_VAR, \
1.0, \
}, \
@@ -2460,7 +2460,7 @@ struct cmd_line_arg_t
"cbdisc_torquef", \
"Circumbinary disc binary torque multiplier. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_TORQUEF_VAR, \
1.0, \
}, \
@@ -2469,25 +2469,25 @@ struct cmd_line_arg_t
"cbdisc_max_lifetime", \
"Circumbinary disc maximum lifetime (years, ignored if 0). Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
- CBDISC_MAX_LIFETIME_VAR, \
+ WTTS_USE_DEFAULT, \
+ CBDISC_MAX_LIFETIME_VAR, \
1.0, \
}, \
{ \
ARG_SECTION_BINARY, \
- "cbdisc_init_dM", \
+ "cbdisc_init_dM", \
"On cbdisc start, reduce mass by a fraction dM if it won't converge. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_START_DM_VAR, \
1.0, \
}, \
{ \
ARG_SECTION_BINARY, \
- "cbdisc_init_dJdM", \
+ "cbdisc_init_dJdM", \
"On cbdisc start, reduce angular momentum by a fraction dJ/dM*dM if it won't converge. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_START_DJDM_VAR, \
1.0, \
}, \
@@ -2496,7 +2496,7 @@ struct cmd_line_arg_t
"cbdisc_mass_loss_constant_rate", \
"Circumbinary disc constant mass loss rate (Msun/year). Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MASS_LOSS_RATE_VAR, \
1.0, \
}, \
@@ -2505,7 +2505,7 @@ struct cmd_line_arg_t
"cbdisc_mass_loss_FUV_multiplier", \
"Circumbinary disc FUV mass loss rate multiplier (no units). Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MASS_LOSS_FUV_MULTIPLIER_VAR, \
1.0, \
}, \
@@ -2514,7 +2514,7 @@ struct cmd_line_arg_t
"cbdisc_mass_loss_Xray_multiplier", \
"Circumbinary disc X-ray mass loss rate multiplier (no units). Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MASS_LOSS_XRAY_MULTIPLIER_VAR, \
1.0, \
}, \
@@ -2523,7 +2523,7 @@ struct cmd_line_arg_t
"cbdisc_mass_loss_ISM_ram_pressure_multiplier", \
"Circumbinary disc interstellar medium ram pressure stripping mass loss rate multiplier (no units). Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MASS_LOSS_ISM_RAM_PRESSURE_MULTIPLIER_VAR, \
1.0, \
}, \
@@ -2532,7 +2532,7 @@ struct cmd_line_arg_t
"cbdisc_mass_loss_ISM_pressure", \
"Circumbinary disc interstellar medium ram pressure in units of Boltzmann constant per Kelvin (I think...). Requires DISCS. Typically 3000.0. See e.g. http://www.astronomy.ohio-state.edu/~pogge/Ast871/Notes/Intro.pdf page 15 or https://arxiv.org/pdf/0902.0820.pdf Fig. 1 (left panel).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MASS_LOSS_ISM_PRESSURE_VAR, \
1.0, \
}, \
@@ -2541,7 +2541,7 @@ struct cmd_line_arg_t
"cbdisc_mass_loss_inner_viscous_multiplier", \
"Circumbinary disc inner edge viscous mass loss rate multiplier (no units). Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MASS_LOSS_INNER_VISCOUS_MULTIPLIER_VAR, \
1.0, \
}, \
@@ -2550,7 +2550,7 @@ struct cmd_line_arg_t
"cbdisc_mass_loss_inner_viscous_angular_momentum_multiplier", \
"Circumbinary disc inner edge viscous angular momentum multiplier (no units). The inner edge angular momentum Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MASS_LOSS_INNER_VISCOUS_ANGULAR_MOMENTUM_MULTIPLIER_VAR, \
1.0, \
}, \
@@ -2559,7 +2559,7 @@ struct cmd_line_arg_t
"cbdisc_resonance_multiplier", \
"Circumbinary disc resonant interaction multiplier, affects eccentricity pumping and angular momentum rates. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_RESONANCE_MULTIPLIER_VAR, \
1.0, \
}, \
@@ -2568,7 +2568,7 @@ struct cmd_line_arg_t
"cbdisc_resonance_damping", \
"Circumbinary disc resonant interaction damping: should be on (True) to damp the l=1, m=2 resonance when the disc inner edge lies outside the resonance location. Requires DISCS.", \
ARG_BOOLEAN, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_RESONANCE_DAMPING_VAR, \
1.0, \
}, \
@@ -2577,7 +2577,7 @@ struct cmd_line_arg_t
"cbdisc_fail_ring_inside_separation", \
"If True, while converging on a structure, circumbinary discs with Rring < the binary separation are immediately failed.", \
ARG_BOOLEAN, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_FAIL_RING_INSIDE_SEPARATION, \
1.0, \
}, \
@@ -2586,7 +2586,7 @@ struct cmd_line_arg_t
"cbdisc_mass_loss_inner_L2_cross_multiplier", \
"Circumbinary disc inner edge L2-crossing mass loss rate multiplier (no units). Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MASS_LOSS_INNER_L2_CROSS_MULTIPLIER_VAR, \
1.0, \
}, \
@@ -2595,7 +2595,7 @@ struct cmd_line_arg_t
"cbdisc_minimum_luminosity", \
"Circumbinary disc minimum luminosity. If the disc becomes dimmer than this, the disc is evaporated instantly. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MINIMUM_LUMINOSITY_VAR, \
1.0, \
}, \
@@ -2604,7 +2604,7 @@ struct cmd_line_arg_t
"cbdisc_minimum_mass", \
"Circumbinary disc minimum mass. If the disc becomes less massive than this, the disc is evaporated instantly. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MINIMUM_MASS_VAR, \
1.0, \
}, \
@@ -2613,7 +2613,7 @@ struct cmd_line_arg_t
"cbdisc_minimum_fRing", \
"Circumbinary disc minimum fRing. If the disc becomes a ring, and fRing = |Rout/Rin-1| < this value (and this value is non-zero), the disc is evaporated instantly. Requires DISCS.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CBDISC_MINIMUM_FRING_VAR, \
1.0, \
}, \
@@ -2622,7 +2622,7 @@ struct cmd_line_arg_t
"comenv_disc_angmom_fraction", \
"If >0 Fraction of the common envelope's angular momentum that goes into the circumbinary disc. If -1 then uses the moments of inertia to calculate (deprecated), if -2 use the common envelope's specific angular momentum, if -3 uses the L2 point at the end of the common envelope to set the angular momentum. Requires DISCS and DISCS_CIRCUMBINARY_FROM_COMENV.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
COMENV_DISC_ANGMOM_FRACTION_VAR, \
1.0, \
}, \
@@ -2631,26 +2631,26 @@ struct cmd_line_arg_t
"comenv_disc_mass_fraction", \
"Fraction of the common envelope's mass that goes into the circumbinary disc. Requires DISCS and DISCS_CIRCUMBINARY_FROM_COMENV.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
COMENV_DISC_MASS_FRACTION_VAR, \
1.0, \
}, \
{ \
ARG_SECTION_BINARY, \
- "wind_disc_angmom_fraction", \
+ "wind_disc_angmom_fraction", \
"If >0 Fraction of the wind envelope's angular momentum that goes into the circumbinary disc. If -1 then uses the L2 point's specific angular momentum. Requires DISCS and DISCS_CIRCUMBINARY_FROM_WIND.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
- WIND_DISC_ANGMOM_FRACTION_VAR, \
+ WTTS_USE_DEFAULT, \
+ WIND_DISC_ANGMOM_FRACTION_VAR, \
1.0, \
}, \
{ \
ARG_SECTION_BINARY, \
- "wind_disc_mass_fraction", \
+ "wind_disc_mass_fraction", \
"Fraction of the stellar wind's mass that goes into the circumbinary disc. Requires DISCS and DISCS_CIRCUMBINARY_FROM_WIND.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
- WIND_DISC_MASS_FRACTION_VAR, \
+ WTTS_USE_DEFAULT, \
+ WIND_DISC_MASS_FRACTION_VAR, \
1.0, \
}, \
{ \
@@ -2658,7 +2658,7 @@ struct cmd_line_arg_t
"WRLOF_method", \
"Choose whether and how to apply wind-Roche-lobe-overflow. 0=none, 1=q-dependent, 2=quadratic See Abate et al 2013/14 for details. Requires WRLOF_MASS_TRANSFER.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
WRLOF_METHOD_VAR, \
1.0 \
}, \
@@ -2667,7 +2667,7 @@ struct cmd_line_arg_t
"minimum_timestep", \
"The minimum timestep (Myr).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->minimum_timestep), \
1.0 \
}, \
@@ -2677,7 +2677,7 @@ struct cmd_line_arg_t
"timestep_solver_factor", \
"Factor applied in timestep_limits, e.g. to prevent X changing too fast by comparing to X/dX/dt, which is usually 1 but can be higher to lengthen timesteps when using an alternative solver.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->timestep_solver_factor), \
1.0 \
}, \
@@ -2686,7 +2686,7 @@ struct cmd_line_arg_t
"RLOF_timestep_modulator", \
"Multiplier applied to the timestep during Roche-lobe overflow. Requires RLOF_TIMESTEP_MODULATION.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
RLOF_TIMESTEP_MODULATOR_VAR, \
1.0 \
}, \
@@ -2695,7 +2695,7 @@ struct cmd_line_arg_t
"RLOF_mdot_factor", \
"Multiplier applied to the mass transfer rate during Roche-lobe overflow. Requires RLOF_MDOT_MODULATION.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
RLOF_MDOT_MODULATOR_VAR, \
1.0 \
}, \
@@ -2704,7 +2704,7 @@ struct cmd_line_arg_t
"RLOF_f", \
"Factor to enlarge a Roche lobe, nominally because of radiation pressure (see Dermine et al paper). Requires RLOF_RADIATION_CORRECTION.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
RLOF_F_VAR, \
1.0 \
}, \
@@ -2713,7 +2713,7 @@ struct cmd_line_arg_t
"minimum_separation_for_instant_RLOF", \
"If True, instead of evolving the system just report the minimum separation (on the zero-age main sequence) that would lead to instant RLOF. Used by binary_grid. See also minimum_orbital_period_for_instant_RLOF.", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->show_minimum_separation_for_instant_RLOF), \
1.0 \
}, \
@@ -2722,8 +2722,8 @@ struct cmd_line_arg_t
"separation", \
"Set the orbital separation in solar radii. Note that if the orbital period is given, it is used to calculate the separation. So if you want to set the separation instead, either do not set the orbital period or set the orbital period to zero (0.0).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
- &(stardata->preferences->initial_orbital_separation), \
+ WTTS_USE_DEFAULT, \
+ &(stardata->preferences->initial_orbital_separation), \
1.0 \
}, \
{ \
@@ -2731,7 +2731,7 @@ struct cmd_line_arg_t
"minimum_orbital_period_for_instant_RLOF", \
"If True, instead of evolving the system just report the minimum orbital period (on the zero-age main sequence) that would lead to instant RLOF. Used by binary_grid. See also minimum_separeation_for_instant_RLOF.", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->show_minimum_orbital_period_for_instant_RLOF), \
1.0 \
}, \
@@ -2740,16 +2740,16 @@ struct cmd_line_arg_t
"RLOF_method", \
"Use RLOF_method to choose the algorithm you use for Roche-lobe overflow mass loss rate calculations. 0=Hurley et al 2002, 1=Adaptive (for radiative stars) R=RL method, 2=Ritter (probably broken), 3=Claeys etal 2014 variant on Hurley et al 2002.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->RLOF_method), \
1.0 \
}, \
{ \
- ARG_SECTION_STARS, \
- "small_envelope_method", \
+ ARG_SECTION_STARS, \
+ "small_envelope_method", \
"Choose the method used to determine the stellar radius when the envelope mass is very thin. 0 = Hurley et al. (2002), 1 = Miller Bertolami et al. (2016+) for GB and AGB stars only.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->small_envelope_method), \
1.0 \
}, \
@@ -2758,7 +2758,7 @@ struct cmd_line_arg_t
"RLOF_interpolation_method", \
"When a star overflows its Roche lobe, it always has R>RL because of the limited time resolution of the simulation. Binary_c then uses an algorithm to get back to when R~RL (within a desired tolerance, set in RLOF_ENTRY_THRESHOLD which is usually 1.02, i.e. overflow of 2%). You can choose algorithm 0, the Hurley et al 2002 method which reverses time (i.e. uses a Newton-like scheme), or 1 to use the binary_c method which rejects a timestep (and hence does no logging on that timestep) and repeats with half the timestep until R~RL. The latter is now the default, because this means there are no negative timesteps which break various other algorithms (e.g. nucleosynthesis).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->RLOF_interpolation_method), \
1.0 \
}, \
@@ -2767,7 +2767,7 @@ struct cmd_line_arg_t
"vrot1", \
"Equatorial rotational speed of star 1 (km/s). If 0.0, the Hurley et al 2000/2002 prescription is used to set the main-sequence velocity, so for a truly non-rotating star, set to something small (e.g. 0.001). Requires MANUAL_VROT. See also vrot2.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
VROT_1_VAR, \
1.0 \
}, \
@@ -2776,7 +2776,7 @@ struct cmd_line_arg_t
"vrot2", \
"Equatorial rotational speed of star 2 (km/s). If 0.0, the Hurley et al 2000/2002 prescription is used to set the main-sequence velocity, so for a truly non-rotating star, set to something small (e.g. 0.001). Requires MANUAL_VROT. See also vrot1.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
VROT_2_VAR, \
1.0 \
}, \
@@ -2785,7 +2785,7 @@ struct cmd_line_arg_t
"timestep_modulator", \
"Multiplier applied to the global timestep. Requires TIMESTEP_MODULATION.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
TIMESTEP_MODULATOR_VAR, \
1.0 \
}, \
@@ -2794,7 +2794,7 @@ struct cmd_line_arg_t
"timestep_multiplier%d", \
"Multiplier applied to timestep limit <n>.", \
ARG_FLOAT_SCANF, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->timestep_multipliers), \
1.0 \
}, \
@@ -2803,7 +2803,7 @@ struct cmd_line_arg_t
"maximum_timestep", \
"The maximum timestep (MYr).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->maximum_timestep), \
1.0 \
}, \
@@ -2812,7 +2812,7 @@ struct cmd_line_arg_t
"zoomfac_multiplier_decrease", \
"When a timestep is rejected, decrease the timestep by this factor (0.5).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->zoomfac_multiplier_decrease), \
1.0, \
}, \
@@ -2821,7 +2821,7 @@ struct cmd_line_arg_t
"zoomfac_multiplier_increase", \
"When a timestep is rejected, zooms, then succeeds, increase the timestep by this factor (1.2).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->zoomfac_multiplier_increase), \
1.0, \
}, \
@@ -2830,7 +2830,7 @@ struct cmd_line_arg_t
"maximum_timestep_factor", \
"The maximum factor between two subsequent timesteps (1.2).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->maximum_timestep_factor), \
1.0 \
}, \
@@ -2839,7 +2839,7 @@ struct cmd_line_arg_t
"maximum_nuclear_burning_timestep", \
"The maximum timestep (MYr) in any nuclear burning phase.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->maximum_nuclear_burning_timestep), \
1.0 \
}, \
@@ -2848,7 +2848,7 @@ struct cmd_line_arg_t
"nova_retention_method", \
"Algorithm used to calculate the amount of mass retained during a nova explosion. 0=use nova_retention_fraction. (other methods pending)", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nova_retention_method), \
1.0 \
}, \
@@ -2858,7 +2858,7 @@ struct cmd_line_arg_t
"nova_retention_fraction", \
"The mass accreted during a nova as fraction of mass transferred", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nova_retention_fraction), \
1.0 \
}, \
@@ -2867,34 +2867,34 @@ struct cmd_line_arg_t
"beta_reverse_nova", \
"The fraction of mass ejected in a nova explosion which is accreted back onto the companion star. Set to -1 to automatically calculate based on a geometric argument, or 0 or positive to set the value.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->beta_reverse_nova), \
1.0 \
}, \
{ \
ARG_SECTION_BINARY, \
- "WD_accretion_rate_novae_upper_limit_hydrogen_donor", \
+ "WD_accretion_rate_novae_upper_limit_hydrogen_donor", \
"Upper limit of the stable mass transfer rate onto a white dwarf that leads to novae when the donor is hydrogen rich : above this rate the mass transfer leads to stable burning.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->WD_accretion_rate_novae_upper_limit_hydrogen_donor), \
1.0 \
}, \
{ \
ARG_SECTION_BINARY, \
- "WD_accretion_rate_novae_upper_limit_helium_donor", \
+ "WD_accretion_rate_novae_upper_limit_helium_donor", \
"Upper limit of the stable mass transfer rate onto a white dwarf that leads to novae when the donor is helium rich : above this rate the mass transfer leads to stable burning.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->WD_accretion_rate_novae_upper_limit_helium_donor), \
1.0 \
}, \
{ \
ARG_SECTION_BINARY, \
- "WD_accretion_rate_novae_upper_limit_other_donor", \
+ "WD_accretion_rate_novae_upper_limit_other_donor", \
"Upper limit of the stable mass transfer rate onto a white dwarf that leads to novae when the donor is neither hydrogen nor helium rich : above this rate the mass transfer leads to stable burning.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->WD_accretion_rate_novae_upper_limit_other_donor), \
1.0 \
}, \
@@ -2903,25 +2903,25 @@ struct cmd_line_arg_t
"WD_accretion_rate_new_giant_envelope_lower_limit_hydrogen_donor", \
"Lower limit of the mass transfer rate onto a white dwarf that leads to a the formation of a new giant envelope with a hydrogen-rich donor. Below this mass transfer leads to stable burning.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->WD_accretion_rate_new_giant_envelope_lower_limit_hydrogen_donor), \
1.0 \
}, \
{ \
ARG_SECTION_BINARY, \
- "WD_accretion_rate_new_giant_envelope_lower_limit_helium_donor", \
+ "WD_accretion_rate_new_giant_envelope_lower_limit_helium_donor", \
"Lower limit of the mass transfer rate onto a white dwarf that leads to a the formation of a new giant envelope with a helium-rich donor. Below this mass transfer leads to stable burning.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->WD_accretion_rate_new_giant_envelope_lower_limit_helium_donor), \
1.0 \
}, \
{ \
ARG_SECTION_BINARY, \
- "WD_accretion_rate_new_giant_envelope_lower_limit_other_donor", \
+ "WD_accretion_rate_new_giant_envelope_lower_limit_other_donor", \
"Lower limit of the mass transfer rate onto a white dwarf that leads to a the formation of a new giant envelope when the donor is neither hydrogen nor helium rich. Below this mass transfer leads to stable burning.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->WD_accretion_rate_new_giant_envelope_lower_limit_other_donor), \
1.0 \
}, \
@@ -2930,7 +2930,7 @@ struct cmd_line_arg_t
"CRAP_parameter", \
"Tidally enhanced mass loss parameter. See Tout and Eggleton's paper on the subject. (Was the parameter bb).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->CRAP_parameter), \
1.0 \
}, \
@@ -2979,7 +2979,7 @@ struct cmd_line_arg_t
"hrdiag_output", \
"Set to True to output high time-resolution Hertzstrpung-Russell diagram information. Requires HRDIAG.", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
HRDIAG_OUTPUT_VAR, \
1.0 \
}, \
@@ -2988,7 +2988,7 @@ struct cmd_line_arg_t
"internal_buffering", \
"Experimental. Set to non-zero values to implement internal buffering prior to output. For use with binary_grid, you shouldn't really be playing with this.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->internal_buffering), \
1.0 \
}, \
@@ -2998,7 +2998,7 @@ struct cmd_line_arg_t
"internal_buffering_compression", \
"Experimental. Set the internal_buffering compression level (0=none, otherwise 1-9). See internal_buffering.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->internal_buffering_compression), \
1.0 \
}, \
@@ -3008,8 +3008,8 @@ struct cmd_line_arg_t
"individual_novae", \
"If individual_novae is True, novae are resolved such that each explosion is performed separtaely.", \
ARG_BOOLEAN, \
- WTTS_USE_DEFAULT, \
- INDIVIDUAL_NOVAE_VAR, \
+ WTTS_USE_DEFAULT, \
+ &(stardata->preferences->individual_novae), \
1.0 \
}, \
\
@@ -3018,7 +3018,7 @@ struct cmd_line_arg_t
"force_corotation_on_RLOF", \
"If True forces co-rotation of stars and orbit when RLOF starts, this is as in the BSE algorithm. (True)", \
ARG_BOOLEAN , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->force_corotation_on_RLOF), \
1.0 \
}, \
@@ -3028,7 +3028,7 @@ struct cmd_line_arg_t
"nonconservative_angmom_gamma", \
"Mass lost from the system (but NOT from a stellar wind) takes a fraction gamma of the orbital angular momentum with it. Set to -1 to take the specific angular momentum of the donor star. Set to -2 to take super-Eddington, nova and disk-wind angular momenta as if a wind from the accretor.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->nonconservative_angmom_gamma), \
1.0 \
}, \
@@ -3037,7 +3037,7 @@ struct cmd_line_arg_t
"max_stellar_angmom_change", \
"Maxmimum fractional change in stellar angular momentum allowed before a timestep is rejected (0.05).", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->max_stellar_angmom_change), \
1.0 \
}, \
@@ -3046,7 +3046,7 @@ struct cmd_line_arg_t
"comenv_ms_accretion_mass", \
"Experimental. During common envelope evolution, a main sequence star may accrete some of the envelope's mass. Requires COMENV_MS_ACCRETION. See also comenv_ms_accretion_fraction.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
CE_MS_ACCRETION_MASS_VAR, \
1.0 \
}, \
@@ -3055,7 +3055,7 @@ struct cmd_line_arg_t
"third_dup", \
"If True, enables third dredge up. Requires NUCSYN and NUCSYN_THIRD_DREDGE_UP.", \
ARG_BOOLEAN, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->third_dup), \
1.0 \
} , \
@@ -3082,8 +3082,8 @@ struct cmd_line_arg_t
"nucreacmult%d", \
"Usage: --nucreacmult%d <f>. Multiply nuclear reaction given by the integer %d (integer) by f (float). ", \
ARG_FLOAT_SCANF, \
- WTTS_USE_DEFAULT, \
- NUCSYN_REACTION_RATE_MULTIPLIERS_VAR, \
+ WTTS_USE_DEFAULT, \
+ NUCSYN_REACTION_RATE_MULTIPLIERS_VAR, \
1.0 \
} , \
{ \
@@ -3091,7 +3091,7 @@ struct cmd_line_arg_t
"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 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, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NUCSYN_METALLICITY_VAR, \
1.0 \
}, \
@@ -3139,7 +3139,7 @@ struct cmd_line_arg_t
"init_abunds_only", \
"If True, outputs only the initial abundances, then exits.", \
ARG_BOOLEAN, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
INIT_ABUNDS_VAR, \
1.0 \
} , \
@@ -3149,7 +3149,7 @@ struct cmd_line_arg_t
"initial_abunds_only", \
"If True, outputs only the initial abundances, then exits.", \
ARG_BOOLEAN, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
INIT_ABUNDS_VAR, \
1.0 \
} , \
@@ -3159,7 +3159,7 @@ struct cmd_line_arg_t
"no_thermohaline_mixing", \
"If True, disables thermohaline mixing.", \
ARG_BOOLEAN, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
NO_THERMOHALINE_MIXING_VAR, \
1.0 \
} , \
@@ -3168,7 +3168,7 @@ struct cmd_line_arg_t
"lithium_GB_post_Heflash", \
"Sets the lithium abundances after the helium flash. Requires NUCSYN and LITHIUM_TABLES.", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
LITHIUM_GB_POST_HEFLASH_VAR, \
1.0 \
} , \
@@ -3177,7 +3177,7 @@ struct cmd_line_arg_t
"lithium_GB_post_1DUP", \
"Sets the lithium abundance after first dredge up. Requires NUCSYN and LITHIUM_TABLES.", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
LITHIUM_GB_POST_1DUP_VAR, \
1.0 \
}, \
@@ -3186,16 +3186,16 @@ struct cmd_line_arg_t
"lithium_hbb_multiplier", \
"Multiplies the lithium abundances on the AGB during HBB (based on Karakas/Fishlock et al models).Requires NUCSYN and LITHIUM_TABLES.", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
LITHIUM_GB_HBB_MULTIPLIER_VAR, \
1.0 \
}, \
{ \
ARG_SECTION_NUCSYN, \
- "angelou_lithium_decay_function", \
+ "angelou_lithium_decay_function", \
"Functional form which describes Li7 decay. Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Choices are : 0 expoential (see angelou_lithium_decay_time).", \
ARG_INTEGER, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_DECAY_FUNCTION_VAR, \
1.0 \
}, \
@@ -3204,7 +3204,7 @@ struct cmd_line_arg_t
"angelou_lithium_LMMS_time", \
"Time at which lithium manufacture is triggered in a low-mass (convective) main sequence (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_LMMS_TIME_VAR, \
1.0 \
}, \
@@ -3213,7 +3213,7 @@ struct cmd_line_arg_t
"angelou_lithium_MS_time", \
"Time at which lithium manufacture is triggered on the main sequence (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_MS_TIME_VAR, \
1.0 \
}, \
@@ -3222,7 +3222,7 @@ struct cmd_line_arg_t
"angelou_lithium_HG_time", \
"Time at which lithium manufacture is triggered on the Hertzsprung gap (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_HG_TIME_VAR, \
1.0 \
}, \
@@ -3231,7 +3231,7 @@ struct cmd_line_arg_t
"angelou_lithium_GB_time", \
"Time at which lithium manufacture is triggered on the giant branch (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_GB_TIME_VAR, \
1.0 \
}, \
@@ -3240,7 +3240,7 @@ struct cmd_line_arg_t
"angelou_lithium_CHeB_time", \
"Time at which lithium manufacture is triggered during core helium burning (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_CHeB_TIME_VAR, \
1.0 \
}, \
@@ -3249,7 +3249,7 @@ struct cmd_line_arg_t
"angelou_lithium_EAGB_time", \
"Time at which lithium manufacture is triggered on the early AGB (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_EAGB_TIME_VAR, \
1.0 \
}, \
@@ -3258,7 +3258,7 @@ struct cmd_line_arg_t
"angelou_lithium_TPAGB_time", \
"Time at which lithium manufacture is triggered on the thermally pulsing AGB (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_TPAGB_TIME_VAR, \
1.0 \
}, \
@@ -3267,7 +3267,7 @@ struct cmd_line_arg_t
"angelou_lithium_LMMS_decay_time", \
"Decay time for surface lithium abundance during the low-mass (convective) main sequence (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_LMMS_DECAY_TIME_VAR, \
1.0 \
}, \
@@ -3276,7 +3276,7 @@ struct cmd_line_arg_t
"angelou_lithium_MS_decay_time", \
"Decay time for surface lithium abundance on the main sequence (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_MS_DECAY_TIME_VAR, \
1.0 \
}, \
@@ -3285,7 +3285,7 @@ struct cmd_line_arg_t
"angelou_lithium_HG_decay_time", \
"Decay time for surface lithium abundance on the Hertzsprung gap (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_HG_DECAY_TIME_VAR, \
1.0 \
}, \
@@ -3294,7 +3294,7 @@ struct cmd_line_arg_t
"angelou_lithium_GB_decay_time", \
"Decay time for surface lithium abundance on the giant branch (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_GB_DECAY_TIME_VAR, \
1.0 \
}, \
@@ -3303,7 +3303,7 @@ struct cmd_line_arg_t
"angelou_lithium_CHeB_decay_time", \
"Decay time for surface lithium abundance during core helium burning (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_CHeB_DECAY_TIME_VAR, \
1.0 \
}, \
@@ -3312,7 +3312,7 @@ struct cmd_line_arg_t
"angelou_lithium_EAGB_decay_time", \
"Decay time for surface lithium abundance on the early AGB (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_EAGB_DECAY_TIME_VAR, \
1.0 \
}, \
@@ -3321,17 +3321,17 @@ struct cmd_line_arg_t
"angelou_lithium_TPAGB_decay_time", \
"Decay time for surface lithium abundance on the thermally pulsing AGB (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_TPAGB_DECAY_TIME_VAR, \
1.0 \
}, \
{ \
ARG_SECTION_NUCSYN, \
- "angelou_lithium_LMMS_massfrac", \
+ "angelou_lithium_LMMS_massfrac", \
"Lithium mass fraction when its manufacture is triggered during the low-mass (convective) main sequence (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
- ANGELOU_LITHIUM_LMMS_MASSFRAC_VAR, \
+ WTTS_USE_DEFAULT, \
+ ANGELOU_LITHIUM_LMMS_MASSFRAC_VAR, \
1.0 \
}, \
{ \
@@ -3339,7 +3339,7 @@ struct cmd_line_arg_t
"angelou_lithium_MS_massfrac", \
"Lithium mass fraction when its manufacture is triggered on the main sequence (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_MS_MASSFRAC_VAR, \
1.0 \
}, \
@@ -3348,7 +3348,7 @@ struct cmd_line_arg_t
"angelou_lithium_HG_massfrac", \
"Lithium mass fraction when its manufacture is triggered on the Hertzsprung gap (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_HG_MASSFRAC_VAR, \
1.0 \
}, \
@@ -3357,7 +3357,7 @@ struct cmd_line_arg_t
"angelou_lithium_GB_massfrac", \
"Lithium mass fraction when its manufacture is triggered on the giant branch (Myr). Requires NUCSYN and NUCSYN_ANGELOU_LITHIUM. Ignored if 0 (for the start, use 1e-6).\n", \
ARG_FLOAT, \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ANGELOU_LITHIUM_GB_MASSFRAC_VAR, \
1.0 \
}, \
@@ -3447,7 +3447,7 @@ struct cmd_line_arg_t
"rotationally_enhanced_mass_loss", \
"Set to 1 to enable rotationally enhanced mass loss rate algorithms: 0= none, 1=formula cf. Langer models (=ROTATIONALLY_ENHNACED_MASSLOSS_LANGER_FORMULA), 2=limit accretion rate before wind loss is applied, 3 = both 1 and 2. See also rotationally_enhanced_exponent", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ROTATIONALLY_ENHANCED_MASS_LOSS_VAR, \
1.0 \
}, \
@@ -3457,7 +3457,7 @@ struct cmd_line_arg_t
"AGB_core_algorithm", \
"Algorithm to use for calculating AGB core masses. 0=Hurley et al. 2002 if no NUCSYN, Karakas 2002 if NUCSYN is defined; 1=Hurley et al. 2002 (overshooting models); 1=Karakas 2002 (non-overshooting models).", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->AGB_core_algorithm), \
1.0 \
}, \
@@ -3467,7 +3467,7 @@ struct cmd_line_arg_t
"AGB_radius_algorithm", \
"Algorithm to use for calculating radii on the TPAGB.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->AGB_radius_algorithm), \
1.0 \
}, \
@@ -3477,7 +3477,7 @@ struct cmd_line_arg_t
"AGB_luminosity_algorithm", \
"Algorithm to use for calculating luminosities on the TPAGB.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->AGB_luminosity_algorithm), \
1.0 \
}, \
@@ -3487,7 +3487,7 @@ struct cmd_line_arg_t
"AGB_3dup_algorithm", \
"Algorithm to use for calculating third dredge up efficiency on the TPAGB.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->AGB_3dup_algorithm), \
1.0 \
}, \
@@ -3497,7 +3497,7 @@ struct cmd_line_arg_t
"overspin_algorithm", \
"Algorithm to determine what we do when a star is rotating at its breakup velocity. OVERSPIN_BSE (0) conservatively transfers the angular momentum back to the orbit. OVERSPIN_MASSLOSS uses the rotationally_enhanced_massloss parameter to lose mass which carries away the angular momentum.", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->overspin_algorithm), \
1.0 \
}, \
@@ -3507,7 +3507,7 @@ struct cmd_line_arg_t
"rotationally_enhanced_exponent", \
"The exponent (power) by which rotationally enhanced mass loss is raised. Requires ROTATIONALLY_ENHANCED_MASS_LOSS. See also rotationally_enhanced_mass_loss.", \
ARG_FLOAT , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
ROTATIONALLY_ENHANCED_EXPONENT_VAR, \
1.0 \
}, \
@@ -3580,7 +3580,7 @@ struct cmd_line_arg_t
"batchmode", \
"Set the batchmode control variable. Use only if you know what you are doing!", \
ARG_INTEGER , \
- WTTS_USE_DEFAULT, \
+ WTTS_USE_DEFAULT, \
&(stardata->preferences->batchmode), \
1.0 \
}, \
diff --git a/src/setup/cmd_line_macros.h b/src/setup/cmd_line_macros.h
index 409379dbf..cb5aaa3be 100644
--- a/src/setup/cmd_line_macros.h
+++ b/src/setup/cmd_line_macros.h
@@ -404,12 +404,6 @@
#define COMENV_SPLITMASS_VAR NULL
#endif
-#ifdef INDIVIDUAL_NOVAE
-#define INDIVIDUAL_NOVAE_VAR &(stardata->preferences->individual_novae)
-#else
-#define INDIVIDUAL_NOVAE_VAR NULL
-#endif
-
#ifdef EQUATION_OF_STATE_ALGORITHMS
#define EQUATION_OF_STATE_VAR &(stardata->preferences->equation_of_state_algorithm)
#else
diff --git a/src/timestep/timestep_limits.c b/src/timestep/timestep_limits.c
index 244fd698a..5359f09de 100644
--- a/src/timestep/timestep_limits.c
+++ b/src/timestep/timestep_limits.c
@@ -255,11 +255,13 @@ void timestep_limits(Timestep_prototype_args)
#endif//SECOND_DERIVATIVES
}
}
-#ifdef TIME_RESOLVE_NOVAE
+
+
+ if(stardata->preferences->individual_novae == TRUE)
{
if(WHITE_DWARF(star->stellar_type))
{
- double accretion_rate = Mdot_gain(star);
+ const double accretion_rate = Mdot_gain(star);
if(Is_zero(star->time_next_nova))
{
@@ -268,9 +270,7 @@ void timestep_limits(Timestep_prototype_args)
star->time_prev_nova = stardata->model.time;
}
-#ifdef INDIVIDUAL_NOVAE
- if(star->nova == TRUE &&
- stardata->preferences->individual_novae == TRUE)
+ if(star->nova == TRUE)
{
/*
* When novae are switched on and off because the system
@@ -334,7 +334,6 @@ void timestep_limits(Timestep_prototype_args)
DT_LIMIT_NOVAE);
}
else
-#endif // INDIVIDUAL_NOVAE
{
/* dtnova is in YEARS, */
double dtnova = nova_recurrence_time(accretion_rate,
@@ -373,8 +372,8 @@ void timestep_limits(Timestep_prototype_args)
star->time_next_nova = star->time_prev_nova + star->dtnova*1e-6;
}
}
-#endif // TIME_RESOLVE_NOVAE
- if(star->starnum==0)
+
+ if(star->starnum == 0)
{
/*
* Orbital limits
diff --git a/src/timestep/timestep_set_default_multipliers.c b/src/timestep/timestep_set_default_multipliers.c
index 8bc5d2197..7e463766e 100644
--- a/src/timestep/timestep_set_default_multipliers.c
+++ b/src/timestep/timestep_set_default_multipliers.c
@@ -57,7 +57,7 @@ void timestep_set_default_multipliers(struct preferences_t * preferences)
preferences->timestep_multipliers[DT_LIMIT_YVT] = 1.0; /* 36 */
preferences->timestep_multipliers[DT_LIMIT_MINIMUM_TIMESTEP] = 1.0; /* 37 */
preferences->timestep_multipliers[DT_LIMIT_MAXIMUM_TIMESTEP] = 1.0; /* 38 */
- preferences->timestep_multipliers[DT_LIMIT_NOVAE] = 1e-2; /* 39 */
+ preferences->timestep_multipliers[DT_LIMIT_NOVAE] = 0.1; /* 39 */
preferences->timestep_multipliers[DT_LIMIT_ARTIFICIAL_ACCRETION] = 1.0; /* 40 */
preferences->timestep_multipliers[DT_LIMIT_SN] = 1.0; /* 41 */
preferences->timestep_multipliers[DT_LIMIT_MASS_GAIN] = 1.0; /* 42 */
--
GitLab