--- trunk/mdtools/interface_implementation/SimSetup.cpp 2002/09/30 20:35:42 124 +++ trunk/mdtools/interface_implementation/SimSetup.cpp 2002/11/05 22:04:46 164 @@ -6,11 +6,20 @@ #include "parse_me.h" #include "LRI.hpp" #include "Integrator.hpp" -#include "mpiInterface.h" +#ifdef IS_MPI +#include "mpiBASS.h" +#include "bassDiag.hpp" +#endif + SimSetup::SimSetup(){ stamps = new MakeStamps(); globals = new Globals(); + +#ifdef IS_MPI + strcpy( checkPointMsg, "SimSetup creation successful" ); + MPIcheckPoint(); +#endif IS_MPI } SimSetup::~SimSetup(){ @@ -20,28 +29,44 @@ void SimSetup::parseFile( char* fileName ){ void SimSetup::parseFile( char* fileName ){ - inFileName = fileName; - set_interface_stamps( stamps, globals ); -#ifdef MPI - mpiEventInit(); +#ifdef IS_MPI + if( worldRank == 0 ){ +#endif // is_mpi + + inFileName = fileName; + set_interface_stamps( stamps, globals ); + +#ifdef IS_MPI + mpiEventInit(); #endif - yacc_BASS( fileName ); -#ifdef MPI - throwMPIEvent(NULL); + + yacc_BASS( fileName ); + +#ifdef IS_MPI + throwMPIEvent(NULL); + } + else recieveParse(); #endif } -#ifdef MPI +#ifdef IS_MPI void SimSetup::receiveParse(void){ set_interface_stamps( stamps, globals ); mpiEventInit(); + MPIcheckPoint(); mpiEventLoop(); } -#endif + +void SimSetup::testMe(void){ + bassDiag* dumpMe = new bassDiag(globals,stamps); + dumpMe->dumpStamps(); + delete dumpMe; +} +#endif void SimSetup::createSim( void ){ MakeStamps *the_stamps; @@ -146,6 +171,7 @@ void SimSetup::createSim( void ){ // create the atom and short range interaction arrays the_atoms = new Atom*[tot_atoms]; + Atom::createArrays(tot_atoms); the_molecules = new Molecule[tot_nmol]; @@ -382,7 +408,7 @@ void SimSetup::makeAtoms( void ){ current_atom = comp_stamps[i]->getAtom( k ); if( current_atom->haveOrientation() ){ - dAtom = new DirectionalAtom; + dAtom = new DirectionalAtom(index); simnfo->n_oriented++; the_atoms[index] = dAtom; @@ -402,7 +428,7 @@ void SimSetup::makeAtoms( void ){ dAtom->setSUz( uz ); } else{ - the_atoms[index] = new GeneralAtom; + the_atoms[index] = new GeneralAtom(index); } the_atoms[index]->setType( current_atom->getType() ); the_atoms[index]->setIndex( index );