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 1198 by tim, Thu May 27 00:48:12 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 +
224      parseErr = parseCommentLine( read_buffer, simnfo);
225  
226      if( parseErr != NULL ){
# Line 268 | Line 269 | void InitializeFromFile :: readInit( SimInfo* the_simn
269  
270          MPI_Recv(&nCurObj, 1, MPI_INT, which_node,
271                 TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
272 <      
273 <       for(j=0; j < integrableObjects.size(); j++){
272 >
273 >       for(j=0; j < nCurObj; j++){
274          
275            eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
276            if(eof_test == NULL){
# Line 286 | Line 287 | void InitializeFromFile :: readInit( SimInfo* the_simn
287  
288              MPI_Send(read_buffer, BUFFERSIZE, MPI_CHAR, which_node,
289                        TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
290 <          
290 >
291         }
292  
293        }
# Line 648 | Line 649 | void initFile::nodeZeroError( void ){
649    int j, myStatus;
650  
651    myStatus = 0;
652 <  for (j = 0; j < mpiSim->getNumberProcessors(); j++) {
652 >  for (j = 0; j < mpiSim->getNprocessors(); j++) {
653      MPI_Send( &myStatus, 1, MPI_INT, j,
654                TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
655    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines