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
bc56ac5a
Commit
bc56ac5a
authored
6 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Link the star communication tasks to the correct super cell.
parent
38ec5e44
Branches
Branches containing commit
No related tags found
2 merge requests
!745
Rewrite of MPI loops - Add stellar feedback loops
,
!744
Mpi stars2 matthieu
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/engine_maketasks.c
+3
-4
3 additions, 4 deletions
src/engine_maketasks.c
src/task.c
+3
-4
3 additions, 4 deletions
src/task.c
with
6 additions
and
8 deletions
src/engine_maketasks.c
+
3
−
4
View file @
bc56ac5a
...
@@ -270,11 +270,10 @@ void engine_addtasks_send_stars(struct engine *e, struct cell *ci,
...
@@ -270,11 +270,10 @@ void engine_addtasks_send_stars(struct engine *e, struct cell *ci,
ci
->
mpi
.
tag
,
0
,
ci
,
cj
);
ci
->
mpi
.
tag
,
0
,
ci
,
cj
);
/* The send_stars task should unlock the super_cell's kick task. */
/* The send_stars task should unlock the super_cell's kick task. */
// scheduler_addunlock(s, t_feed, ci->super->end_force);
scheduler_addunlock
(
s
,
t_feed
,
ci
->
hydro
.
super
->
stars
.
stars_out
);
error
(
"need implementing"
);
/* Ghost before you send */
/* Ghost before you send */
//
scheduler_addunlock(s, ci->hydro.super->stars.ghost
_out
, t_feed);
scheduler_addunlock
(
s
,
ci
->
hydro
.
super
->
stars
.
ghost
,
t_feed
);
}
}
if
(
hydro
==
NULL
)
{
if
(
hydro
==
NULL
)
{
...
@@ -2755,7 +2754,7 @@ void engine_maketasks(struct engine *e) {
...
@@ -2755,7 +2754,7 @@ void engine_maketasks(struct engine *e) {
/* Free the old list of cell-task links. */
/* Free the old list of cell-task links. */
if
(
e
->
links
!=
NULL
)
free
(
e
->
links
);
if
(
e
->
links
!=
NULL
)
free
(
e
->
links
);
e
->
size_links
=
e
->
sched
.
nr_tasks
*
e
->
links_per_tasks
;
e
->
size_links
=
e
->
sched
.
nr_tasks
*
e
->
links_per_tasks
*
2
;
/* Make sure that we have space for more links than last time. */
/* Make sure that we have space for more links than last time. */
if
(
e
->
size_links
<
e
->
nr_links
*
engine_rebuild_link_alloc_margin
)
if
(
e
->
size_links
<
e
->
nr_links
*
engine_rebuild_link_alloc_margin
)
...
...
This diff is collapsed.
Click to expand it.
src/task.c
+
3
−
4
View file @
bc56ac5a
...
@@ -681,10 +681,9 @@ void task_get_group_name(int type, int subtype, char *cluster) {
...
@@ -681,10 +681,9 @@ void task_get_group_name(int type, int subtype, char *cluster) {
break
;
break
;
case
task_subtype_gradient
:
case
task_subtype_gradient
:
if
(
type
==
task_type_send
||
type
==
task_type_recv
)
{
if
(
type
==
task_type_send
||
type
==
task_type_recv
)
{
strcpy
(
cluster
,
"None"
);
strcpy
(
cluster
,
"None"
);
}
}
else
{
else
{
strcpy
(
cluster
,
"Gradient"
);
strcpy
(
cluster
,
"Gradient"
);
}
}
break
;
break
;
case
task_subtype_force
:
case
task_subtype_force
:
...
...
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