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
23f09dde
Commit
23f09dde
authored
9 years ago
by
Pedro Gonnet
Browse files
Options
Downloads
Patches
Plain Diff
use the new part_relink_* functions throughout the code.
parent
cdea145c
No related branches found
No related tags found
1 merge request
!118
One major change to replace all gpart id/parts with the new id_or_neg_offset.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/cell.c
+2
-8
2 additions, 8 deletions
src/cell.c
src/space.c
+2
-8
2 additions, 8 deletions
src/space.c
with
4 additions
and
16 deletions
src/cell.c
+
2
−
8
View file @
23f09dde
...
@@ -452,10 +452,7 @@ void cell_split(struct cell *c, ptrdiff_t parts_offset) {
...
@@ -452,10 +452,7 @@ void cell_split(struct cell *c, ptrdiff_t parts_offset) {
}
}
/* Re-link the gparts. */
/* Re-link the gparts. */
for
(
int
k
=
0
;
k
<
count
;
k
++
)
part_relink_gparts
(
parts
,
count
,
parts_offset
);
if
(
parts
[
k
].
gpart
!=
NULL
)
{
parts
[
k
].
gpart
->
id_or_neg_offset
=
-
(
k
+
parts_offset
);
}
/* Verify that _all_ the parts have been assigned to a cell. */
/* Verify that _all_ the parts have been assigned to a cell. */
/* for ( k = 1 ; k < 8 ; k++ )
/* for ( k = 1 ; k < 8 ; k++ )
...
@@ -548,10 +545,7 @@ void cell_split(struct cell *c, ptrdiff_t parts_offset) {
...
@@ -548,10 +545,7 @@ void cell_split(struct cell *c, ptrdiff_t parts_offset) {
}
}
/* Re-link the parts. */
/* Re-link the parts. */
for
(
int
k
=
0
;
k
<
gcount
;
k
++
)
part_relink_parts
(
gparts
,
gcount
,
parts
-
parts_offset
);
if
(
gparts
[
k
].
id_or_neg_offset
<
0
)
{
parts
[
-
gparts
[
k
].
id_or_neg_offset
].
gpart
=
&
gparts
[
k
];
}
}
}
/**
/**
...
...
This diff is collapsed.
Click to expand it.
src/space.c
+
2
−
8
View file @
23f09dde
...
@@ -403,10 +403,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
...
@@ -403,10 +403,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
space_parts_sort
(
s
,
ind
,
nr_parts
,
0
,
s
->
nr_cells
-
1
,
verbose
);
space_parts_sort
(
s
,
ind
,
nr_parts
,
0
,
s
->
nr_cells
-
1
,
verbose
);
/* Re-link the gparts. */
/* Re-link the gparts. */
for
(
size_t
k
=
0
;
k
<
nr_parts
;
k
++
)
part_relink_gparts
(
s
->
parts
,
nr_parts
,
0
);
if
(
s
->
parts
[
k
].
gpart
!=
NULL
)
{
s
->
parts
[
k
].
gpart
->
id_or_neg_offset
=
-
k
;
}
/* Verify space_sort_struct. */
/* Verify space_sort_struct. */
/* for ( k = 1 ; k < nr_parts ; k++ ) {
/* for ( k = 1 ; k < nr_parts ; k++ ) {
...
@@ -492,10 +489,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
...
@@ -492,10 +489,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
space_gparts_sort
(
s
->
gparts
,
gind
,
nr_gparts
,
0
,
s
->
nr_cells
-
1
);
space_gparts_sort
(
s
->
gparts
,
gind
,
nr_gparts
,
0
,
s
->
nr_cells
-
1
);
/* Re-link the parts. */
/* Re-link the parts. */
for
(
int
k
=
0
;
k
<
nr_gparts
;
k
++
)
part_relink_parts
(
s
->
gparts
,
nr_gparts
,
s
->
parts
);
if
(
s
->
gparts
[
k
].
id_or_neg_offset
<
0
)
{
s
->
parts
[
-
s
->
gparts
[
k
].
id_or_neg_offset
].
gpart
=
&
s
->
gparts
[
k
];
}
/* We no longer need the indices as of here. */
/* We no longer need the indices as of here. */
free
(
gind
);
free
(
gind
);
...
...
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