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

Revert "add debug output for each part sent/received."

This reverts commit 324bd359 [formerly 78052f0629ab80163631a248a0af9f596d27c4a2].

Conflicts:
	src/engine.c
	src/proxy.c

Reverts unwanted debug output from mpi_fixes branch.


Former-commit-id: f7ee5a97b39c9fd82ec0fe9d5dfa819eb70b128d
parent 08902432
......@@ -943,30 +943,32 @@ int engine_exchange_strays(struct engine *e, int offset, int *ind, int N) {
sizeof(struct part) * p->nr_parts_in);
memcpy(&s->xparts[offset + count], p->xparts_in,
sizeof(struct xpart) * p->nr_parts_in);
for (int k = offset; k < offset + count; k++)
message(
/* for (int k = offset; k < offset + count; k++)
message(
"received particle %lli, x=[%.3e %.3e %.3e], h=%.3e, from node %i.",
s->parts[k].id, s->parts[k].x[0], s->parts[k].x[1],
s->parts[k].x[2], s->parts[k].h, p->nodeID);
s->parts[k].x[2], s->parts[k].h, p->nodeID); */
count += p->nr_parts_in;
}
}
/* Wait for all the sends to have finnished too. */
if (nr_out > 0)
if (MPI_Waitall(2 * e->nr_proxies, reqs_out, MPI_STATUSES_IGNORE) !=
MPI_SUCCESS)
error("MPI_Waitall on sends failed.");
if ( nr_out > 0 )
if (MPI_Waitall(2 * e->nr_proxies , reqs_out , MPI_STATUSES_IGNORE) !=
MPI_SUCCESS )
error("MPI_Waitall on sends failed.");
/* Return the number of harvested parts. */
return count;
#else
error("SWIFT was not compiled with MPI support.");
error( "SWIFT was not compiled with MPI support." );
return 0;
#endif
}
/**
* @brief Fill the #space's task list.
*
......
......@@ -214,10 +214,10 @@ void proxy_parts_exch1(struct proxy *p) {
error("Failed to isend part data.");
// message( "isent particle data (%i) to node %i." , p->nr_parts_out ,
// p->nodeID ); fflush(stdout);
for (int k = 0; k < p->nr_parts_out; k++)
/*for (int k = 0; k < p->nr_parts_out; k++)
message("sending particle %lli, x=[%.3e %.3e %.3e], h=%.3e, to node %i.",
p->parts_out[k].id, p->parts_out[k].x[0], p->parts_out[k].x[1],
p->parts_out[k].x[2], p->parts_out[k].h, p->nodeID);
p->parts_out[k].x[2], p->parts_out[k].h, p->nodeID);*/
}
/* Receive the number of particles. */
......
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