From 324bd359cbe2ffe361b8cb1d9984b53b0634b74b Mon Sep 17 00:00:00 2001
From: Pedro Gonnet <gonnet@google.com>
Date: Wed, 12 Aug 2015 21:49:02 +0200
Subject: [PATCH] add debug output for each part sent/received.
Former-commit-id: 78052f0629ab80163631a248a0af9f596d27c4a2
---
src/engine.c | 10 +++++-----
src/proxy.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index fd681cf4ab..08232ada3b 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -926,14 +926,14 @@ int engine_exchange_strays ( struct engine *e , int offset , int *ind , int N )
// message( "request from proxy %i has arrived." , pid );
if ( reqs_in[pid & ~1] == MPI_REQUEST_NULL &&
reqs_in[pid | 1 ] == MPI_REQUEST_NULL ) {
- p = &e->proxies[pid/2];
+ p = &e->proxies[pid >> 1];
memcpy( &s->parts[offset + count] , p->parts_in , sizeof(struct part) * p->nr_parts_in );
memcpy( &s->xparts[offset + count] , p->xparts_in , sizeof(struct xpart) * p->nr_parts_in );
- count += p->nr_parts_in;
- /* for ( int k = 0 ; k < p->nr_parts_in ; k++ )
+ for ( int k = offset ; k < offset + count; k++ )
message( "received particle %lli, x=[%.3e %.3e %.3e], h=%.3e, from node %i." ,
- p->parts_in[k].id , p->parts_in[k].x[0] , p->parts_in[k].x[1] , p->parts_in[k].x[2] ,
- p->parts_in[k].h , p->nodeID ); */
+ 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 );
+ count += p->nr_parts_in;
}
}
diff --git a/src/proxy.c b/src/proxy.c
index 2f18730290..6c26a222be 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -215,10 +215,10 @@ void proxy_parts_exch1 ( struct proxy *p ) {
MPI_Isend( p->xparts_out , sizeof(struct xpart)*p->nr_parts_out , MPI_BYTE , p->nodeID , p->mynodeID*proxy_tag_shift + proxy_tag_xparts , MPI_COMM_WORLD , &p->req_xparts_out ) != MPI_SUCCESS )
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].h , p->nodeID );
}
/* Receive the number of particles. */
--
GitLab