Commit 91cc3a7e authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Don't be that verbose

parent 075b53ce
......@@ -390,7 +390,7 @@ int main(int argc, char *argv[]) {
/* Legend */
if (myrank == 0)
printf("# Step Time time-step CPU Wall-clock time [ms]\n");
printf("# Step Time time-step Number of updates CPU Wall-clock time [ms]\n");
/* Let loose a runner on the space. */
for (j = 0; e.time < time_end; j++) {
......
......@@ -1717,7 +1717,7 @@ void engine_init_particles(struct engine *e) {
//printParticle(e->s->parts, 1000, e->s->nr_parts);
//printParticle(e->s->parts, 515050, e->s->nr_parts);
message("\n0th DENSITY CALC\n");
//message("\n0th DENSITY CALC\n");
/* Now do a density calculation */
TIMER_TIC;
......@@ -1730,12 +1730,12 @@ void engine_init_particles(struct engine *e) {
TIMER_TOC(timer_runners);
message("\n0th ENTROPY CONVERSION\n");
//message("\n0th ENTROPY CONVERSION\n");
space_map_cells_pre(s, 1, cell_convert_hydro, NULL);
printParticle(e->s->parts, e->s->xparts,1000, e->s->nr_parts);
printParticle(e->s->parts, e->s->xparts,515050, e->s->nr_parts);
//printParticle(e->s->parts, e->s->xparts,1000, e->s->nr_parts);
//printParticle(e->s->parts, e->s->xparts,515050, e->s->nr_parts);
/* Ready to go */
e->step = -1;
......@@ -1807,7 +1807,7 @@ if ( e->nodeID == 0 )
message( "nr_parts=%i." , nr_parts ); */
#endif
message("\nDRIFT\n");
//message("\nDRIFT\n");
/* Move forward in time */
e->timeOld = e->time;
......@@ -1818,16 +1818,13 @@ if ( e->nodeID == 0 )
/* Drift everybody */
engine_launch(e, e->nr_threads, 1 << task_type_drift, 0);
printParticle(e->s->parts, e->s->xparts, 1000, e->s->nr_parts);
printParticle(e->s->parts, e->s->xparts, 515050, e->s->nr_parts);
//printParticle(e->s->parts, e->s->xparts, 1000, e->s->nr_parts);
//printParticle(e->s->parts, e->s->xparts, 515050, e->s->nr_parts);
if(e->step == 2) exit(0);
//if(e->step == 2) exit(0);
printf("%d %f %f %d\n", e->step, e->time, e->timeStep, updates);
fflush(stdout);
message("\nACCELERATION AND KICK\n");
//message("\nACCELERATION AND KICK\n");
/* Re-distribute the particles amongst the nodes? */
if (e->forcerepart) engine_repartition(e);
......@@ -1849,9 +1846,12 @@ 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);
printParticle(e->s->parts, e->s->xparts,1000, e->s->nr_parts);
printParticle(e->s->parts, e->s->xparts,515050, e->s->nr_parts);
//printParticle(e->s->parts, e->s->xparts,1000, e->s->nr_parts);
//printParticle(e->s->parts, e->s->xparts,515050, e->s->nr_parts);
}
......
......@@ -146,8 +146,8 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_density(
pi->density.wcount += wi;
pi->density.wcount_dh -= u * wi_dx;
const float ih3 = h_inv * h_inv * h_inv;
const float ih4 = h_inv * h_inv * h_inv * h_inv;
/* const float ih3 = h_inv * h_inv * h_inv; */
/* const float ih4 = h_inv * h_inv * h_inv * h_inv; */
const float fac = mj * wi_dx * ri;
......@@ -158,22 +158,22 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_density(
const float dvdr = dv[0] * dx[0] + dv[1] * dx[1] + dv[2] * dx[2];
pi->div_v -= fac * dvdr;
if(pi->id == 515050 && pj->id == 504849)
message("Interacting with %lld. r=%e hi=%e u=%e W=%e dW/dx=%e dh_drho1=%e dh_drho2=%e\n fac=%e dvdr=%e pj->v=[%.3e,%.3e,%.3e]",
pj->id,
r,
hi,
u,
wi * ih3,
wi_dx * ih4,
-mj * (3.f * kernel_igamma * wi) * ih4,
-mj * u * wi_dx * kernel_igamma * ih4,
fac * ih4,
dvdr,
pj->v[0],
pj->v[1],
pj->v[2]
);
/* if(pi->id == 515050 && pj->id == 504849) */
/* message("Interacting with %lld. r=%e hi=%e u=%e W=%e dW/dx=%e dh_drho1=%e dh_drho2=%e\n fac=%e dvdr=%e pj->v=[%.3e,%.3e,%.3e]", */
/* pj->id, */
/* r, */
/* hi, */
/* u, */
/* wi * ih3, */
/* wi_dx * ih4, */
/* -mj * (3.f * kernel_igamma * wi) * ih4, */
/* -mj * u * wi_dx * kernel_igamma * ih4, */
/* fac * ih4, */
/* dvdr, */
/* pj->v[0], */
/* pj->v[1], */
/* pj->v[2] */
/* ); */
/* Compute dv cross r */
......@@ -255,21 +255,21 @@ __attribute__((always_inline)) INLINE static void runner_iact_force(
const float acc = visc_term + sph_term;
//if(pi->id == 1000 && pj->id == 1100)
if(pi->id == 515050 && pj->id == 504849)
message("Interacting with %lld. r=%e hi=%e hj=%e dWi/dx=%e dWj/dx=%3e dvdr=%e visc=%e sph=%e",
pj->id,
r,
2*hi,
2*hj,
wi_dr,
wj_dr,
dvdr,
visc_term,
sph_term
);
if(pi->id == 1100 && pj->id == 1000)
message("oO");
/* //if(pi->id == 1000 && pj->id == 1100) */
/* if(pi->id == 515050 && pj->id == 504849) */
/* message("Interacting with %lld. r=%e hi=%e hj=%e dWi/dx=%e dWj/dx=%3e dvdr=%e visc=%e sph=%e", */
/* pj->id, */
/* r, */
/* 2*hi, */
/* 2*hj, */
/* wi_dr, */
/* wj_dr, */
/* dvdr, */
/* visc_term, */
/* sph_term */
/* ); */
/* if(pi->id == 1100 && pj->id == 1000) */
/* message("oO"); */
/* Use the force Luke ! */
......
......@@ -514,8 +514,8 @@ void runner_doinit(struct runner *r, struct cell *c, int timer) {
if (p->t_end <= t_end) {
if(p->id == 1000) message("init 1000!");
if(p->id == 515050) message("init 515050!");
/* if(p->id == 1000) message("init 1000!"); */
/* if(p->id == 515050) message("init 515050!"); */
......@@ -583,8 +583,8 @@ void runner_doghost(struct runner *r, struct cell *c) {
p = &parts[pid[i]];
xp = &xparts[pid[i]];
if(p->id == 1000) message("ghost 1000");
if(p->id == 515050) message("ghost 515050");
/* if(p->id == 1000) message("ghost 1000"); */
/* if(p->id == 515050) message("ghost 515050"); */
/* Is this part within the timestep? */
if (p->t_end <= t_end) {
......@@ -758,15 +758,15 @@ void runner_dodrift(struct runner *r, struct cell *c, int timer) {
/* Predict the values of the extra fields */
hydro_predict_extra(p, xp, r->e->timeOld, r->e->time);
if(p->id == 1000 || p->id == 515050 || p->id == 504849)
message("%lld: current_t=%f t0=%f t1=%f v=[%.3e %.3e %.3e]\n",
p->id,
r->e->time,
r->e->timeOld,
r->e->time,
p->v[0],
p->v[1],
p->v[2]);
/* if(p->id == 1000 || p->id == 515050 || p->id == 504849) */
/* message("%lld: current_t=%f t0=%f t1=%f v=[%.3e %.3e %.3e]\n", */
/* p->id, */
/* r->e->time, */
/* r->e->timeOld, */
/* r->e->time, */
/* p->v[0], */
/* p->v[1], */
/* p->v[2]); */
/* Compute motion since last cell construction */
......@@ -909,16 +909,16 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) {
p->v[1] = xp->v_full[1] - half_dt * p->a[1];
p->v[2] = xp->v_full[2] - half_dt * p->a[2];
if(p->id == 1000 || p->id == 515050 || p->id == 504849)
message("%lld: current_t=%f t_beg=%f t_end=%f half_dt=%f v=[%.3e %.3e %.3e]\n",
p->id,
t_current,
p->t_begin,
p->t_end,
half_dt,
p->v[0],
p->v[1],
p->v[2]);
/* if(p->id == 1000 || p->id == 515050 || p->id == 504849) */
/* message("%lld: current_t=%f t_beg=%f t_end=%f half_dt=%f v=[%.3e %.3e %.3e]\n", */
/* p->id, */
/* t_current, */
/* p->t_begin, */
/* p->t_end, */
/* half_dt, */
/* p->v[0], */
/* p->v[1], */
/* p->v[2]); */
/* Extra kick work */
......
......@@ -1400,8 +1400,8 @@ void DOSELF1(struct runner *r, struct cell *restrict c) {
/* Get a pointer to the ith particle. */
pi = &parts[pid];
if(pi->id == 1000) message("oO 1000");
if(pi->id == 515050) message("oO 515050");
/* if(pi->id == 1000) message("oO 1000"); */
/* if(pi->id == 515050) message("oO 515050"); */
/* Get the particle position and radius. */
for (k = 0; k < 3; k++) pix[k] = pi->x[k];
......@@ -1627,8 +1627,8 @@ void DOSELF2(struct runner *r, struct cell *restrict c) {
/* Get a pointer to the ith particle. */
pi = &parts[pid];
if(pi->id == 1000) message("oO 1000");
if(pi->id == 515050) message("oO 515050");
/* if(pi->id == 1000) message("oO 1000"); */
/* if(pi->id == 515050) message("oO 515050"); */
/* Get the particle position and radius. */
......
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