Skip to content
Snippets Groups Projects
Commit ca7dc254 authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Missed changes in merge from master

parent 1f6d9af6
Branches
No related tags found
1 merge request!491Add restart facility
...@@ -705,12 +705,12 @@ int main(int argc, char *argv[]) { ...@@ -705,12 +705,12 @@ int main(int argc, char *argv[]) {
struct external_potential potential; struct external_potential potential;
if (with_external_gravity) if (with_external_gravity)
potential_init(params, &prog_const, &us, &s, &potential); potential_init(params, &prog_const, &us, &s, &potential);
if (with_external_gravity && myrank == 0) potential_print(&potential); if (myrank == 0) potential_print(&potential);
/* Initialise the cooling function properties */ /* Initialise the cooling function properties */
struct cooling_function_data cooling_func; struct cooling_function_data cooling_func;
if (with_cooling) cooling_init(params, &us, &prog_const, &cooling_func); if (with_cooling) cooling_init(params, &us, &prog_const, &cooling_func);
if (with_cooling && myrank == 0) cooling_print(&cooling_func); if (myrank == 0) cooling_print(&cooling_func);
/* Initialise the chemistry */ /* Initialise the chemistry */
struct chemistry_data chemistry; struct chemistry_data chemistry;
...@@ -720,7 +720,7 @@ int main(int argc, char *argv[]) { ...@@ -720,7 +720,7 @@ int main(int argc, char *argv[]) {
/* Initialise the feedback properties */ /* Initialise the feedback properties */
struct sourceterms sourceterms; struct sourceterms sourceterms;
if (with_sourceterms) sourceterms_init(params, &us, &sourceterms); if (with_sourceterms) sourceterms_init(params, &us, &sourceterms);
if (with_sourceterms && myrank == 0) sourceterms_print(&sourceterms); if (sourceterms && myrank == 0) sourceterms_print(&sourceterms);
/* Construct the engine policy */ /* Construct the engine policy */
int engine_policies = ENGINE_POLICY | engine_policy_steal; int engine_policies = ENGINE_POLICY | engine_policy_steal;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment