diff --git a/src/librinterpolate/rinterpolate_alloc_hypertable.c b/src/librinterpolate/rinterpolate_alloc_hypertable.c index cdaf31d7d12c564954f654289203f7302772c547..16579e5861d90ff79736a8d0e2913085ab97a56d 100644 --- a/src/librinterpolate/rinterpolate_alloc_hypertable.c +++ b/src/librinterpolate/rinterpolate_alloc_hypertable.c @@ -26,7 +26,7 @@ void rinterpolate_alloc_hypertable(struct rinterpolate_table_t * RESTRICT const table->hypertable->sum = Rinterpolate_calloc(1,table->sum_sizeof); #ifdef RINTERPOLATE_DEBUG - Rinterpolate_print("MALLOC data at %p size %ld, f at %p size %ld, sum at %p size %ld\n", + Rinterpolate_print("MALLOC data at %p size %zu, f at %p size %zu, sum at %p size %zu\n", table->hypertable->data,table->hypertable_length*table->line_length_sizeof, table->hypertable->f,table->n_float_sizeof, table->hypertable->sum,table->sum_sizeof); @@ -43,7 +43,7 @@ void rinterpolate_alloc_hypertable(struct rinterpolate_table_t * RESTRICT const #endif//RINTERPOLATE_ALLOC_CHECKS #ifdef RINTERPOLATE_DEBUG - Rinterpolate_print("table->hypertable->data alloc 2 * %d * %ld\n",table->hypertable_length,table->line_length_sizeof); + Rinterpolate_print("table->hypertable->data alloc 2 * %d * %zu\n",table->hypertable_length,table->line_length_sizeof); #endif #ifdef RINTERPOLATE_USE_REALLOC @@ -54,4 +54,4 @@ void rinterpolate_alloc_hypertable(struct rinterpolate_table_t * RESTRICT const } #endif // __HAVE_LIBRINTERPOLATE__ - \ No newline at end of file + diff --git a/src/nucsyn/nucsyn_function_macros.h b/src/nucsyn/nucsyn_function_macros.h index efbe4943608d83899adcf6b21f041342369fd8b5..fd3a4f50dd383825da1160819a74070d9065ab39 100644 --- a/src/nucsyn/nucsyn_function_macros.h +++ b/src/nucsyn/nucsyn_function_macros.h @@ -3,7 +3,21 @@ #define NUCSYN_FUNCTION_MACROS_H #ifdef NUCSYN /* - * Function macros for nucleosynthesis + * The binary_c stellar population nucleosynthesis framework. + * + * Contact: r.izzard@surrey.ac.uk or rob.izzard@gmail.com + * + * http://personal.ph.surrey.ac.uk/~ri0005/binary_c.html + * https://gitlab.eps.surrey.ac.uk/ri0005/binary_c + * https://groups.google.com/forum/#!forum/binary_c-nucsyn-announce + * https://groups.google.com/forum/#!forum/binary_c-nucsyn-devel + * https://twitter.com/binary_c_code + * https://www.facebook.com/groups/149489915089142/ + * + * Please see the files README, LICENCE and CHANGES + * + * + * This file contains function macros used for nucleosynthesis. */ /* @@ -21,7 +35,11 @@ /* define conditions for burning of the dredge-up material */ -#define Third_dredge_up_burning_conditions(A,B) ((A>=T_MIN_HBB)&&(B>=RHO_MIN_HBB)&&((m0>nucsyn_mhbbmin(stardata->common.metallicity))||(stardata->common.metallicity<=0.004))) +#define Third_dredge_up_burning_conditions(TEMP,DENS) \ + ((TEMP >= T_MIN_HBB) && \ + (DENS >= RHO_MIN_HBB) && \ + (m0 > nucsyn_mhbbmin(stardata->common.metallicity) || \ + stardata->common.metallicity <= 0.004)) /* or NEVER dup burn */ //#define Third_dredge_up_burning_conditions(A,B) (1==0) diff --git a/src/nucsyn/nucsyn_macros.h b/src/nucsyn/nucsyn_macros.h index 415076110e8897c29657eb08cc2533122d88e804..254c5ea53f05a9d14aaa2fa39da3dc43ec1607a9 100644 --- a/src/nucsyn/nucsyn_macros.h +++ b/src/nucsyn/nucsyn_macros.h @@ -5,9 +5,23 @@ #include "../binary_c_parameters.h" #ifdef NUCSYN - /* - * Macros for nucleosynthesis in binary_c + * The binary_c stellar population nucleosynthesis framework. + * + * Contact: r.izzard@surrey.ac.uk or rob.izzard@gmail.com + * + * http://personal.ph.surrey.ac.uk/~ri0005/binary_c.html + * https://gitlab.eps.surrey.ac.uk/ri0005/binary_c + * https://groups.google.com/forum/#!forum/binary_c-nucsyn-announce + * https://groups.google.com/forum/#!forum/binary_c-nucsyn-devel + * https://twitter.com/binary_c_code + * https://www.facebook.com/groups/149489915089142/ + * + * Please see the files README, LICENCE and CHANGES + * + * + * This file contains macros for nucleosynthesis in binary_c, + * while function macros are in nucsyn_function_macros.h */ #include "nucsyn_sources.h" diff --git a/src/nucsyn/nucsyn_parameters.h b/src/nucsyn/nucsyn_parameters.h index ced7976af93f7aa6dd6898a661c89fef1210c7bc..0b67abc82d463c04c7c6059f572219758b8ce0dd 100644 --- a/src/nucsyn/nucsyn_parameters.h +++ b/src/nucsyn/nucsyn_parameters.h @@ -4,8 +4,21 @@ #include "../binary_c_parameters.h" #ifdef NUCSYN - /* + * The binary_c stellar population nucleosynthesis framework. + * + * Contact: r.izzard@surrey.ac.uk or rob.izzard@gmail.com + * + * http://personal.ph.surrey.ac.uk/~ri0005/binary_c.html + * https://gitlab.eps.surrey.ac.uk/ri0005/binary_c + * https://groups.google.com/forum/#!forum/binary_c-nucsyn-announce + * https://groups.google.com/forum/#!forum/binary_c-nucsyn-devel + * https://twitter.com/binary_c_code + * https://www.facebook.com/groups/149489915089142/ + * + * Please see the files README, LICENCE and CHANGES + * + * * nucsyn_parameters.h * * @@ -17,6 +30,9 @@ * nucleosynthesis routines. */ + + + /* * Enable tabular strip/dredge up, based on RI's models * made for 1e-4<Z<0.03, 0.8<M<20 using the TWIN code. diff --git a/src/nucsyn/nucsyn_prototypes.h b/src/nucsyn/nucsyn_prototypes.h index 88c5621fda560125832c1f4e4b18ae600ade3c65..9786d826dddfe12ac8c3a7856cfef696a5a0d17d 100644 --- a/src/nucsyn/nucsyn_prototypes.h +++ b/src/nucsyn/nucsyn_prototypes.h @@ -1,6 +1,20 @@ #pragma once - -/* Prototypes for the nucsyn library */ +/* + * The binary_c stellar population nucleosynthesis framework. + * + * Contact: r.izzard@surrey.ac.uk or rob.izzard@gmail.com + * + * http://personal.ph.surrey.ac.uk/~ri0005/binary_c.html + * https://gitlab.eps.surrey.ac.uk/ri0005/binary_c + * https://groups.google.com/forum/#!forum/binary_c-nucsyn-announce + * https://groups.google.com/forum/#!forum/binary_c-nucsyn-devel + * https://twitter.com/binary_c_code + * https://www.facebook.com/groups/149489915089142/ + * + * Please see the files README, LICENCE and CHANGES + * + * This file contains prototypes for the nucsyn library + */ #ifndef NUCSYN_PROTOTYPES_H #define NUCSYN_PROTOTYPES_H