From 7ef098631a22de7c49f8e2393fefc661a282665f Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Mon, 12 Feb 2018 10:06:31 +0100
Subject: [PATCH] On start-up, pass the cosmology model to the engine.
---
examples/main.c | 12 +++++-------
src/engine.c | 3 ++-
src/engine.h | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/examples/main.c b/examples/main.c
index 9952317899..b38347c3b0 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -771,9 +771,9 @@ int main(int argc, char *argv[]) {
/* Initialize the engine with the space and policies. */
if (myrank == 0) clocks_gettime(&tic);
engine_init(&e, &s, params, N_total[0], N_total[1], engine_policies,
- talking, &reparttype, &us, &prog_const, &hydro_properties,
- &gravity_properties, &potential, &cooling_func, &chemistry,
- &sourceterms);
+ talking, &reparttype, &us, &prog_const, &cosmo,
+ &hydro_properties, &gravity_properties, &potential,
+ &cooling_func, &chemistry, &sourceterms);
engine_config(0, &e, params, nr_nodes, myrank, nr_threads, with_aff,
talking, restart_file);
if (myrank == 0) {
@@ -869,8 +869,7 @@ int main(int argc, char *argv[]) {
if (with_verbose_timers) timers_print(e.step);
/* Every so often allow the user to stop the application and dump the
- * restart
- * files. */
+ * restart files. */
if (j % restart_stop_steps == 0) {
force_stop = restart_stop_now(restart_dir, 0);
if (myrank == 0 && force_stop)
@@ -878,8 +877,7 @@ int main(int argc, char *argv[]) {
}
/* Also if using nsteps to exit, will not have saved any restarts on exit,
- * make
- * sure we do that (useful in testing only). */
+ * make sure we do that (useful in testing only). */
if (force_stop || (e.restart_onexit && e.step - 1 == nsteps))
engine_dump_restarts(&e, 0, 1);
diff --git a/src/engine.c b/src/engine.c
index 69c5a5d49f..d4fad48456 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -5173,7 +5173,7 @@ void engine_init(
struct engine *e, struct space *s, const struct swift_params *params,
long long Ngas, long long Ndm, int policy, int verbose,
struct repartition *reparttype, const struct unit_system *internal_units,
- const struct phys_const *physical_constants,
+ const struct phys_const *physical_constants, struct cosmology *cosmo,
const struct hydro_props *hydro, const struct gravity_props *gravity,
const struct external_potential *potential,
const struct cooling_function_data *cooling_func,
@@ -5222,6 +5222,7 @@ void engine_init(
e->count_step = 0;
e->wallclock_time = 0.f;
e->physical_constants = physical_constants;
+ e->cosmology = cosmo;
e->hydro_properties = hydro;
e->gravity_properties = gravity;
e->external_potential = potential;
diff --git a/src/engine.h b/src/engine.h
index 396c24ef6c..288a24bdba 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -328,7 +328,7 @@ void engine_init(
struct engine *e, struct space *s, const struct swift_params *params,
long long Ngas, long long Ndm, int policy, int verbose,
struct repartition *reparttype, const struct unit_system *internal_units,
- const struct phys_const *physical_constants,
+ const struct phys_const *physical_constants, struct cosmology *cosmo,
const struct hydro_props *hydro, const struct gravity_props *gravity,
const struct external_potential *potential,
const struct cooling_function_data *cooling_func,
--
GitLab