ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/InitializeFromFile.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/InitializeFromFile.cpp (file contents):
Revision 1129 by tim, Thu Apr 22 03:29:30 2004 UTC vs.
Revision 1130 by tim, Thu Apr 22 14:55:17 2004 UTC

# Line 16 | Line 16
16   #ifdef IS_MPI
17   #include <mpi.h>
18   #include "mpiSimulation.hpp"
19 < #define TAKE_THIS_TAG_CHAR 0
20 < #define TAKE_THIS_TAG_INT 1
19 > #define TAKE_THIS_TAG_CHAR 3134
20 > #define TAKE_THIS_TAG_INT 3135
21  
22   namespace initFile{
23    void nodeZeroError( void );
# Line 220 | Line 220 | void InitializeFromFile :: readInit( SimInfo* the_simn
220  
221      MPI_Bcast(read_buffer, BUFFERSIZE, MPI_CHAR, 0, MPI_COMM_WORLD);
222  
223 +    cerr << "node " << worldRank << " finished  MPI_Bcast" << endl;
224 +
225      parseErr = parseCommentLine( read_buffer, simnfo);
226  
227      if( parseErr != NULL ){
# Line 268 | Line 270 | void InitializeFromFile :: readInit( SimInfo* the_simn
270  
271          MPI_Recv(&nCurObj, 1, MPI_INT, which_node,
272                 TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
273 <      
274 <       for(j=0; j < integrableObjects.size(); j++){
273 >         cerr << "node " << worldRank << " finished  MPI_Send" << endl;  
274 >       for(j=0; j < nCurObj; j++){
275          
276            eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
277            if(eof_test == NULL){
# Line 286 | Line 288 | void InitializeFromFile :: readInit( SimInfo* the_simn
288  
289              MPI_Send(read_buffer, BUFFERSIZE, MPI_CHAR, which_node,
290                        TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
291 <          
291 >           cerr << "node " << worldRank << " finished  MPI_Send" << endl;
292         }
293  
294        }
# Line 299 | Line 301 | void InitializeFromFile :: readInit( SimInfo* the_simn
301  
302      MPI_Bcast(read_buffer, BUFFERSIZE, MPI_CHAR, 0, MPI_COMM_WORLD);
303  
304 +    cerr << "node " << worldRank << " finished  MPI_Bcast" << endl;
305      parseErr = parseCommentLine( read_buffer, simnfo);
306  
307      if( parseErr != NULL ){
# Line 328 | Line 331 | void InitializeFromFile :: readInit( SimInfo* the_simn
331          MPI_Send(&nCurObj, 1, MPI_INT, 0,
332                          TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
333  
334 +        cerr << "node " << worldRank << " finished  MPI_Send" << endl;
335          for(j = 0; j < integrableObjects.size(); j++){
336  
337            MPI_Recv(read_buffer, BUFFERSIZE, MPI_CHAR, 0,
338                                TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD, &istatus);
339  
340 +        cerr << "node " << worldRank << " finished  MPI_Recv" << endl;
341            parseErr = parseDumpLine(read_buffer, integrableObjects[j]);
342  
343            if( parseErr != NULL ){

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines