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
3cf0ba63
Commit
3cf0ba63
authored
7 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Do not overwrite the time-step information on reception of xv,rho or gparts.
parent
73f55223
No related branches found
No related tags found
1 merge request
!433
Correct wrapping of multipoles in FFT task
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/engine.c
+14
-12
14 additions, 12 deletions
src/engine.c
src/runner.c
+4
-4
4 additions, 4 deletions
src/runner.c
with
18 additions
and
16 deletions
src/engine.c
+
14
−
12
View file @
3cf0ba63
...
...
@@ -4312,7 +4312,8 @@ void engine_init_particles(struct engine *e, int flag_entropy_ICs,
if
(
e
->
verbose
)
message
(
"took %.3f %s."
,
e
->
wallclock_time
,
clocks_getunit
());
}
integertime_t
*
address
=
0
;
integertime_t
*
address_hydro
=
0
;
integertime_t
*
address_gravity
=
0
;
/**
* @brief Let the #engine loose to compute the forces.
...
...
@@ -4360,17 +4361,18 @@ void engine_step(struct engine *e) {
engine_print_task_counts
(
e
);
space_print_cells
(
e
->
s
);
/* /\* Register the time-step information *\/ */
/* if(e->step == 3) { */
/* for(int i = 0; i< e->s->nr_cells; ++i) */
/* if(&e->s->cells_top[i] - e->s->cells_top == 12) { */
/* message("Found cell!"); */
/* address = &e->s->cells_top[i].ti_end_min; */
/* message("address: %p time_end=%lld", address,
* e->s->cells_top[i].ti_end_min); */
/* } */
/* } */
/* Register the time-step information */
if
(
e
->
step
==
3
)
{
for
(
int
i
=
0
;
i
<
e
->
s
->
nr_cells
;
++
i
)
if
(
&
e
->
s
->
cells_top
[
i
]
-
e
->
s
->
cells_top
==
12
)
{
message
(
"Found cell!"
);
address_hydro
=
&
e
->
s
->
cells_top
[
i
].
ti_hydro_end_min
;
address_gravity
=
&
e
->
s
->
cells_top
[
i
].
ti_gravity_end_min
;
message
(
"address: %p time_end=%lld"
,
address_hydro
,
e
->
s
->
cells_top
[
i
].
ti_hydro_end_min
);
}
}
#ifdef WITH_MPI
/* Repartition the space amongst the nodes? */
...
...
This diff is collapsed.
Click to expand it.
src/runner.c
+
4
−
4
View file @
3cf0ba63
...
...
@@ -1645,8 +1645,8 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int clear_sorts,
#endif
/* ... and store. */
c
->
ti_hydro_end_min
=
ti_hydro_end_min
;
c
->
ti_hydro_end_max
=
ti_hydro_end_max
;
//
c->ti_hydro_end_min = ti_hydro_end_min;
//
c->ti_hydro_end_max = ti_hydro_end_max;
c
->
ti_old_part
=
ti_current
;
c
->
h_max
=
h_max
;
...
...
@@ -1725,8 +1725,8 @@ void runner_do_recv_gpart(struct runner *r, struct cell *c, int timer) {
#endif
/* ... and store. */
c
->
ti_gravity_end_min
=
ti_gravity_end_min
;
c
->
ti_gravity_end_max
=
ti_gravity_end_max
;
//
c->ti_gravity_end_min = ti_gravity_end_min;
//
c->ti_gravity_end_max = ti_gravity_end_max;
c
->
ti_old_gpart
=
ti_current
;
if
(
timer
)
TIMER_TOC
(
timer_dorecv_gpart
);
...
...
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