Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
980a2ec5
Commit
980a2ec5
authored
Mar 1, 2018
by
Matthieu Schaller
Browse files
Options
Downloads
Plain Diff
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
!509
Cosmological time integration
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
examples/main.c
+1
-1
1 addition, 1 deletion
examples/main.c
with
1 addition
and
1 deletion
examples/main.c
+
1
−
1
View file @
980a2ec5
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment