From b6c7ea14dbc9d7ae3943f6ada997ca5aea76b771 Mon Sep 17 00:00:00 2001
From: Folkert Nobels <nobels@strw.leidenuniv.nl>
Date: Wed, 23 Jan 2019 14:23:49 +0100
Subject: [PATCH] Add hydro properties to initializing the star formation
routine
---
examples/main.c | 2 +-
src/starformation.c | 3 ++-
src/starformation.h | 1 +
src/starformation/none/starformation.h | 3 ++-
src/starformation/schaye08/starformation.h | 3 ++-
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/examples/main.c b/examples/main.c
index 3f558fe240..9117d67ff5 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -890,7 +890,7 @@ int main(int argc, char *argv[]) {
/* Initialise the star formation law and its properties */
if (with_star_formation)
- starformation_init(params, &prog_const, &us, &starform);
+ starformation_init(params, &prog_const, &us, &hydro_properties, &starform);
if (myrank == 0) starformation_print(&starform);
/* Initialise the chemistry */
diff --git a/src/starformation.c b/src/starformation.c
index b1c023c424..decba9d900 100644
--- a/src/starformation.c
+++ b/src/starformation.c
@@ -39,9 +39,10 @@
void starformation_init(struct swift_params* parameter_file,
const struct phys_const* phys_const,
const struct unit_system* us,
+ const struct hydro_props *hydro_props,
struct star_formation* starform) {
- starformation_init_backend(parameter_file, phys_const, us, starform);
+ starformation_init_backend(parameter_file, phys_const, us, hydro_props, starform);
}
/**
diff --git a/src/starformation.h b/src/starformation.h
index 43cc39f8ab..5158c9d48d 100644
--- a/src/starformation.h
+++ b/src/starformation.h
@@ -40,6 +40,7 @@
void starformation_init(struct swift_params* parameter_file,
const struct phys_const* phys_const,
const struct unit_system* us,
+ const struct hydro_props* hydro_props,
struct star_formation* starform);
void starformation_print(const struct star_formation* starform);
diff --git a/src/starformation/none/starformation.h b/src/starformation/none/starformation.h
index 6996558bd6..e4f5949d96 100644
--- a/src/starformation/none/starformation.h
+++ b/src/starformation/none/starformation.h
@@ -85,7 +85,8 @@ INLINE static void star_formation_copy_properties(
*/
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) {}
+ const struct unit_system* us, const struct hydro_props* hydro_props,
+ const struct star_formation* starform) {}
/**
* @brief Prints the used parameters of the star formation law
diff --git a/src/starformation/schaye08/starformation.h b/src/starformation/schaye08/starformation.h
index 414b2fdc47..6def6504a9 100644
--- a/src/starformation/schaye08/starformation.h
+++ b/src/starformation/schaye08/starformation.h
@@ -331,7 +331,8 @@ INLINE static void star_formation_copy_properties(
* */
INLINE static void starformation_init_backend(
struct swift_params* parameter_file, const struct phys_const* phys_const,
- const struct unit_system* us, struct star_formation* starform) {
+ const struct unit_system* us, const struct hydro_props* hydro_props,
+ struct star_formation* starform) {
/* Get the appropriate constant to calculate the
* star formation constant */
--
GitLab