Skip to content
Snippets Groups Projects
Commit 980a2ec5 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'cosmology' of gitlab.cosma.dur.ac.uk:swift/swiftsim into cosmology

parents 8532b39d 32077428
No related branches found
No related tags found
1 merge request!509Cosmological time integration
...@@ -126,6 +126,7 @@ int main(int argc, char *argv[]) { ...@@ -126,6 +126,7 @@ int main(int argc, char *argv[]) {
* scope. */ * scope. */
struct chemistry_data chemistry; struct chemistry_data chemistry;
struct cooling_function_data cooling_func; struct cooling_function_data cooling_func;
struct cosmology cosmo;
struct external_potential potential; struct external_potential potential;
struct gpart *gparts = NULL; struct gpart *gparts = NULL;
struct gravity_props gravity_properties; struct gravity_props gravity_properties;
...@@ -601,7 +602,6 @@ int main(int argc, char *argv[]) { ...@@ -601,7 +602,6 @@ int main(int argc, char *argv[]) {
} }
/* Initialise the cosmology */ /* Initialise the cosmology */
struct cosmology cosmo;
if (with_cosmology) if (with_cosmology)
cosmology_init(params, &us, &prog_const, &cosmo); cosmology_init(params, &us, &prog_const, &cosmo);
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment