Skip to content
GitLab
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
cdeeb55a
Commit
cdeeb55a
authored
May 15, 2016
by
Matthieu Schaller
Browse files
Post-merge corrections
parent
09b49763
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/engine.c
View file @
cdeeb55a
...
...
@@ -158,7 +158,7 @@ void engine_make_hierarchical_tasks(struct engine *e, struct cell *c,
if
(
c
->
split
)
for
(
int
k
=
0
;
k
<
8
;
k
++
)
if
(
c
->
progeny
[
k
]
!=
NULL
)
engine_make_
ghost
_tasks
(
e
,
c
->
progeny
[
k
],
super
);
engine_make_
hierarchical
_tasks
(
e
,
c
->
progeny
[
k
],
super
);
}
/**
...
...
@@ -1453,8 +1453,7 @@ void engine_maketasks(struct engine *e) {
depend on the sorts of its progeny. */
engine_count_and_link_tasks
(
e
);
/* Append a hierarchical task to each cell, and add kick tasks to the
super cells. */
/* Append hierarchical tasks to each cells */
for
(
int
k
=
0
;
k
<
nr_cells
;
k
++
)
engine_make_hierarchical_tasks
(
e
,
&
cells
[
k
],
NULL
);
...
...
src/hydro/Minimal/hydro.h
View file @
cdeeb55a
...
...
@@ -117,7 +117,7 @@ __attribute__((always_inline))
/**
* @brief Prepare a particle for the force calculation.
*
* This function is called in the
hierarchy
task to convert some quantities coming
* This function is called in the
ghost
task to convert some quantities coming
* from the density loop over neighbours into quantities ready to be used in the
* force loop over neighbours. Quantities are typically read from the density
* sub-structure and written to the force sub-structure.
...
...
src/hydro/Minimal/hydro_part.h
View file @
cdeeb55a
...
...
@@ -22,7 +22,7 @@
*
* This structure contains the particle fields that are not used in the
* density or force loops. Quantities should be used in the kick, drift and
* potentially
hierarchical
tasks only.
* potentially
ghost
tasks only.
*/
struct
xpart
{
...
...
@@ -76,7 +76,7 @@ struct part {
* neighbours.
*
* Quantities in this sub-structure should only be accessed in the density
* loop over neighbours and the
hierarchy
task.
* loop over neighbours and the
ghost
task.
*/
struct
{
...
...
@@ -91,7 +91,7 @@ struct part {
* neighbours.
*
* Quantities in this sub-structure should only be accessed in the force
* loop over neighbours and the
hierarchy
and kick tasks.
* loop over neighbours and the
ghost
and kick tasks.
*/
struct
{
...
...
src/partition.c
View file @
cdeeb55a
...
...
@@ -454,7 +454,7 @@ static void repart_edge_metis(int partweights, int bothweights, int nodeID,
/* Skip un-interesting tasks. */
if
(
t
->
type
!=
task_type_self
&&
t
->
type
!=
task_type_pair
&&
t
->
type
!=
task_type_sub
&&
t
->
type
!=
task_type_
hierarchy
&&
t
->
type
!=
task_type_sub
&&
t
->
type
!=
task_type_
ghost
&&
t
->
type
!=
task_type_drift
&&
t
->
type
!=
task_type_kick
&&
t
->
type
!=
task_type_init
)
continue
;
...
...
@@ -488,7 +488,7 @@ static void repart_edge_metis(int partweights, int bothweights, int nodeID,
int
cid
=
ci
-
cells
;
/* Different weights for different tasks. */
if
(
t
->
type
==
task_type_
hierarchy
||
t
->
type
==
task_type_drift
||
if
(
t
->
type
==
task_type_
ghost
||
t
->
type
==
task_type_drift
||
t
->
type
==
task_type_kick
)
{
/* Particle updates add only to vertex weight. */
if
(
taskvweights
)
weights_v
[
cid
]
+=
w
;
...
...
src/scheduler.c
View file @
cdeeb55a
...
...
@@ -916,7 +916,7 @@ void scheduler_reweight(struct scheduler *s) {
}
else
t
->
weight
+=
1
*
wscale
*
t
->
ci
->
count
*
t
->
ci
->
count
;
break
;
case
task_type_
hierarchy
:
case
task_type_
ghost
:
if
(
t
->
ci
==
t
->
ci
->
super
)
t
->
weight
+=
wscale
*
t
->
ci
->
count
;
break
;
case
task_type_kick
:
...
...
@@ -1082,7 +1082,7 @@ void scheduler_enqueue(struct scheduler *s, struct task *t) {
switch
(
t
->
type
)
{
case
task_type_self
:
case
task_type_sort
:
case
task_type_
hierarchy
:
case
task_type_
ghost
:
case
task_type_kick
:
case
task_type_drift
:
case
task_type_init
:
...
...
src/space.c
View file @
cdeeb55a
...
...
@@ -350,7 +350,7 @@ void space_regrid(struct space *s, double cell_max, int verbose) {
s
->
cells
[
k
].
count
=
0
;
s
->
cells
[
k
].
gcount
=
0
;
s
->
cells
[
k
].
init
=
NULL
;
s
->
cells
[
k
].
hierarchy
=
NULL
;
s
->
cells
[
k
].
ghost
=
NULL
;
s
->
cells
[
k
].
drift
=
NULL
;
s
->
cells
[
k
].
kick
=
NULL
;
s
->
cells
[
k
].
super
=
&
s
->
cells
[
k
];
...
...
src/task.c
View file @
cdeeb55a
...
...
@@ -48,7 +48,7 @@
/* Task type names. */
const
char
*
taskID_names
[
task_type_count
]
=
{
"none"
,
"sort"
,
"self"
,
"pair"
,
"sub"
,
"init"
,
"
hierarchy
"
,
"drift"
,
"kick"
,
"send"
,
"init"
,
"
ghost
"
,
"drift"
,
"kick"
,
"send"
,
"recv"
,
"grav_pp"
,
"grav_mm"
,
"grav_up"
,
"grav_down"
,
"grav_external"
,
"part_sort"
,
"gpart_sort"
,
"split_cell"
,
"rewait"
};
...
...
src/task.h
View file @
cdeeb55a
...
...
@@ -39,7 +39,7 @@ enum task_types {
task_type_pair
,
task_type_sub
,
task_type_init
,
task_type_
hierarchy
,
task_type_
ghost
,
task_type_drift
,
task_type_kick
,
task_type_send
,
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment