--- trunk/OOPSE/libmdtools/InitializeFromFile.cpp 2004/04/22 03:29:30 1129 +++ trunk/OOPSE/libmdtools/InitializeFromFile.cpp 2004/04/22 14:55:17 1130 @@ -16,8 +16,8 @@ #ifdef IS_MPI #include #include "mpiSimulation.hpp" -#define TAKE_THIS_TAG_CHAR 0 -#define TAKE_THIS_TAG_INT 1 +#define TAKE_THIS_TAG_CHAR 3134 +#define TAKE_THIS_TAG_INT 3135 namespace initFile{ void nodeZeroError( void ); @@ -220,6 +220,8 @@ void InitializeFromFile :: readInit( SimInfo* the_simn MPI_Bcast(read_buffer, BUFFERSIZE, MPI_CHAR, 0, MPI_COMM_WORLD); + cerr << "node " << worldRank << " finished MPI_Bcast" << endl; + parseErr = parseCommentLine( read_buffer, simnfo); if( parseErr != NULL ){ @@ -268,8 +270,8 @@ void InitializeFromFile :: readInit( SimInfo* the_simn MPI_Recv(&nCurObj, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus); - - for(j=0; j < integrableObjects.size(); j++){ + cerr << "node " << worldRank << " finished MPI_Send" << endl; + for(j=0; j < nCurObj; j++){ eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file); if(eof_test == NULL){ @@ -286,7 +288,7 @@ void InitializeFromFile :: readInit( SimInfo* the_simn MPI_Send(read_buffer, BUFFERSIZE, MPI_CHAR, which_node, TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD); - + cerr << "node " << worldRank << " finished MPI_Send" << endl; } } @@ -299,6 +301,7 @@ void InitializeFromFile :: readInit( SimInfo* the_simn MPI_Bcast(read_buffer, BUFFERSIZE, MPI_CHAR, 0, MPI_COMM_WORLD); + cerr << "node " << worldRank << " finished MPI_Bcast" << endl; parseErr = parseCommentLine( read_buffer, simnfo); if( parseErr != NULL ){ @@ -328,11 +331,13 @@ void InitializeFromFile :: readInit( SimInfo* the_simn MPI_Send(&nCurObj, 1, MPI_INT, 0, TAKE_THIS_TAG_INT, MPI_COMM_WORLD); + cerr << "node " << worldRank << " finished MPI_Send" << endl; for(j = 0; j < integrableObjects.size(); j++){ MPI_Recv(read_buffer, BUFFERSIZE, MPI_CHAR, 0, TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD, &istatus); + cerr << "node " << worldRank << " finished MPI_Recv" << endl; parseErr = parseDumpLine(read_buffer, integrableObjects[j]); if( parseErr != NULL ){