# | Line 405 | Line 405 | void SimSetup::createSim( void ){ | |
---|---|---|
405 | ||
406 | ||
407 | ||
408 | < | // if( the_globals->haveInitialConfig() ){ |
409 | < | // InitializeFromFile* fileInit; |
410 | < | // fileInit = new InitializeFromFile( the_globals->getInitialConfig() ); |
411 | < | |
412 | < | // fileInit->read_xyz( simnfo ); // default velocities on |
408 | > | if( the_globals->haveInitialConfig() ){ |
409 | > | |
410 | > | InitializeFromFile* fileInit; |
411 | > | #ifdef IS_MPI // is_mpi |
412 | > | if( worldRank == 0 ){ |
413 | > | #endif //is_mpi |
414 | > | fileInit = new InitializeFromFile( the_globals->getInitialConfig() ); |
415 | > | #ifdef IS_MPI |
416 | > | }else fileInit = new InitializeFromFile( NULL ); |
417 | > | #endif |
418 | > | fileInit->read_xyz( simnfo ); // default velocities on |
419 | ||
420 | < | // delete fileInit; |
421 | < | // } |
422 | < | // else{ |
420 | > | delete fileInit; |
421 | > | } |
422 | > | else{ |
423 | ||
424 | #ifdef IS_MPI | |
425 | ||
# | Line 428 | Line 434 | void SimSetup::createSim( void ){ | |
434 | ||
435 | initFromBass(); | |
436 | ||
437 | < | #endif // is_mpi |
438 | < | |
437 | > | |
438 | > | #endif |
439 | > | } |
440 | > | |
441 | #ifdef IS_MPI | |
442 | strcpy( checkPointMsg, "Successfully read in the initial configuration" ); | |
443 | MPIcheckPoint(); | |
# | Line 439 | Line 447 | void SimSetup::createSim( void ){ | |
447 | ||
448 | ||
449 | ||
450 | < | // } |
450 | > | |
451 | ||
452 | #ifdef IS_MPI | |
453 | if( worldRank == 0 ){ |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |