Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
18eab64f
Commit
18eab64f
authored
Aug 12, 2019
by
Matthieu Schaller
Browse files
No need for the top-level implicit resort task.
parent
4916ecb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/cell.c
View file @
18eab64f
...
...
@@ -2406,7 +2406,6 @@ void cell_activate_star_formation_tasks(struct cell *c, struct scheduler *s) {
/* Activate the star formation task */
scheduler_activate
(
s
,
c
->
hydro
.
star_formation
);
scheduler_activate
(
s
,
c
->
hydro
.
stars_resort
);
/* Shallow tree case -> the resort task is at this level */
if
(
c
->
hydro
.
super
==
c
)
{
...
...
@@ -2418,7 +2417,6 @@ void cell_activate_star_formation_tasks(struct cell *c, struct scheduler *s) {
for
(
int
k
=
0
;
k
<
8
;
++
k
)
{
if
(
c
->
progeny
[
k
]
!=
NULL
)
{
message
(
"hello"
);
scheduler_activate
(
s
,
c
->
progeny
[
k
]
->
hydro
.
stars_resort
);
}
}
...
...
src/engine_maketasks.c
View file @
18eab64f
...
...
@@ -1000,9 +1000,6 @@ void engine_make_hierarchical_tasks_hydro(struct engine *e, struct cell *c,
c
->
hydro
.
stars_resort
=
scheduler_addtask
(
s
,
task_type_stars_resort
,
task_subtype_none
,
0
,
0
,
c
,
NULL
);
scheduler_addunlock
(
s
,
c
->
hydro
.
star_formation
,
c
->
hydro
.
stars_resort
);
}
else
{
c
->
hydro
.
stars_resort
=
scheduler_addtask
(
s
,
task_type_stars_resort
,
task_subtype_none
,
0
,
1
,
c
,
NULL
);
}
}
}
...
...
@@ -1018,7 +1015,6 @@ void engine_make_hierarchical_tasks_hydro(struct engine *e, struct cell *c,
scheduler_addunlock
(
s
,
c
->
top
->
hydro
.
star_formation
,
c
->
hydro
.
stars_resort
);
scheduler_addunlock
(
s
,
c
->
hydro
.
stars_resort
,
c
->
top
->
hydro
.
stars_resort
);
}
}
...
...
@@ -1111,7 +1107,8 @@ void engine_make_hierarchical_tasks_hydro(struct engine *e, struct cell *c,
scheduler_addunlock
(
s
,
c
->
stars
.
stars_out
,
c
->
super
->
timestep
);
if
(
with_star_formation
&&
c
->
hydro
.
count
>
0
)
{
scheduler_addunlock
(
s
,
c
->
top
->
hydro
.
stars_resort
,
c
->
stars
.
stars_in
);
scheduler_addunlock
(
s
,
star_resort_cell
->
hydro
.
stars_resort
,
c
->
stars
.
stars_in
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment