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
a09b7e2a
Commit
a09b7e2a
authored
Jul 27, 2017
by
Matthieu Schaller
Browse files
Merge branch 'random_fixes' into 'master'
Random fixes We only need `ti_sort` in debug mode. See merge request
!374
parents
a0106530
24e1164b
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/cell.h
View file @
a09b7e2a
...
...
@@ -239,9 +239,6 @@ struct cell {
/*! Maximum beginning of (integer) time step in this cell. */
integertime_t
ti_beg_max
;
/*! Last (integer) time the cell's sort arrays were updated. */
integertime_t
ti_sort
;
/*! Last (integer) time the cell's part were drifted forward in time. */
integertime_t
ti_old_part
;
...
...
@@ -347,6 +344,9 @@ struct cell {
char
do_sub_sort
;
#ifdef SWIFT_DEBUG_CHECKS
/*! Last (integer) time the cell's sort arrays were updated. */
integertime_t
ti_sort
;
/*! The list of tasks that have been executed on this cell */
char
tasks_executed
[
64
];
...
...
src/runner.c
View file @
a09b7e2a
...
...
@@ -355,11 +355,11 @@ void runner_do_sort(struct runner *r, struct cell *c, int flags, int cleanup,
finger
=
finger
->
parent
)
{
if
(
finger
->
sorted
&
~
c
->
sorted
)
error
(
"Inconsistent sort flags (upward)."
);
}
#endif
/* Update the sort timer which represents the last time the sorts
were re-set. */
if
(
c
->
sorted
==
0
)
c
->
ti_sort
=
r
->
e
->
ti_current
;
#endif
/* start by allocating the entry arrays. */
if
(
c
->
sort
==
NULL
)
{
...
...
tests/test125cells.c
View file @
a09b7e2a
...
...
@@ -336,7 +336,6 @@ struct cell *make_cell(size_t n, const double offset[3], double size, double h,
cell
->
ti_old_part
=
8
;
cell
->
ti_end_min
=
8
;
cell
->
ti_end_max
=
8
;
cell
->
ti_sort
=
0
;
// shuffle_particles(cell->parts, cell->count);
...
...
tests/test27cells.c
View file @
a09b7e2a
...
...
@@ -174,7 +174,6 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
cell
->
ti_old_part
=
8
;
cell
->
ti_end_min
=
8
;
cell
->
ti_end_max
=
8
;
cell
->
ti_sort
=
8
;
shuffle_particles
(
cell
->
parts
,
cell
->
count
);
...
...
tests/testPeriodicBC.c
View file @
a09b7e2a
...
...
@@ -173,7 +173,6 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
cell
->
ti_old_part
=
8
;
cell
->
ti_end_min
=
8
;
cell
->
ti_end_max
=
8
;
cell
->
ti_sort
=
8
;
shuffle_particles
(
cell
->
parts
,
cell
->
count
);
...
...
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