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
4761883e
Commit
4761883e
authored
Jan 10, 2016
by
Pedro Gonnet
Browse files
fix formatting in cell.c.
parent
461885a4
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cell.c
View file @
4761883e
...
...
@@ -59,11 +59,12 @@ int cell_next_tag = 0;
int
cell_getsize
(
struct
cell
*
c
)
{
int
k
,
count
=
1
;
/* Number of cells in this subtree. */
int
count
=
1
;
/* Sum up the progeny if split. */
if
(
c
->
split
)
for
(
k
=
0
;
k
<
8
;
k
++
)
for
(
int
k
=
0
;
k
<
8
;
k
++
)
if
(
c
->
progeny
[
k
]
!=
NULL
)
count
+=
cell_getsize
(
c
->
progeny
[
k
]);
/* Return the final count. */
...
...
@@ -82,9 +83,6 @@ int cell_getsize(struct cell *c) {
int
cell_unpack
(
struct
pcell
*
pc
,
struct
cell
*
c
,
struct
space
*
s
)
{
int
k
,
count
=
1
;
struct
cell
*
temp
;
/* Unpack the current pcell. */
c
->
h_max
=
pc
->
h_max
;
c
->
dt_min
=
FLT_MAX
;
// pc->dt_min;
...
...
@@ -93,9 +91,10 @@ int cell_unpack(struct pcell *pc, struct cell *c, struct space *s) {
c
->
tag
=
pc
->
tag
;
/* Fill the progeny recursively, depth-first. */
for
(
k
=
0
;
k
<
8
;
k
++
)
int
count
=
1
;
for
(
int
k
=
0
;
k
<
8
;
k
++
)
if
(
pc
->
progeny
[
k
]
>=
0
)
{
temp
=
space_getcell
(
s
);
struct
cell
*
temp
=
space_getcell
(
s
);
temp
->
count
=
0
;
temp
->
loc
[
0
]
=
c
->
loc
[
0
];
temp
->
loc
[
1
]
=
c
->
loc
[
1
];
...
...
@@ -132,14 +131,16 @@ int cell_unpack(struct pcell *pc, struct cell *c, struct space *s) {
int
cell_link
(
struct
cell
*
c
,
struct
part
*
parts
)
{
int
k
,
ind
=
0
;
c
->
parts
=
parts
;
/* Fill the progeny recursively, depth-first. */
if
(
c
->
split
)
for
(
k
=
0
;
k
<
8
;
k
++
)
if
(
c
->
progeny
[
k
]
!=
NULL
)
ind
+=
cell_link
(
c
->
progeny
[
k
],
&
parts
[
ind
]);
if
(
c
->
split
)
{
int
offset
=
0
;
for
(
int
k
=
0
;
k
<
8
;
k
++
)
{
if
(
c
->
progeny
[
k
]
!=
NULL
)
offset
+=
cell_link
(
c
->
progeny
[
k
],
&
parts
[
offset
]);
}
}
/* Return the total number of unpacked cells. */
return
c
->
count
;
...
...
@@ -157,8 +158,6 @@ int cell_link(struct cell *c, struct part *parts) {
int
cell_pack
(
struct
cell
*
c
,
struct
pcell
*
pc
)
{
int
k
,
count
=
1
;
/* Start by packing the data of the current cell. */
pc
->
h_max
=
c
->
h_max
;
pc
->
dt_min
=
c
->
dt_min
;
...
...
@@ -167,7 +166,8 @@ int cell_pack(struct cell *c, struct pcell *pc) {
c
->
tag
=
pc
->
tag
=
atomic_inc
(
&
cell_next_tag
)
%
cell_max_tag
;
/* Fill in the progeny, depth-first recursion. */
for
(
k
=
0
;
k
<
8
;
k
++
)
int
count
=
1
;
for
(
int
k
=
0
;
k
<
8
;
k
++
)
if
(
c
->
progeny
[
k
]
!=
NULL
)
{
pc
->
progeny
[
k
]
=
count
;
count
+=
cell_pack
(
c
->
progeny
[
k
],
&
pc
[
count
]);
...
...
@@ -186,7 +186,6 @@ int cell_pack(struct cell *c, struct pcell *pc) {
int
cell_locktree
(
struct
cell
*
c
)
{
struct
cell
*
finger
,
*
finger2
;
TIMER_TIC
/* First of all, try to lock this cell. */
...
...
@@ -207,6 +206,7 @@ int cell_locktree(struct cell *c) {
}
/* Climb up the tree and lock/hold/unlock. */
struct
cell
*
finger
;
for
(
finger
=
c
->
parent
;
finger
!=
NULL
;
finger
=
finger
->
parent
)
{
/* Lock this cell. */
...
...
@@ -229,7 +229,8 @@ int cell_locktree(struct cell *c) {
else
{
/* Undo the holds up to finger. */
for
(
finger2
=
c
->
parent
;
finger2
!=
finger
;
finger2
=
finger2
->
parent
)
for
(
struct
cell
*
finger2
=
c
->
parent
;
finger2
!=
finger
;
finger2
=
finger2
->
parent
)
__sync_fetch_and_sub
(
&
finger2
->
hold
,
1
);
/* Unlock this cell. */
...
...
@@ -243,7 +244,6 @@ int cell_locktree(struct cell *c) {
int
cell_glocktree
(
struct
cell
*
c
)
{
struct
cell
*
finger
,
*
finger2
;
TIMER_TIC
/* First of all, try to lock this cell. */
...
...
@@ -264,6 +264,7 @@ int cell_glocktree(struct cell *c) {
}
/* Climb up the tree and lock/hold/unlock. */
struct
cell
*
finger
;
for
(
finger
=
c
->
parent
;
finger
!=
NULL
;
finger
=
finger
->
parent
)
{
/* Lock this cell. */
...
...
@@ -286,7 +287,8 @@ int cell_glocktree(struct cell *c) {
else
{
/* Undo the holds up to finger. */
for
(
finger2
=
c
->
parent
;
finger2
!=
finger
;
finger2
=
finger2
->
parent
)
for
(
struct
cell
*
finger2
=
c
->
parent
;
finger2
!=
finger
;
finger2
=
finger2
->
parent
)
__sync_fetch_and_sub
(
&
finger2
->
ghold
,
1
);
/* Unlock this cell. */
...
...
@@ -306,14 +308,13 @@ int cell_glocktree(struct cell *c) {
void
cell_unlocktree
(
struct
cell
*
c
)
{
struct
cell
*
finger
;
TIMER_TIC
/* First of all, try to unlock this cell. */
if
(
lock_unlock
(
&
c
->
lock
)
!=
0
)
error
(
"Failed to unlock cell."
);
/* Climb up the tree and unhold the parents. */
for
(
finger
=
c
->
parent
;
finger
!=
NULL
;
finger
=
finger
->
parent
)
for
(
struct
cell
*
finger
=
c
->
parent
;
finger
!=
NULL
;
finger
=
finger
->
parent
)
__sync_fetch_and_sub
(
&
finger
->
hold
,
1
);
TIMER_TOC
(
timer_locktree
);
...
...
@@ -321,14 +322,13 @@ void cell_unlocktree(struct cell *c) {
void
cell_gunlocktree
(
struct
cell
*
c
)
{
struct
cell
*
finger
;
TIMER_TIC
/* First of all, try to unlock this cell. */
if
(
lock_unlock
(
&
c
->
glock
)
!=
0
)
error
(
"Failed to unlock cell."
);
/* Climb up the tree and unhold the parents. */
for
(
finger
=
c
->
parent
;
finger
!=
NULL
;
finger
=
finger
->
parent
)
for
(
struct
cell
*
finger
=
c
->
parent
;
finger
!=
NULL
;
finger
=
finger
->
parent
)
__sync_fetch_and_sub
(
&
finger
->
ghold
,
1
);
TIMER_TOC
(
timer_locktree
);
...
...
@@ -342,15 +342,16 @@ void cell_gunlocktree(struct cell *c) {
void
cell_split
(
struct
cell
*
c
)
{
int
i
,
j
,
k
,
count
=
c
->
count
,
gcount
=
c
->
gcount
;
struct
part
temp
,
*
parts
=
c
->
parts
;
struct
xpart
xtemp
,
*
xparts
=
c
->
xparts
;
struct
gpart
gtemp
,
*
gparts
=
c
->
gparts
;
int
i
,
j
;
const
int
count
=
c
->
count
,
gcount
=
c
->
gcount
;
struct
part
*
parts
=
c
->
parts
;
struct
xpart
*
xparts
=
c
->
xparts
;
struct
gpart
*
gparts
=
c
->
gparts
;
int
left
[
8
],
right
[
8
];
double
pivot
[
3
];
/* Init the pivots. */
for
(
k
=
0
;
k
<
3
;
k
++
)
pivot
[
k
]
=
c
->
loc
[
k
]
+
c
->
h
[
k
]
/
2
;
for
(
int
k
=
0
;
k
<
3
;
k
++
)
pivot
[
k
]
=
c
->
loc
[
k
]
+
c
->
h
[
k
]
/
2
;
/* Split along the x-axis. */
i
=
0
;
...
...
@@ -359,10 +360,10 @@ void cell_split(struct cell *c) {
while
(
i
<=
count
-
1
&&
parts
[
i
].
x
[
0
]
<=
pivot
[
0
])
i
+=
1
;
while
(
j
>=
0
&&
parts
[
j
].
x
[
0
]
>
pivot
[
0
])
j
-=
1
;
if
(
i
<
j
)
{
temp
=
parts
[
i
];
struct
part
temp
=
parts
[
i
];
parts
[
i
]
=
parts
[
j
];
parts
[
j
]
=
temp
;
xtemp
=
xparts
[
i
];
struct
xpart
xtemp
=
xparts
[
i
];
xparts
[
i
]
=
xparts
[
j
];
xparts
[
j
]
=
xtemp
;
}
...
...
@@ -379,17 +380,17 @@ void cell_split(struct cell *c) {
right
[
0
]
=
j
;
/* Split along the y axis, twice. */
for
(
k
=
1
;
k
>=
0
;
k
--
)
{
for
(
int
k
=
1
;
k
>=
0
;
k
--
)
{
i
=
left
[
k
];
j
=
right
[
k
];
while
(
i
<=
j
)
{
while
(
i
<=
right
[
k
]
&&
parts
[
i
].
x
[
1
]
<=
pivot
[
1
])
i
+=
1
;
while
(
j
>=
left
[
k
]
&&
parts
[
j
].
x
[
1
]
>
pivot
[
1
])
j
-=
1
;
if
(
i
<
j
)
{
temp
=
parts
[
i
];
struct
part
temp
=
parts
[
i
];
parts
[
i
]
=
parts
[
j
];
parts
[
j
]
=
temp
;
xtemp
=
xparts
[
i
];
struct
xpart
xtemp
=
xparts
[
i
];
xparts
[
i
]
=
xparts
[
j
];
xparts
[
j
]
=
xtemp
;
}
...
...
@@ -409,17 +410,17 @@ void cell_split(struct cell *c) {
}
/* Split along the z axis, four times. */
for
(
k
=
3
;
k
>=
0
;
k
--
)
{
for
(
int
k
=
3
;
k
>=
0
;
k
--
)
{
i
=
left
[
k
];
j
=
right
[
k
];
while
(
i
<=
j
)
{
while
(
i
<=
right
[
k
]
&&
parts
[
i
].
x
[
2
]
<=
pivot
[
2
])
i
+=
1
;
while
(
j
>=
left
[
k
]
&&
parts
[
j
].
x
[
2
]
>
pivot
[
2
])
j
-=
1
;
if
(
i
<
j
)
{
temp
=
parts
[
i
];
struct
part
temp
=
parts
[
i
];
parts
[
i
]
=
parts
[
j
];
parts
[
j
]
=
temp
;
xtemp
=
xparts
[
i
];
struct
xpart
xtemp
=
xparts
[
i
];
xparts
[
i
]
=
xparts
[
j
];
xparts
[
j
]
=
xtemp
;
}
...
...
@@ -441,14 +442,14 @@ void cell_split(struct cell *c) {
}
/* Store the counts and offsets. */
for
(
k
=
0
;
k
<
8
;
k
++
)
{
for
(
int
k
=
0
;
k
<
8
;
k
++
)
{
c
->
progeny
[
k
]
->
count
=
right
[
k
]
-
left
[
k
]
+
1
;
c
->
progeny
[
k
]
->
parts
=
&
c
->
parts
[
left
[
k
]];
c
->
progeny
[
k
]
->
xparts
=
&
c
->
xparts
[
left
[
k
]];
}
/* Re-link the gparts. */
for
(
k
=
0
;
k
<
count
;
k
++
)
for
(
int
k
=
0
;
k
<
count
;
k
++
)
if
(
parts
[
k
].
gpart
!=
NULL
)
parts
[
k
].
gpart
->
part
=
&
parts
[
k
];
/* Verify that _all_ the parts have been assigned to a cell. */
...
...
@@ -462,17 +463,17 @@ void cell_split(struct cell *c) {
error( "Particle sorting failed (right edge)." ); */
/* Verify a few sub-cells. */
/* for ( k = 0 ; k < c->progeny[0]->count ; k++ )
/* for (
int
k = 0 ; k < c->progeny[0]->count ; k++ )
if ( c->progeny[0]->parts[k].x[0] > pivot[0] ||
c->progeny[0]->parts[k].x[1] > pivot[1] ||
c->progeny[0]->parts[k].x[2] > pivot[2] )
error( "Sorting failed (progeny=0)." );
for ( k = 0 ; k < c->progeny[1]->count ; k++ )
for (
int
k = 0 ; k < c->progeny[1]->count ; k++ )
if ( c->progeny[1]->parts[k].x[0] > pivot[0] ||
c->progeny[1]->parts[k].x[1] > pivot[1] ||
c->progeny[1]->parts[k].x[2] <= pivot[2] )
error( "Sorting failed (progeny=1)." );
for ( k = 0 ; k < c->progeny[2]->count ; k++ )
for (
int
k = 0 ; k < c->progeny[2]->count ; k++ )
if ( c->progeny[2]->parts[k].x[0] > pivot[0] ||
c->progeny[2]->parts[k].x[1] <= pivot[1] ||
c->progeny[2]->parts[k].x[2] > pivot[2] )
...
...
@@ -487,7 +488,7 @@ void cell_split(struct cell *c) {
while
(
i
<=
gcount
-
1
&&
gparts
[
i
].
x
[
0
]
<=
pivot
[
0
])
i
+=
1
;
while
(
j
>=
0
&&
gparts
[
j
].
x
[
0
]
>
pivot
[
0
])
j
-=
1
;
if
(
i
<
j
)
{
gtemp
=
gparts
[
i
];
struct
gpart
gtemp
=
gparts
[
i
];
gparts
[
i
]
=
gparts
[
j
];
gparts
[
j
]
=
gtemp
;
}
...
...
@@ -498,14 +499,14 @@ void cell_split(struct cell *c) {
right
[
0
]
=
j
;
/* Split along the y axis, twice. */
for
(
k
=
1
;
k
>=
0
;
k
--
)
{
for
(
int
k
=
1
;
k
>=
0
;
k
--
)
{
i
=
left
[
k
];
j
=
right
[
k
];
while
(
i
<=
j
)
{
while
(
i
<=
right
[
k
]
&&
gparts
[
i
].
x
[
1
]
<=
pivot
[
1
])
i
+=
1
;
while
(
j
>=
left
[
k
]
&&
gparts
[
j
].
x
[
1
]
>
pivot
[
1
])
j
-=
1
;
if
(
i
<
j
)
{
gtemp
=
gparts
[
i
];
struct
gpart
gtemp
=
gparts
[
i
];
gparts
[
i
]
=
gparts
[
j
];
gparts
[
j
]
=
gtemp
;
}
...
...
@@ -517,14 +518,14 @@ void cell_split(struct cell *c) {
}
/* Split along the z axis, four times. */
for
(
k
=
3
;
k
>=
0
;
k
--
)
{
for
(
int
k
=
3
;
k
>=
0
;
k
--
)
{
i
=
left
[
k
];
j
=
right
[
k
];
while
(
i
<=
j
)
{
while
(
i
<=
right
[
k
]
&&
gparts
[
i
].
x
[
2
]
<=
pivot
[
2
])
i
+=
1
;
while
(
j
>=
left
[
k
]
&&
gparts
[
j
].
x
[
2
]
>
pivot
[
2
])
j
-=
1
;
if
(
i
<
j
)
{
gtemp
=
gparts
[
i
];
struct
gpart
gtemp
=
gparts
[
i
];
gparts
[
i
]
=
gparts
[
j
];
gparts
[
j
]
=
gtemp
;
}
...
...
@@ -536,12 +537,12 @@ void cell_split(struct cell *c) {
}
/* Store the counts and offsets. */
for
(
k
=
0
;
k
<
8
;
k
++
)
{
for
(
int
k
=
0
;
k
<
8
;
k
++
)
{
c
->
progeny
[
k
]
->
gcount
=
right
[
k
]
-
left
[
k
]
+
1
;
c
->
progeny
[
k
]
->
gparts
=
&
c
->
gparts
[
left
[
k
]];
}
/* Re-link the parts. */
for
(
k
=
0
;
k
<
gcount
;
k
++
)
for
(
int
k
=
0
;
k
<
gcount
;
k
++
)
if
(
gparts
[
k
].
id
>
0
)
gparts
[
k
].
part
->
gpart
=
&
gparts
[
k
];
}
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