--- trunk/OOPSE/libmdtools/SimSetup.cpp 2003/06/17 21:56:15 555 +++ trunk/OOPSE/libmdtools/SimSetup.cpp 2003/06/25 21:12:14 567 @@ -12,6 +12,16 @@ #include "mpiSimulation.hpp" #endif +// some defines for ensemble and Forcefield cases + +#define NVE_ENS 0 +#define NVT_ENS 1 +#define NPT_ENS 2 + +#define FF_DUFF 0 +#define FF_LJ 1 + + SimSetup::SimSetup(){ stamps = new MakeStamps(); globals = new Globals(); @@ -66,8 +76,13 @@ void SimSetup::createSim( void ){ MakeStamps *the_stamps; Globals* the_globals; - ExtendedSystem* the_extendedsystem; int i, j, k, globalAtomIndex; + + int ensembleCase; + int ffCase; + + ensembleCase = -1; + ffCase = -1; // get the stamps and globals; the_stamps = stamps; @@ -82,65 +97,23 @@ void SimSetup::createSim( void ){ n_components = the_globals->getNComponents(); strcpy( force_field, the_globals->getForceField() ); - // get the ensemble and set up an extended system if we need it: + if( !strcasecmp( force_field, "DUFF" )) ffCase = FF_DUFF; + else if( !strcasecmp( force_field, "LJ" )) ffCase = FF_LJ; + else{ + sprintf( painCave.errMsg, + "SimSetup Error. Unrecognized force field -> %s\n", + force_field ); + painCave.isFatal = 1; + simError(); + } + + // get the ensemble: strcpy( ensemble, the_globals->getEnsemble() ); - if( !strcasecmp( ensemble, "NPT" ) ) { - the_extendedsystem = new ExtendedSystem( simnfo ); - the_extendedsystem->setTargetTemp(the_globals->getTargetTemp()); - if (the_globals->haveTargetPressure()) - the_extendedsystem->setTargetPressure(the_globals->getTargetPressure()); - else { - sprintf( painCave.errMsg, - "SimSetup error: If you use the constant pressure\n" - " ensemble, you must set targetPressure.\n" - " This was found in the BASS file.\n"); - painCave.isFatal = 1; - simError(); - } - if (the_globals->haveTauThermostat()) - the_extendedsystem->setTauThermostat(the_globals->getTauThermostat()); - else if (the_globals->haveQmass()) - the_extendedsystem->setQmass(the_globals->getQmass()); - else { - sprintf( painCave.errMsg, - "SimSetup error: If you use one of the constant temperature\n" - " ensembles, you must set either tauThermostat or qMass.\n" - " Neither of these was found in the BASS file.\n"); - painCave.isFatal = 1; - simError(); - } - - if (the_globals->haveTauBarostat()) - the_extendedsystem->setTauBarostat(the_globals->getTauBarostat()); - else { - sprintf( painCave.errMsg, - "SimSetup error: If you use the constant pressure\n" - " ensemble, you must set tauBarostat.\n" - " This was found in the BASS file.\n"); - painCave.isFatal = 1; - simError(); - } - - } else if ( !strcasecmp( ensemble, "NVT") ) { - the_extendedsystem = new ExtendedSystem( simnfo ); - the_extendedsystem->setTargetTemp(the_globals->getTargetTemp()); - - if (the_globals->haveTauThermostat()) - the_extendedsystem->setTauThermostat(the_globals->getTauThermostat()); - else if (the_globals->haveQmass()) - the_extendedsystem->setQmass(the_globals->getQmass()); - else { - sprintf( painCave.errMsg, - "SimSetup error: If you use one of the constant temperature\n" - " ensembles, you must set either tauThermostat or qMass.\n" - " Neither of these was found in the BASS file.\n"); - painCave.isFatal = 1; - simError(); - } - - } else if ( !strcasecmp( ensemble, "NVE") ) { - } else { + if( !strcasecmp( ensemble, "NVE" )) ensembleCase = NVE_ENS; + else if( !strcasecmp( ensemble, "NVT" )) ensembleCase = NVT_ENS; + else if( !strcasecmp( ensemble, "NPT" )) ensembleCase = NPT_ENS; + else{ sprintf( painCave.errMsg, "SimSetup Warning. Unrecognized Ensemble -> %s, " "reverting to NVE for this simulation.\n", @@ -148,22 +121,84 @@ void SimSetup::createSim( void ){ painCave.isFatal = 0; simError(); strcpy( ensemble, "NVE" ); + ensembleCase = NVE_ENS; } strcpy( simnfo->ensemble, ensemble ); + +// if( !strcasecmp( ensemble, "NPT" ) ) { +// the_extendedsystem = new ExtendedSystem( simnfo ); +// the_extendedsystem->setTargetTemp(the_globals->getTargetTemp()); +// if (the_globals->haveTargetPressure()) +// the_extendedsystem->setTargetPressure(the_globals->getTargetPressure()); +// else { +// sprintf( painCave.errMsg, +// "SimSetup error: If you use the constant pressure\n" +// " ensemble, you must set targetPressure.\n" +// " This was found in the BASS file.\n"); +// painCave.isFatal = 1; +// simError(); +// } + +// if (the_globals->haveTauThermostat()) +// the_extendedsystem->setTauThermostat(the_globals->getTauThermostat()); +// else if (the_globals->haveQmass()) +// the_extendedsystem->setQmass(the_globals->getQmass()); +// else { +// sprintf( painCave.errMsg, +// "SimSetup error: If you use one of the constant temperature\n" +// " ensembles, you must set either tauThermostat or qMass.\n" +// " Neither of these was found in the BASS file.\n"); +// painCave.isFatal = 1; +// simError(); +// } + +// if (the_globals->haveTauBarostat()) +// the_extendedsystem->setTauBarostat(the_globals->getTauBarostat()); +// else { +// sprintf( painCave.errMsg, +// "SimSetup error: If you use the constant pressure\n" +// " ensemble, you must set tauBarostat.\n" +// " This was found in the BASS file.\n"); +// painCave.isFatal = 1; +// simError(); +// } + +// } else if ( !strcasecmp( ensemble, "NVT") ) { +// the_extendedsystem = new ExtendedSystem( simnfo ); +// the_extendedsystem->setTargetTemp(the_globals->getTargetTemp()); + +// if (the_globals->haveTauThermostat()) +// the_extendedsystem->setTauThermostat(the_globals->getTauThermostat()); +// else if (the_globals->haveQmass()) +// the_extendedsystem->setQmass(the_globals->getQmass()); +// else { +// sprintf( painCave.errMsg, +// "SimSetup error: If you use one of the constant temperature\n" +// " ensembles, you must set either tauThermostat or qMass.\n" +// " Neither of these was found in the BASS file.\n"); +// painCave.isFatal = 1; +// simError(); +// } + strcpy( simnfo->mixingRule, the_globals->getMixingRule() ); simnfo->usePBC = the_globals->getPBC(); int usesDipoles = 0; - if( !strcmp( force_field, "TraPPE_Ex" ) ){ - the_ff = new TraPPE_ExFF(); + switch( ffCase ){ + + case FF_DUFF: + the_ff = new DUFF(); usesDipoles = 1; - } - else if( !strcasecmp( force_field, "LJ" ) ) the_ff = new LJ_FF(); - else{ + break; + + case FF_LJ: + the_ff = new LJFF(); + break; + + default: sprintf( painCave.errMsg, - "SimSetup Error. Unrecognized force field -> %s\n", - force_field ); + "SimSetup Error. Unrecognized force field in case statement.\n"); painCave.isFatal = 1; simError(); } @@ -173,8 +208,6 @@ void SimSetup::createSim( void ){ MPIcheckPoint(); #endif // is_mpi - - // get the components and calculate the tot_nMol and indvidual n_mol the_components = the_globals->getComponents(); components_nmol = new int[n_components]; @@ -735,15 +768,41 @@ void SimSetup::createSim( void ){ // make the integrator + + + NVT* myNVT = NULL; + switch( ensembleCase ){ + case NVE_ENS: + new NVE( simnfo, the_ff ); + break; - if( !strcmp( ensemble, "TraPPE_Ex" ) ){ - new Symplectic(simnfo, the_ff, the_extendedsystem); - } - else if( !strcmp( force_field, "LJ" ) ){ - new Verlet( *simnfo, the_ff, the_extendedsystem ); + case NVT_ENS: + myNVT = new NVT( simnfo, the_ff ); + myNVT->setTargetTemp(the_globals->getTargetTemp()); + + if (the_globals->haveTauThermostat()) + myNVT->setTauThermostat(the_globals->getTauThermostat()); +// else if (the_globals->haveQmass()) +// myNVT->setQmass(the_globals->getQmass()); + else { + sprintf( painCave.errMsg, + "SimSetup error: If you use the NVT\n" + " ensemble, you must set either tauThermostat or qMass.\n" + " Neither of these was found in the BASS file.\n"); + painCave.isFatal = 1; + simError(); + } + break; + + default: + sprintf( painCave.errMsg, + "SimSetup Error. Unrecognized ensemble in case statement.\n"); + painCave.isFatal = 1; + simError(); } + #ifdef IS_MPI mpiSim->mpiRefresh(); #endif