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
85579ae9
Commit
85579ae9
authored
7 years ago
by
Pedro Gonnet
Browse files
Options
Downloads
Patches
Plain Diff
don't activate drift tasks, just mark the cells.
parent
bb45f537
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!343
Subset sorting
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/cell.h
+1
-0
1 addition, 0 deletions
src/cell.h
src/engine.c
+10
-16
10 additions, 16 deletions
src/engine.c
with
11 additions
and
16 deletions
src/cell.h
+
1
−
0
View file @
85579ae9
...
...
@@ -395,6 +395,7 @@ void cell_check_timesteps(struct cell *c);
void
cell_store_pre_drift_values
(
struct
cell
*
c
);
void
cell_activate_subcell_tasks
(
struct
cell
*
ci
,
struct
cell
*
cj
,
struct
scheduler
*
s
);
void
cell_activate_drift_part
(
struct
cell
*
c
,
struct
scheduler
*
s
);
/* Inlined functions (for speed). */
...
...
This diff is collapsed.
Click to expand it.
src/engine.c
+
10
−
16
View file @
85579ae9
...
...
@@ -2591,7 +2591,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
if
(
!
(
ci
->
sorted
&
(
1
<<
t
->
flags
))
||
ci
->
nodeID
!=
engine_rank
)
{
atomic_or
(
&
ci
->
sorts
->
flags
,
(
1
<<
t
->
flags
));
scheduler_activate
(
s
,
ci
->
sorts
);
if
(
ci
->
nodeID
==
engine_rank
)
scheduler
_activate
(
s
,
ci
->
drift_part
);
if
(
ci
->
nodeID
==
engine_rank
)
cell
_activate
_
drift_part
(
ci
,
s
);
}
if
(
cj
->
dx_max_sort
>
space_maxreldx
*
cj
->
dmin
)
{
for
(
struct
cell
*
finger
=
cj
;
finger
!=
NULL
;
...
...
@@ -2606,7 +2606,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
if
(
!
(
cj
->
sorted
&
(
1
<<
t
->
flags
))
||
cj
->
nodeID
!=
engine_rank
)
{
atomic_or
(
&
cj
->
sorts
->
flags
,
(
1
<<
t
->
flags
));
scheduler_activate
(
s
,
cj
->
sorts
);
if
(
cj
->
nodeID
==
engine_rank
)
scheduler
_activate
(
s
,
cj
->
drift_part
);
if
(
cj
->
nodeID
==
engine_rank
)
cell
_activate
_
drift_part
(
cj
,
s
);
}
}
/* Store current values of dx_max and h_max. */
...
...
@@ -2637,11 +2637,8 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
scheduler_activate
(
s
,
l
->
t
);
/* Drift both cells, the foreign one at the level which it is sent. */
if
(
l
->
t
->
ci
->
drift_part
)
scheduler_activate
(
s
,
l
->
t
->
ci
->
drift_part
);
else
error
(
"Drift task missing !"
);
if
(
t
->
type
==
task_type_pair
)
scheduler_activate
(
s
,
cj
->
drift_part
);
cell_activate_drift_part
(
l
->
t
->
ci
,
s
);
if
(
t
->
type
==
task_type_pair
)
cell_activate_drift_part
(
cj
,
s
);
if
(
cell_is_active
(
cj
,
e
))
{
for
(
l
=
cj
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
ci
->
nodeID
;
...
...
@@ -2686,11 +2683,8 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
scheduler_activate
(
s
,
l
->
t
);
/* Drift both cells, the foreign one at the level which it is sent. */
if
(
l
->
t
->
ci
->
drift_part
)
scheduler_activate
(
s
,
l
->
t
->
ci
->
drift_part
);
else
error
(
"Drift task missing !"
);
if
(
t
->
type
==
task_type_pair
)
scheduler_activate
(
s
,
ci
->
drift_part
);
cell_activate_drift_part
(
l
->
t
->
ci
,
s
);
if
(
t
->
type
==
task_type_pair
)
cell_activate_drift_part
(
ci
,
s
);
if
(
cell_is_active
(
ci
,
e
))
{
for
(
l
=
ci
->
send_rho
;
l
!=
NULL
&&
l
->
t
->
cj
->
nodeID
!=
cj
->
nodeID
;
...
...
@@ -2715,13 +2709,13 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
}
}
else
if
(
t
->
type
==
task_type_pair
)
{
/* ci and cj on same node */
scheduler
_activate
(
s
,
ci
->
drift_part
);
scheduler
_activate
(
s
,
cj
->
drift_part
);
cell
_activate
_
drift_part
(
ci
,
s
);
cell
_activate
_
drift_part
(
cj
,
s
);
}
#else
if
(
t
->
type
==
task_type_pair
)
{
scheduler
_activate
(
s
,
ci
->
drift_part
);
scheduler
_activate
(
s
,
cj
->
drift_part
);
cell
_activate
_
drift_part
(
ci
,
s
);
cell
_activate
_
drift_part
(
cj
,
s
);
}
#endif
}
...
...
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