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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
1b52f414
Commit
1b52f414
authored
5 years ago
by
Josh Borrow
Browse files
Options
Downloads
Patches
Plain Diff
Added output_options to main_fof
parent
d286ea31
No related branches found
No related tags found
1 merge request
!1088
Io selection changes
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
examples/main_fof.c
+18
-10
18 additions, 10 deletions
examples/main_fof.c
with
18 additions
and
10 deletions
examples/main_fof.c
+
18
−
10
View file @
1b52f414
...
...
@@ -346,6 +346,13 @@ int main(int argc, char *argv[]) {
MPI_Bcast
(
params
,
sizeof
(
struct
swift_params
),
MPI_BYTE
,
0
,
MPI_COMM_WORLD
);
#endif
/* "Read" the Select Output file - this should actually do nothing, but
* we need to mock the struct up for passing to `engine_init` */
struct
output_options
*
output_options
=
(
struct
output_options
*
)
malloc
(
sizeof
(
struct
output_options
));
output_options_init
(
params
,
myrank
,
output_options
);
/* Check that we can write the snapshots by testing if the output
* directory exists and is searchable and writable. */
char
basename
[
PARSER_MAX_LINE_SIZE
];
...
...
@@ -581,16 +588,17 @@ 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
[
swift_type_gas
],
N_total
[
swift_type_count
],
N_total
[
swift_type_stars
],
N_total
[
swift_type_black_hole
],
N_total
[
swift_type_dark_matter_background
],
engine_policies
,
talking
,
&
reparttype
,
&
us
,
&
prog_const
,
&
cosmo
,
/*hydro_properties=*/
NULL
,
/*entropy_floor=*/
NULL
,
&
gravity_properties
,
/*stars_properties=*/
NULL
,
/*black_holes_properties=*/
NULL
,
/*feedback_properties=*/
NULL
,
&
mesh
,
/*potential=*/
NULL
,
/*cooling_func=*/
NULL
,
/*starform=*/
NULL
,
/*chemistry=*/
NULL
,
&
fof_properties
,
/*los_properties=*/
NULL
);
engine_init
(
&
e
,
&
s
,
params
,
output_options
,
N_total
[
swift_type_gas
],
N_total
[
swift_type_count
],
N_total
[
swift_type_stars
],
N_total
[
swift_type_black_hole
],
N_total
[
swift_type_dark_matter_background
],
engine_policies
,
talking
,
&
reparttype
,
&
us
,
&
prog_const
,
&
cosmo
,
/*hydro_properties=*/
NULL
,
/*entropy_floor=*/
NULL
,
&
gravity_properties
,
/*stars_properties=*/
NULL
,
/*black_holes_properties=*/
NULL
,
/*feedback_properties=*/
NULL
,
&
mesh
,
/*potential=*/
NULL
,
/*cooling_func=*/
NULL
,
/*starform=*/
NULL
,
/*chemistry=*/
NULL
,
&
fof_properties
,
/*los_properties=*/
NULL
);
engine_config
(
/*restart=*/
0
,
/*fof=*/
1
,
&
e
,
params
,
nr_nodes
,
myrank
,
nr_threads
,
with_aff
,
talking
,
NULL
);
...
...
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
register
or
sign in
to comment