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
9277b927
Commit
9277b927
authored
Sep 23, 2018
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Do not break the dependency chain when activating gravity tasks if cooling is on.
parent
8ffa6ba3
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/cell.c
+2
-0
2 additions, 0 deletions
src/cell.c
src/engine.c
+3
-2
3 additions, 2 deletions
src/engine.c
with
5 additions
and
2 deletions
src/cell.c
+
2
−
0
View file @
9277b927
...
...
@@ -2493,6 +2493,8 @@ int cell_unskip_gravity_tasks(struct cell *c, struct scheduler *s) {
if
(
c
->
kick2
!=
NULL
)
scheduler_activate
(
s
,
c
->
kick2
);
if
(
c
->
timestep
!=
NULL
)
scheduler_activate
(
s
,
c
->
timestep
);
if
(
c
->
end_force
!=
NULL
)
scheduler_activate
(
s
,
c
->
end_force
);
if
((
e
->
policy
&
engine_policy_cooling
)
&&
c
->
cooling
!=
NULL
)
scheduler_activate
(
s
,
c
->
cooling
);
if
(
c
->
grav_down
!=
NULL
)
scheduler_activate
(
s
,
c
->
grav_down
);
if
(
c
->
grav_down_in
!=
NULL
)
scheduler_activate
(
s
,
c
->
grav_down_in
);
if
(
c
->
grav_mesh
!=
NULL
)
scheduler_activate
(
s
,
c
->
grav_mesh
);
...
...
...
...
This diff is collapsed.
Click to expand it.
src/engine.c
+
3
−
2
View file @
9277b927
...
...
@@ -3774,8 +3774,9 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
}
/* Subgrid tasks */
else
if
(
t_type
==
task_type_cooling
||
t_type
==
task_type_sourceterms
)
{
if
(
cell_is_active_hydro
(
t
->
ci
,
e
))
scheduler_activate
(
s
,
t
);
else
if
(
t_type
==
task_type_cooling
)
{
if
(
cell_is_active_hydro
(
t
->
ci
,
e
)
||
cell_is_active_gravity
(
t
->
ci
,
e
))
scheduler_activate
(
s
,
t
);
}
}
}
...
...
...
...
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