| 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 ); |
| 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 ){ |
| 229 |
|
simError(); |
| 230 |
|
} |
| 231 |
|
|
| 232 |
< |
for (i=0 ; i < mpiSim->getTotNmol(); i++) { |
| 232 |
> |
for (i=0 ; i < mpiSim->getNMolGlobal(); i++) { |
| 233 |
|
which_node = MolToProcMap[i]; |
| 234 |
|
if(which_node == 0){ |
| 235 |
|
//molecules belong to master node |
| 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){ |
| 287 |
|
|
| 288 |
|
MPI_Send(read_buffer, BUFFERSIZE, MPI_CHAR, which_node, |
| 289 |
|
TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD); |
| 290 |
< |
|
| 290 |
> |
|
| 291 |
|
} |
| 292 |
|
|
| 293 |
|
} |
| 308 |
|
simError(); |
| 309 |
|
} |
| 310 |
|
|
| 311 |
< |
for (i=0 ; i < mpiSim->getTotNmol(); i++) { |
| 311 |
> |
for (i=0 ; i < mpiSim->getNMolGlobal(); i++) { |
| 312 |
|
which_node = MolToProcMap[i]; |
| 313 |
|
|
| 314 |
|
if(which_node == worldRank){ |
| 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 |
|
} |
