--- trunk/src/integrators/Velocitizer.cpp 2005/03/01 19:11:47 384 +++ trunk/src/integrators/Velocitizer.cpp 2005/03/02 16:28:20 393 @@ -44,20 +44,34 @@ #include "primitives/Molecule.hpp" #include "primitives/StuntDouble.hpp" +#ifndef IS_MPI +#include "math/SeqRandNumGen.hpp" +#else +#include "math/ParallelRandNumGen.hpp" +#endif + namespace oopse { -Velocitizer::Velocitizer(SimInfo* info) { +Velocitizer::Velocitizer(SimInfo* info) : info_(info) { int seedValue; Globals * simParams = info->getSimParams(); +#ifndef IS_MPI if (simParams->haveSeed()) { seedValue = simParams->getSeed(); - randNumGen_ = new OOPSERandNumGen(seedValue); + randNumGen_ = new SeqRandNumGen(seedValue); }else { - randNumGen_ = new OOPSERandNumGen(); + randNumGen_ = new SeqRandNumGen(); } - +#else + if (simParams->haveSeed()) { + seedValue = simParams->getSeed(); + randNumGen_ = new ParallelRandNumGen(seedValue); + }else { + randNumGen_ = new ParallelRandNumGen(); + } +#endif } Velocitizer::~Velocitizer() {