Commit ccb7877c authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'newTimeDefinition' into 'master'

Corrected initialisation mistake in MPI mode.

Bug fix. Cells have now their timestep properly initialised and will compute the density of their particles. 

See merge request !86
parents e537eb76 33caebf8
......@@ -162,8 +162,8 @@ int cell_pack(struct cell *c, struct pcell *pc) {
/* Start by packing the data of the current cell. */
pc->h_max = c->h_max;
c->t_end_min = pc->t_end_min;
c->t_end_max = pc->t_end_max;
pc->t_end_min = c->t_end_min;
pc->t_end_max = c->t_end_max;
pc->count = c->count;
c->tag = pc->tag = atomic_inc(&cell_next_tag) % cell_max_tag;
......
......@@ -1706,15 +1706,16 @@ void engine_init_particles(struct engine *e) {
struct space *s = e->s;
engine_prepare(e);
engine_marktasks(e);
message("Initialising particles");
/* Make sure all particles are ready to go */
/* i.e. clean-up any stupid state in the ICs */
message("Initialising particles");
space_map_cells_pre(s, 1, cell_init_parts, NULL);
engine_prepare(e);
engine_marktasks(e);
// printParticle(e->s->parts, 1000, e->s->nr_parts);
// printParticle(e->s->parts, 515050, e->s->nr_parts);
......@@ -1846,9 +1847,11 @@ if ( e->nodeID == 0 )
TIMER_TOC2(timer_step);
printf("%d %f %f %d %.3f\n", e->step, e->time, e->timeStep, updates,
((double)timers[timer_count - 1]) / CPU_TPS * 1000);
fflush(stdout);
if (e->nodeID == 0) {
printf("%d %f %f %d %.3f\n", e->step, e->time, e->timeStep, updates,
((double)timers[timer_count - 1]) / CPU_TPS * 1000);
fflush(stdout);
}
// printParticle(e->s->parts, e->s->xparts,1000, e->s->nr_parts);
// printParticle(e->s->parts, e->s->xparts,515050, e->s->nr_parts);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment