scottcoughlin2014
commented
3 years ago Changes to CMC that are needed.
diff --git a/include/bse_wrap/bse_wrap.h b/include/bse_wrap/bse_wrap.h
index 9dc5962..8a7be54 100644
--- a/include/bse_wrap/bse_wrap.h
+++ b/include/bse_wrap/bse_wrap.h
@@ -181,7 +181,7 @@ extern struct { int idum2, iy, ir[32]; } rand2_;
extern struct { long long int state[4]; int first;} taus113state_;
#endif
extern struct { int ktype[15][15]; } types_;
-extern struct { int tflag, ifflag, remnantflag, wdflag, bhflag, windflag, qcflag, eddlimflag, bhspinflag, aic, rejuvflag, htpmb, st_cr, st_tide, bdecayfac, grflag; } flags_;
+extern struct { int tflag, ifflag, remnantflag, wdflag, bhflag, windflag, qcflag, eddlimflag, bhspinflag, aic, rejuvflag, htpmb, st_cr, st_tide, bdecayfac, grflag, bhms_coll_flag; } flags_;
extern struct { int ceflag,cekickflag,cemergeflag,cehestarflag,ussn; } ceflags_;
extern struct { int pisn_track[2]; } trackers_;
extern struct { double zsun; } metvars_;
@@ -213,6 +213,7 @@ void bse_set_eddlimflag(int eddlimflag); /* Sets wind prescription (0=BSE, 1=Sta
// helium core mass of the merger product at the base of the giant branch
void bse_set_rejuvflag(int rejuvflag);
void bse_set_grflag(int grflag);
+void bse_set_bhms_coll_flag(int bhms_coll_flag);
void bse_set_kickflag(int kickflag);
void bse_set_using_cmc(void);
void bse_set_pisn(double pisn); /* Sets Pair-instability pulsations and supernoa */
diff --git a/include/cmc/cmc.h b/include/cmc/cmc.h
index a23a7e4..f216f12 100644
--- a/include/cmc/cmc.h
+++ b/include/cmc/cmc.h
@@ -1287,6 +1287,11 @@ typedef struct{
* @brief bhspinflag sets the spin magnitude for BH merger kicks(0=[BHSPINMAG], 1=Uniform(0-1)*[BHSPINMAG], 2=Belczynski2017)
*/
int BSE_BHSPINFLAG;
+#define PARAMDOC_BSE_BHMS_COLL_FLAG "If set to 1 then if BH+star collision and if Mstar > Mbh, do not destroy the star"
+/**
+* @brief If set to 1 then if BH+star collision and if Mstar > Mbh, do not destroy the star
+*/
+ int BSE_BHMS_COLL_FLAG;
#define PARAMDOC_BH_RADIUS_MULTIPLYER "Factor to multiply the radii of BHs by for collisions (default is 5, since PN breaks down at ~10M)"
/**
* @brief Factor to multiply the rdii of BHs by when they're being integrated by fewbody (saves times for BH collisions). The default is the Schwarzschild ISCO
diff --git a/include/cmc/cmc_vars.h b/include/cmc/cmc_vars.h
index 7cc96d6..1a6bb9f 100644
--- a/include/cmc/cmc_vars.h
+++ b/include/cmc/cmc_vars.h
@@ -93,7 +93,7 @@ _EXTERN_ long esc_bhstar_tot, esc_bh01_tot, esc_bh26_tot, esc_bh7_tot, esc_bh89_
_EXTERN_ double fb_bh, esc_fb_bh, esc_fb_bh_tot;
_EXTERN_ FILE *bhsummaryfile, *escbhsummaryfile, *newbhfile, *bhmergerfile;
/* BSE input file parameters */
-_EXTERN_ int BSE_CEMERGEFLAG, BSE_CEKICKFLAG, BSE_CEHESTARFLAG, BSE_CEFLAG, BSE_TFLAG, BSE_IFFLAG, BSE_WDFLAG, BSE_BHFLAG, BSE_BHSPINFLAG, BSE_REMNANTFLAG, BSE_IDUM, BSE_WINDFLAG, BSE_QCFLAG, BSE_EDDLIMFLAG, BSE_AIC, BSE_BDECAYFAC, BSE_HTPMB, BSE_ST_TIDE, BSE_ST_CR, BSE_REJUVFLAG, BSE_USSN, BSE_KICKFLAG, BSE_GRFLAG;
+_EXTERN_ int BSE_CEMERGEFLAG, BSE_CEKICKFLAG, BSE_CEHESTARFLAG, BSE_CEFLAG, BSE_TFLAG, BSE_IFFLAG, BSE_WDFLAG, BSE_BHFLAG, BSE_BHSPINFLAG, BSE_REMNANTFLAG, BSE_IDUM, BSE_WINDFLAG, BSE_QCFLAG, BSE_EDDLIMFLAG, BSE_AIC, BSE_BDECAYFAC, BSE_HTPMB, BSE_ST_TIDE, BSE_ST_CR, BSE_REJUVFLAG, BSE_USSN, BSE_KICKFLAG, BSE_GRFLAG, BSE_BHMS_COLL_FLAG;
_EXTERN_ double BSE_POLAR_KICK_ANGLE, BH_RADIUS_MULTIPLYER, BSE_BHSPINMAG;
_EXTERN_ double BSE_PTS1, BSE_PTS2, BSE_PTS3, BSE_NETA, BSE_BWIND, BSE_HEWIND, BSE_ALPHA1, BSE_LAMBDAF, BSE_MXNS, BSE_BCONST, BSE_CK, BSE_REJUV_FAC, BSE_SIGMA, BSE_SIGMADIV, BSE_BHSIGMAFRAC, BSE_BETA, BSE_EDDFAC, BSE_GAMMA, BSE_XI, BSE_ACC2, BSE_PISN, BSE_EPSNOV, BSE_ECSN, BSE_ECSN_MLOW, BSE_REMBAR_MASSLOSS, BSE_ZSUN;
/* binary stuff */
diff --git a/src/bse_wrap/bse/COSMIC b/src/bse_wrap/bse/COSMIC
index ca1b352..de1a6a2 160000
--- a/src/bse_wrap/bse/COSMIC
+++ b/src/bse_wrap/bse/COSMIC
@@ -1 +1 @@
-Subproject commit ca1b352ab9d062c851301bb98f2f8c587e5841c4
+Subproject commit de1a6a2c3d6249778949eb7f186659ebdaa3da7e
diff --git a/src/bse_wrap/bse_wrap.c b/src/bse_wrap/bse_wrap.c
index 7c41a8a..99a8c98 100644
--- a/src/bse_wrap/bse_wrap.c
+++ b/src/bse_wrap/bse_wrap.c
@@ -640,6 +640,7 @@ void bse_set_ifflag(int ifflag) { flags_.ifflag = ifflag; }
void bse_set_wdflag(int wdflag) { flags_.wdflag = wdflag; }
void bse_set_bhflag(int bhflag) { flags_.bhflag = bhflag; }
void bse_set_bhspinflag(int bhspinflag) { flags_.bhspinflag = bhspinflag; }
+void bse_set_bhms_coll_flag(int bhms_coll_flag) { flags_.bhms_coll_flag = bhms_coll_flag; }
void bse_set_bhspinmag(double bhspinmag) { snvars_.bhspinmag = bhspinmag; }
void bse_set_remnantflag(int remnantflag) { flags_.remnantflag = remnantflag; }
void bse_set_mxns(double mxns) { snvars_.mxns = mxns;}
diff --git a/src/cmc/cmc_io.c b/src/cmc/cmc_io.c
index 1868717..70c9cad 100644
--- a/src/cmc/cmc_io.c
+++ b/src/cmc/cmc_io.c
@@ -1600,6 +1600,10 @@ if(myid==0) {
PRINT_PARSED(PARAMDOC_BSE_BHSPINFLAG);
sscanf(values, "%i", &BSE_BHSPINFLAG);
parsed.BSE_BHSPINFLAG = 1;
+ } else if (strcmp(parameter_name, "BHMS_COLL_FLAG")== 0) {
+ PRINT_PARSED(PARAMDOC_BSE_BHMS_COLL_FLAG);
+ sscanf(values, "%i", &BSE_BHMS_COLL_FLAG);
+ parsed.BSE_BHMS_COLL_FLAG = 1;
} else if (strcmp(parameter_name, "EDDFAC")== 0) {
PRINT_PARSED(PARAMDOC_BSE_EDDFAC);
sscanf(values, "%lf", &BSE_EDDFAC);
@@ -1970,6 +1974,11 @@ if(myid==0) {
// default=0.0
CHECK_PARSED(BSE_BHSPINMAG, 0.0, PARAMDOC_BSE_BHSPINMAG);
+ // bhms_coll_flag
+ // If set to 1 then if BH+star collision and if Mstar > Mbh, do not destroy the star
+ // default = 0
+ CHECK_PARSED(BSE_BHMS_COLL_FLAG, 0, PARAMDOC_BSE_BHMS_COLL_FLAG);
+
//////////////////////////////////////////////////////
////// MASS TRANSFER FLAGS //////
//////////////////////////////////////////////////////
diff --git a/src/cmc/cmc_stellar_evolution.c b/src/cmc/cmc_stellar_evolution.c
index 0534d75..0ebfa22 100644
--- a/src/cmc/cmc_stellar_evolution.c
+++ b/src/cmc/cmc_stellar_evolution.c
@@ -51,6 +51,7 @@ void restart_stellar_evolution(void){
bse_set_rembar_massloss(BSE_REMBAR_MASSLOSS);
bse_set_remnantflag(BSE_REMNANTFLAG);
bse_set_bhspinflag(BSE_BHSPINFLAG);
+ bse_set_bhms_coll_flag(BSE_BHMS_COLL_FLAG);
bse_set_bhspinmag(BSE_BHSPINMAG);
bse_set_mxns(BSE_MXNS); //3 if remnantflag=1 or 2, 1.8 if remnantflag=0 (see evolv2.f)
bse_set_bconst(BSE_BCONST);
@@ -142,6 +143,7 @@ void stellar_evolution_init(void){
bse_set_rembar_massloss(BSE_REMBAR_MASSLOSS);
bse_set_remnantflag(BSE_REMNANTFLAG);
bse_set_bhspinflag(BSE_BHSPINFLAG);
+ bse_set_bhms_coll_flag(BSE_BHMS_COLL_FLAG);
bse_set_bhspinmag(BSE_BHSPINMAG);
bse_set_mxns(BSE_MXNS); //3 if remnantflag=1 or 2, 1.8 if remnantflag=0 (see evolv2.f)
bse_set_bconst(BSE_BCONST);
diff --git a/src/utils/addbinaries/addbinaries.c b/src/utils/addbinaries/addbinaries.c
index 99b78f6..21db10b 100644
--- a/src/utils/addbinaries/addbinaries.c
+++ b/src/utils/addbinaries/addbinaries.c
@@ -163,6 +163,7 @@ void assign_binaries(cmc_fits_data_t *cfd, long Nbin, int limits, double peak_a,
int BSE_QCFLAG= 2;
double BSE_SIGMA= 265.0;
int BSE_BHFLAG= 1;
+ int BSE_BHMS_COLL_FLAG= 0;
double BSE_ECSN= 2.5;
double BSE_ECSN_MLOW= 1.4;
double BSE_SIGMADIV= -20.0;
@@ -228,6 +229,7 @@ void assign_binaries(cmc_fits_data_t *cfd, long Nbin, int limits, double peak_a,
bse_set_ifflag(BSE_IFFLAG);
bse_set_wdflag(BSE_WDFLAG);
bse_set_bhflag(BSE_BHFLAG);
+ bse_set_bhms_coll_flag(BSE_BHMS_COLL_FLAG);
bse_set_remnantflag(BSE_REMNANTFLAG);
bse_set_grflag(BSE_GRFLAG);
bse_set_kickflag(BSE_KICKFLAG);
diff --git a/src/utils/setstellar/setstellar.c b/src/utils/setstellar/setstellar.c
index 7333848..8fa7e04 100644
--- a/src/utils/setstellar/setstellar.c
+++ b/src/utils/setstellar/setstellar.c
@@ -70,6 +70,7 @@ void stellar_evolve(cmc_fits_data_t *cfd)
int BSE_QCFLAG= 2;
double BSE_SIGMA= 265.0;
int BSE_BHFLAG= 1;
+ int BSE_BHMS_COLL_FLAG= 0;
double BSE_ECSN= 2.5;
double BSE_ECSN_MLOW= 1.4;
double BSE_SIGMADIV= -20.0;
@@ -135,6 +136,7 @@ void stellar_evolve(cmc_fits_data_t *cfd)
bse_set_ifflag(BSE_IFFLAG);
bse_set_wdflag(BSE_WDFLAG);
bse_set_bhflag(BSE_BHFLAG);
+ bse_set_bhms_coll_flag(BSE_BHMS_COLL_FLAG);
bse_set_grflag(BSE_GRFLAG);
bse_set_kickflag(BSE_KICKFLAG);
bse_set_zsun(BSE_ZSUN);
adding_bse_flag_to_cosmic.txt show_bse_flag_change.txt