--- trunk/mdtools/interface_implementation/SimSetup.cpp 2002/12/11 20:39:41 205 +++ trunk/mdtools/interface_implementation/SimSetup.cpp 2002/12/12 21:21:59 206 @@ -405,15 +405,21 @@ void SimSetup::createSim( void ){ -// if( the_globals->haveInitialConfig() ){ -// InitializeFromFile* fileInit; -// fileInit = new InitializeFromFile( the_globals->getInitialConfig() ); - -// fileInit->read_xyz( simnfo ); // default velocities on + if( the_globals->haveInitialConfig() ){ + + InitializeFromFile* fileInit; +#ifdef IS_MPI // is_mpi + if( worldRank == 0 ){ +#endif //is_mpi + fileInit = new InitializeFromFile( the_globals->getInitialConfig() ); +#ifdef IS_MPI + }else fileInit = new InitializeFromFile( NULL ); +#endif + fileInit->read_xyz( simnfo ); // default velocities on -// delete fileInit; -// } -// else{ + delete fileInit; + } + else{ #ifdef IS_MPI @@ -428,8 +434,10 @@ void SimSetup::createSim( void ){ initFromBass(); -#endif // is_mpi - + +#endif + } + #ifdef IS_MPI strcpy( checkPointMsg, "Successfully read in the initial configuration" ); MPIcheckPoint(); @@ -439,7 +447,7 @@ void SimSetup::createSim( void ){ - // } + #ifdef IS_MPI if( worldRank == 0 ){