diff --git a/src/binary_c_parameters.h b/src/binary_c_parameters.h index e9b1d102e79cfb903750aea5287454ab4afc0739..888564fea872ac12a95a75dab40951931a2705b5 100644 --- a/src/binary_c_parameters.h +++ b/src/binary_c_parameters.h @@ -1169,7 +1169,7 @@ * Experimental: * common envelope from Wang 2016 */ -//#define COMENV_WANG2016 +#define COMENV_WANG2016 /* * Experimental: diff --git a/src/binary_c_structures.h b/src/binary_c_structures.h index ee4c6922caad67dc291b81432c0497d22a31b8d1..9cb603b1c2728f6d7b31975b02d64593665979b6 100644 --- a/src/binary_c_structures.h +++ b/src/binary_c_structures.h @@ -323,7 +323,7 @@ struct store_t { #endif //NUCSYN_NOVAE #endif //NUCSYN -#ifdef COMENV_WANG_2016 +#ifdef COMENV_WANG2016 double *tableh1,*tableh2,*tableh3, *tableb1,*tableb2,*tableb3, *tableg1,*tableg2,*tableg3; diff --git a/src/common_envelope/common_envelope_wang2016.c b/src/common_envelope/common_envelope_wang2016.c index a29d604e0b2da2f87a61c16a11b2e230e9d8e4c7..aa0304dc3589f4583a264a8c6ceaf2918ef85c89 100644 --- a/src/common_envelope/common_envelope_wang2016.c +++ b/src/common_envelope/common_envelope_wang2016.c @@ -108,7 +108,7 @@ double common_envelope_wang2016( */ #define WIDTH 8 #define LINES 18 -#define CONSTRUCT_LAMBDA(LABEL,LAMBDA,TABLE) \ +#define Construct_lambda(LABEL,LAMBDA,TABLE) \ /* construct interpolation table of loglambda(mass) */ \ { \ int j; \ @@ -162,9 +162,9 @@ double common_envelope_wang2016( (LABEL),(LAMBDA)); double lambdag,lambdab,lambdah; - CONSTRUCT_LAMBDA("h",lambdah, tableh); - CONSTRUCT_LAMBDA("b",lambdab, tableb); - CONSTRUCT_LAMBDA("g",lambdag, tableg); + Construct_lambda("h",lambdah, tableh); + Construct_lambda("b",lambdab, tableb); + Construct_lambda("g",lambdag, tableg); /* * Use the above to construct lambda