Skip to content
Snippets Groups Projects
Commit 0642830a authored by Izzard, Robert Dr (Maths & Physics)'s avatar Izzard, Robert Dr (Maths & Physics)
Browse files

fix size_t types

parent b89d15ca
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -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)
......
......@@ -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"
......
......@@ -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.
......
#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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment