--- trunk/OOPSE/libmdtools/SimSetup.cpp 2003/07/22 19:54:52 645 +++ trunk/OOPSE/libmdtools/SimSetup.cpp 2003/07/29 16:32:37 656 @@ -24,12 +24,17 @@ #define FF_DUFF 0 #define FF_LJ 1 +#define FF_EAM 2 - SimSetup::SimSetup(){ + + isInfoArray = 0; + nInfo = 1; + stamps = new MakeStamps(); globals = new Globals(); + #ifdef IS_MPI strcpy( checkPointMsg, "SimSetup creation successful" ); MPIcheckPoint(); @@ -41,6 +46,13 @@ SimSetup::~SimSetup(){ delete globals; } +void SimSetup::setSimInfo( SimInfo* the_info, int theNinfo ) { + info = the_info; + nInfo = theNinfo; + isInfoArray = 1; + } + + void SimSetup::parseFile( char* fileName ){ #ifdef IS_MPI @@ -586,6 +598,7 @@ void SimSetup::gatherInfo( void ){ if( !strcasecmp( force_field, "DUFF" )) ffCase = FF_DUFF; else if( !strcasecmp( force_field, "LJ" )) ffCase = FF_LJ; + else if( !strcasecmp( force_field, "EAM" )) ffCase = FF_EAM; else{ sprintf( painCave.errMsg, "SimSetup Error. Unrecognized force field -> %s\n", @@ -1032,6 +1045,10 @@ void SimSetup::createFF( void ){ the_ff = new LJFF(); break; + case FF_EAM: + the_ff = new EAM_FF(); + break; + default: sprintf( painCave.errMsg, "SimSetup Error. Unrecognized force field in case statement.\n");