ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/math/ParallelRandNumGen.cpp
(Generate patch)

Comparing trunk/src/math/ParallelRandNumGen.cpp (file contents):
Revision 1938 by gezelter, Thu Oct 31 15:32:17 2013 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC

# Line 55 | Line 55 | namespace OpenMD {
55  
56   #ifdef IS_MPI
57      const int masterNode = 0;
58 <    MPI::COMM_WORLD.Bcast(&seed, 1, MPI::UNSIGNED_LONG, masterNode);
58 >    MPI_Bcast(&seed, 1, MPI_UNSIGNED_LONG, masterNode, MPI_COMM_WORLD);
59   #endif
60  
61      if (seed != oneSeed) {
# Line 67 | Line 67 | namespace OpenMD {
67  
68      int nProcessors;
69   #ifdef IS_MPI
70 <    nProcessors = MPI::COMM_WORLD.Get_size();
71 <    myRank_ = MPI::COMM_WORLD.Get_rank();
70 >    MPI_Comm_size( MPI_COMM_WORLD, &nProcessors);
71 >    MPI_Comm_rank( MPI_COMM_WORLD, &myRank_);
72 >
73   #else
74      nProcessors = 1;
75      myRank_ = 0;
# Line 87 | Line 88 | namespace OpenMD {
88  
89      int nProcessors;
90   #ifdef IS_MPI
91 <    nProcessors = MPI::COMM_WORLD.Get_size();
92 <    myRank_ = MPI::COMM_WORLD.Get_rank();
91 >    MPI_Comm_size( MPI_COMM_WORLD, &nProcessors);
92 >    MPI_Comm_rank( MPI_COMM_WORLD, &myRank_);
93   #else
94      nProcessors = 1;
95      myRank_ = 0;
# Line 105 | Line 106 | namespace OpenMD {
106      unsigned long seed = oneSeed;
107   #ifdef IS_MPI
108      const int masterNode = 0;
109 <    MPI::COMM_WORLD.Bcast(&seed, 1, MPI::UNSIGNED_LONG, masterNode);
109 >    MPI_Bcast(&seed, 1, MPI_UNSIGNED_LONG, masterNode, MPI_COMM_WORLD);
110   #endif
111      if (seed != oneSeed) {
112        sprintf(painCave.errMsg,
# Line 134 | Line 135 | namespace OpenMD {
135  
136   #ifdef IS_MPI
137        size = bigSeed.size();
138 <      MPI::COMM_WORLD.Bcast(&size, 1, MPI::INT, masterNode);
139 <      MPI::COMM_WORLD.Bcast(&bigSeed[0], size, MPI::UNSIGNED_LONG, masterNode);
138 >      MPI_Bcast(&size, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
139 >      MPI_Bcast(&bigSeed[0], size, MPI_UNSIGNED_LONG, masterNode,
140 >                MPI_COMM_WORLD);
141      }else {
142 <      MPI::COMM_WORLD.Bcast(&size, 1, MPI::INT, masterNode);
142 >      MPI_Bcast(&size, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
143        bigSeed.resize(size);
144 <      MPI::COMM_WORLD.Bcast(&bigSeed[0], size, MPI::UNSIGNED_LONG, masterNode);
144 >      MPI_Bcast(&bigSeed[0], size, MPI_UNSIGNED_LONG, masterNode,
145 >                MPI_COMM_WORLD);
146      }
147   #endif
148      

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines