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
da5b1073
Commit
da5b1073
authored
Dec 01, 2017
by
Matthieu Schaller
Browse files
Code formatting
parent
171dddb5
Changes
5
Show whitespace changes
Inline
Side-by-side
src/engine.c
View file @
da5b1073
...
...
@@ -4489,17 +4489,14 @@ void engine_makeproxies(struct engine *e) {
const
int
cjd
=
cell_getid
(
cdim
,
ii
,
jj
,
kk
);
/* Early abort (same cell) */
if
(
cid
==
cjd
)
continue
;
if
(
cid
==
cjd
)
continue
;
/* Early abort (both same node) */
if
(
cells
[
cid
].
nodeID
==
nodeID
&&
cells
[
cjd
].
nodeID
==
nodeID
)
if
(
cells
[
cid
].
nodeID
==
nodeID
&&
cells
[
cjd
].
nodeID
==
nodeID
)
continue
;
/* Early abort (both foreign node) */
if
(
cells
[
cid
].
nodeID
!=
nodeID
&&
cells
[
cjd
].
nodeID
!=
nodeID
)
if
(
cells
[
cid
].
nodeID
!=
nodeID
&&
cells
[
cjd
].
nodeID
!=
nodeID
)
continue
;
char
proxy_type
=
proxy_cell_type_none
;
...
...
@@ -4546,12 +4543,10 @@ void engine_makeproxies(struct engine *e) {
}
/* Abort if not in range at all */
if
(
proxy_type
==
proxy_cell_type_none
)
continue
;
if
(
proxy_type
==
proxy_cell_type_none
)
continue
;
/* Add to proxies? */
if
(
cells
[
cid
].
nodeID
==
nodeID
&&
cells
[
cjd
].
nodeID
!=
nodeID
)
{
if
(
cells
[
cid
].
nodeID
==
nodeID
&&
cells
[
cjd
].
nodeID
!=
nodeID
)
{
/* Do we already have a relationship with this node? */
int
pid
=
e
->
proxy_ind
[
cells
[
cjd
].
nodeID
];
...
...
@@ -4578,8 +4573,7 @@ void engine_makeproxies(struct engine *e) {
}
/* Same for the symmetric case? */
if
(
cells
[
cjd
].
nodeID
==
nodeID
&&
cells
[
cid
].
nodeID
!=
nodeID
)
{
if
(
cells
[
cjd
].
nodeID
==
nodeID
&&
cells
[
cid
].
nodeID
!=
nodeID
)
{
/* Do we already have a relationship with this node? */
int
pid
=
e
->
proxy_ind
[
cells
[
cid
].
nodeID
];
...
...
src/parallel_io.c
View file @
da5b1073
...
...
@@ -279,8 +279,8 @@ void writeArray_chunk(struct engine* e, hid_t h_data, hid_t h_plist_id,
#ifdef IO_SPEED_MEASUREMENT
MPI_Barrier
(
MPI_COMM_WORLD
);
if
(
engine_rank
==
0
)
message
(
"Copying for '%s' took %.3f %s."
,
props
.
name
,
if
(
engine_rank
==
0
)
message
(
"Copying for '%s' took %.3f %s."
,
props
.
name
,
clocks_from_ticks
(
getticks
()
-
tic
),
clocks_getunit
());
#endif
...
...
@@ -324,9 +324,9 @@ void writeArray_chunk(struct engine* e, hid_t h_data, hid_t h_plist_id,
H5Sselect_none
(
h_filespace
);
}
/* message("Writing %lld '%s', %zd elements = %zd bytes (int=%d) at offset
/* message("Writing %lld '%s', %zd elements = %zd bytes (int=%d) at offset
* %zd", N, props.name, N * props.dimension, N * props.dimension * typeSize, */
/* (int)(N * props.dimension * typeSize), offset); */
/* (int)(N * props.dimension * typeSize), offset); */
#ifdef IO_SPEED_MEASUREMENT
MPI_Barrier
(
MPI_COMM_WORLD
);
...
...
@@ -502,8 +502,8 @@ void writeArray(struct engine* e, hid_t grp, char* fileName, FILE* xmfFile,
#ifdef IO_SPEED_MEASUREMENT
MPI_Barrier
(
MPI_COMM_WORLD
);
if
(
engine_rank
==
0
)
message
(
"'%s' took %.3f %s."
,
props
.
name
,
if
(
engine_rank
==
0
)
message
(
"'%s' took %.3f %s."
,
props
.
name
,
clocks_from_ticks
(
getticks
()
-
tic
),
clocks_getunit
());
#endif
}
...
...
src/partition.c
View file @
da5b1073
...
...
@@ -581,7 +581,8 @@ static void repart_edge_metis(int partweights, int bothweights, int timebins,
t
->
type
==
task_type_ghost
||
t
->
type
==
task_type_extra_ghost
||
t
->
type
==
task_type_kick1
||
t
->
type
==
task_type_kick2
||
t
->
type
==
task_type_timestep
||
t
->
type
==
task_type_init_grav
||
t
->
type
==
task_type_grav_down
||
t
->
type
==
task_type_grav_long_range
)
{
t
->
type
==
task_type_grav_down
||
t
->
type
==
task_type_grav_long_range
)
{
/* Particle updates add only to vertex weight. */
if
(
taskvweights
)
weights_v
[
cid
]
+=
w
;
...
...
src/proxy.c
View file @
da5b1073
...
...
@@ -456,8 +456,8 @@ void proxy_init(struct proxy *p, int mynodeID, int nodeID) {
if
((
p
->
cells_in
=
(
struct
cell
**
)
malloc
(
sizeof
(
void
*
)
*
p
->
size_cells_in
))
==
NULL
)
error
(
"Failed to allocate cells_in buffer."
);
if
((
p
->
cells_in_type
=
(
char
*
)
malloc
(
sizeof
(
char
)
*
p
->
size_cells_in
))
==
NULL
)
if
((
p
->
cells_in_type
=
(
char
*
)
malloc
(
sizeof
(
char
)
*
p
->
size_cells_in
))
==
NULL
)
error
(
"Failed to allocate cells_in_type buffer."
);
}
p
->
nr_cells_in
=
0
;
...
...
src/proxy.h
View file @
da5b1073
...
...
@@ -41,8 +41,8 @@
*/
enum
proxy_cell_type
{
proxy_cell_type_none
=
0
,
proxy_cell_type_hydro
=
(
1
<<
0
),
proxy_cell_type_gravity
=
(
1
<<
1
)
proxy_cell_type_hydro
=
(
1
<<
0
),
proxy_cell_type_gravity
=
(
1
<<
1
)
};
/* Data structure for the proxy. */
...
...
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