Skip to content
Snippets Groups Projects
Commit b53d0f33 authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'revert-41561056' into 'master'

Revert "Merge branch 'timestep_ignore_inhibited' into 'master'"

See merge request !842
parents 6ca9444e 15225fbe
Branches
Tags
1 merge request!842Revert "Merge branch 'timestep_ignore_inhibited' into 'master'"
...@@ -3098,10 +3098,7 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) { ...@@ -3098,10 +3098,7 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) {
else { /* part is inactive */ else { /* part is inactive */
/* Count the number of inhibited particles */ /* Count the number of inhibited particles */
if (part_is_inhibited(p, e)) { if (part_is_inhibited(p, e)) inhibited++;
inhibited++;
continue;
}
const integertime_t ti_end = const integertime_t ti_end =
get_integer_time_end(ti_current, p->time_bin); get_integer_time_end(ti_current, p->time_bin);
...@@ -3170,10 +3167,7 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) { ...@@ -3170,10 +3167,7 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) {
} else { /* gpart is inactive */ } else { /* gpart is inactive */
/* Count the number of inhibited particles */ /* Count the number of inhibited particles */
if (gpart_is_inhibited(gp, e)) { if (gpart_is_inhibited(gp, e)) g_inhibited++;
g_inhibited++;
continue;
}
const integertime_t ti_end = const integertime_t ti_end =
get_integer_time_end(ti_current, gp->time_bin); get_integer_time_end(ti_current, gp->time_bin);
...@@ -3232,10 +3226,7 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) { ...@@ -3232,10 +3226,7 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) {
} else { } else {
/* Count the number of inhibited particles */ /* Count the number of inhibited particles */
if (spart_is_inhibited(sp, e)) { if (spart_is_inhibited(sp, e)) ++s_inhibited;
++s_inhibited;
continue;
}
const integertime_t ti_end = const integertime_t ti_end =
get_integer_time_end(ti_current, sp->time_bin); get_integer_time_end(ti_current, sp->time_bin);
...@@ -3297,10 +3288,7 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) { ...@@ -3297,10 +3288,7 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) {
} else { } else {
/* Count the number of inhibited particles */ /* Count the number of inhibited particles */
if (bpart_is_inhibited(bp, e)) { if (bpart_is_inhibited(bp, e)) ++b_inhibited;
++b_inhibited;
continue;
}
const integertime_t ti_end = const integertime_t ti_end =
get_integer_time_end(ti_current, bp->time_bin); get_integer_time_end(ti_current, bp->time_bin);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment