--- trunk/OOPSE/libmdtools/SimSetup.cpp 2003/10/28 16:03:37 829 +++ trunk/OOPSE/libmdtools/SimSetup.cpp 2003/10/29 17:55:28 841 @@ -103,10 +103,6 @@ void SimSetup::createSim(void){ sysObjectsCreation(); - // check on the post processing info - - finalInfoCheck(); - // initialize the system coordinates if ( !initSuspend ){ @@ -115,6 +111,10 @@ void SimSetup::createSim(void){ if( !(globals->getUseInitTime()) ) info[0].currentTime = 0.0; } + + // check on the post processing info + + finalInfoCheck(); // make the output filenames @@ -696,58 +696,12 @@ void SimSetup::gatherInfo(void){ } // check for the temperature set flag - + if (globals->haveTempSet()) info[i].setTemp = globals->getTempSet(); - - // get some of the tricky things that may still be in the globals - - double boxVector[3]; - if (globals->haveBox()){ - boxVector[0] = globals->getBox(); - boxVector[1] = globals->getBox(); - boxVector[2] = globals->getBox(); - - info[i].setBox(boxVector); - } - else if (globals->haveDensity()){ - double vol; - vol = (double) tot_nmol / globals->getDensity(); - boxVector[0] = pow(vol, (1.0 / 3.0)); - boxVector[1] = boxVector[0]; - boxVector[2] = boxVector[0]; - - info[i].setBox(boxVector); - } - else{ - if (!globals->haveBoxX()){ - sprintf(painCave.errMsg, - "SimSetup error, no periodic BoxX size given.\n"); - painCave.isFatal = 1; - simError(); - } - boxVector[0] = globals->getBoxX(); - - if (!globals->haveBoxY()){ - sprintf(painCave.errMsg, - "SimSetup error, no periodic BoxY size given.\n"); - painCave.isFatal = 1; - simError(); - } - boxVector[1] = globals->getBoxY(); - - if (!globals->haveBoxZ()){ - sprintf(painCave.errMsg, - "SimSetup error, no periodic BoxZ size given.\n"); - painCave.isFatal = 1; - simError(); - } - boxVector[2] = globals->getBoxZ(); - - info[i].setBox(boxVector); - } - } - + + } + //setup seed for random number generator int seedValue; @@ -851,7 +805,7 @@ void SimSetup::finalInfoCheck(void){ theEst = globals->getEST(); } - info[i].setEcr(theEcr, theEst); + info[i].setDefaultEcr(theEcr, theEst); if (!globals->haveDielectric()){ sprintf(painCave.errMsg, @@ -896,7 +850,7 @@ void SimSetup::finalInfoCheck(void){ theEst = globals->getEST(); } - info[i].setEcr(theEcr, theEst); + info[i].setDefaultEcr(theEcr, theEst); } } }