ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/integrators/Velocitizer.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/integrators/Velocitizer.cpp (file contents):
Revision 2068 by tim, Tue Mar 1 19:11:47 2005 UTC vs.
Revision 2076 by tim, Wed Mar 2 15:36:14 2005 UTC

# Line 44 | Line 44 | namespace oopse {
44   #include "primitives/Molecule.hpp"
45   #include "primitives/StuntDouble.hpp"
46  
47 + #ifndef IS_MPI
48 + #include "math/SeqRandNumGen.hpp"
49 + #else
50 + #include "math/ParallelRandNumGen.hpp"
51 + #endif
52 +
53   namespace oopse {
54  
55   Velocitizer::Velocitizer(SimInfo* info) {
# Line 51 | Line 57 | Velocitizer::Velocitizer(SimInfo* info) {
57      int seedValue;
58      Globals * simParams = info->getSimParams();
59  
60 + #ifndef IS_MPI
61      if (simParams->haveSeed()) {
62          seedValue = simParams->getSeed();
63 <        randNumGen_ = new OOPSERandNumGen(seedValue);
63 >        randNumGen_ = new SeqRandNumGen(seedValue);
64      }else {
65 <        randNumGen_ = new OOPSERandNumGen();
65 >        randNumGen_ = new SeqRandNumGen();
66      }    
67 <
67 > #else
68 >    if (simParams->haveSeed()) {
69 >        seedValue = simParams->getSeed();
70 >        randNumGen_ = new ParallelRandNumGen(seedValue);
71 >    }else {
72 >        randNumGen_ = new ParallelRandNumGen();
73 >    }    
74 > #endif
75   }
76  
77   Velocitizer::~Velocitizer() {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines