--- trunk/OOPSE/libmdtools/SimSetup.cpp 2003/08/12 17:51:33 682 +++ trunk/OOPSE/libmdtools/SimSetup.cpp 2003/08/12 19:56:49 689 @@ -5,6 +5,7 @@ #include #include "SimSetup.hpp" +#include "ReadWrite.hpp" #include "parse_me.h" #include "Integrator.hpp" #include "simError.h" @@ -96,18 +97,26 @@ void SimSetup::createSim(void){ int i, j, k, globalAtomIndex; // gather all of the information from the Bass file - + + std::cerr << "gathering info\n"; + gatherInfo(); // creation of complex system objects + std::cerr << "creating system objects\n"; + sysObjectsCreation(); // check on the post processing info + std::cerr << "performing final info check.\n"; + finalInfoCheck(); // initialize the system coordinates + + std::cerr << "about to init coords\n"; if( !isInfoArray ) initSystemCoords(); @@ -888,6 +897,8 @@ void SimSetup::initSystemCoords( void ){ void SimSetup::initSystemCoords( void ){ int i; + char* inName; + std::cerr << "Setting atom Coords\n"; (info[0].getConfiguration())->createArrays( info[0].n_atoms ); @@ -900,7 +911,8 @@ void SimSetup::initSystemCoords( void ){ #ifdef IS_MPI // is_mpi if( worldRank == 0 ){ #endif //is_mpi - fileInit = new InitializeFromFile( globals->getInitialConfig() ); + inName = globals->getInitialConfig(); + fileInit = new InitializeFromFile( inName ); #ifdef IS_MPI }else fileInit = new InitializeFromFile( NULL ); #endif @@ -1033,7 +1045,7 @@ void SimSetup::sysObjectsCreation( void ){ int i,k; // create the forceField - + createFF(); // extract componentList @@ -1051,11 +1063,11 @@ void SimSetup::sysObjectsCreation( void ){ #endif //is_mpi // create the atom and SRI arrays. Also initialize Molecule Stamp ID's - + makeSysArrays(); // make and initialize the molecules (all but atomic coordinates) - + makeMolecules(); for(k=0; k