diff --git a/examples/main.c b/examples/main.c index b99710424578a038e309b6ecc966222d4e4433d3..7d4667c02d0ed98f0df106922884849c47b5b489 100644 --- a/examples/main.c +++ b/examples/main.c @@ -865,8 +865,8 @@ int main(int argc, char *argv[]) { /* Initialise the star formation law and its properties */ if (with_star_formation) - starformation_init(params, &prog_const, &us, &s, &starform); - if (myrank ==0) starformation_init(&starform); + starformation_init(params, &prog_const, &us, &starform); + if (myrank ==0) starformation_print(&starform); /* Initialise the chemistry */ bzero(&chemistry, sizeof(struct chemistry_global_data)); diff --git a/src/engine.c b/src/engine.c index bf936299470d5f0a6403823080c4d7b4f488e1a3..922cbb6a1b7219de92891e9ae0a1ee333a2a3465 100644 --- a/src/engine.c +++ b/src/engine.c @@ -90,7 +90,7 @@ #include "units.h" #include "velociraptor_interface.h" #include "version.h" -#include "starformation.h" +#include "starformation.h" /* Particle cache size. */ #define CACHE_SIZE 512 diff --git a/src/starformation/none/starformation.h b/src/starformation/none/starformation.h index 023ddf00b692f4b2d7f657adfd12a534f7c0606e..15928e073928c5c4020ec20f12fbf572261efdd4 100644 --- a/src/starformation/none/starformation.h +++ b/src/starformation/none/starformation.h @@ -46,7 +46,7 @@ struct star_formation {}; * @param cosmo the cosmological parameters and properties * * */ -int starformation_potential_to_become_star( +INLINE static int starformation_potential_to_become_star( const struct star_formation* starform, struct part* restrict p, const struct xpart* restrict xp, const struct phys_const* const phys_const, const struct cosmology* cosmo){ @@ -63,7 +63,7 @@ int starformation_potential_to_become_star( * @param cosmo the cosmological properties * * */ -void starformation_convert_to_gas( +INLINE static void starformation_convert_to_gas( const struct star_formation* starform, const struct part* restrict p, const struct xpart* restrict xp, const struct cosmology* cosmo) {} @@ -76,7 +76,7 @@ void starformation_convert_to_gas( * @param starform the star formation law properties to initialize * * */ -void starformation_init_backend( +INLINE static void starformation_init_backend( struct swift_params* parameter_file, const struct phys_const* phys_const, const struct unit_system* us, const struct star_formation* starform) {} @@ -84,7 +84,7 @@ void starformation_init_backend( * * @param starform the star formation law properties. * */ -void starformation_print_backend( +INLINE static void starformation_print_backend( const struct star_formation* starform){ message("Star formation law is 'No Star Formation'"); diff --git a/src/swift.h b/src/swift.h index 7279fc58b3b4ac0227c11b8a835c829df2ceb49c..3a362fe9cea7c78e52307c405607c65b75654374 100644 --- a/src/swift.h +++ b/src/swift.h @@ -76,5 +76,6 @@ #include "units.h" #include "velociraptor_interface.h" #include "version.h" +#include "starformation.h" #endif /* SWIFT_SWIFT_H */