# | Line 78 | Line 78 | namespace OpenMD { | |
---|---|---|
78 | ||
79 | ||
80 | #ifdef IS_MPI | |
81 | < | MPI::Status istatus; |
81 | > | MPI_Status* istatus; |
82 | #endif | |
83 | ||
84 | #ifndef IS_MPI | |
# | Line 148 | Line 148 | namespace OpenMD { | |
148 | (*output_) << "#time\t"; | |
149 | (*output_) << buffer; | |
150 | ||
151 | < | int nProc = MPI::COMM_WORLD.Get_size(); |
151 | > | int nProc; |
152 | > | MPI_Comm_size( MPI_COMM_WORLD, &nProc); |
153 | > | |
154 | for (int i = 1; i < nProc; ++i) { | |
155 | ||
156 | // receive the length of the string buffer that was | |
157 | // prepared by processor i | |
158 | ||
159 | int recvLength; | |
160 | < | MPI::COMM_WORLD.Recv(&recvLength, 1, MPI::INT, i, 0, istatus); |
160 | > | MPI_Recv(&recvLength, 1, MPI_INT, i, 0, MPI_COMM_WORLD, istatus); |
161 | char* recvBuffer = new char[recvLength]; | |
162 | if (recvBuffer == NULL) { | |
163 | } else { | |
164 | < | MPI::COMM_WORLD.Recv(recvBuffer, recvLength, MPI::CHAR, i, 0, |
165 | < | istatus); |
164 | > | MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, |
165 | > | istatus); |
166 | (*output_) << recvBuffer; | |
167 | delete [] recvBuffer; | |
168 | } | |
# | Line 168 | Line 170 | namespace OpenMD { | |
170 | (*output_).flush(); | |
171 | } else { | |
172 | int sendBufferLength = buffer.size() + 1; | |
173 | < | MPI::COMM_WORLD.Send(&sendBufferLength, 1, MPI::INT, masterNode, 0); |
174 | < | MPI::COMM_WORLD.Send((void *)buffer.c_str(), sendBufferLength, MPI::CHAR, |
175 | < | masterNode, 0); |
173 | > | MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD); |
174 | > | MPI_Send((void *)buffer.c_str(), sendBufferLength, MPI_CHAR, |
175 | > | masterNode, 0, MPI_COMM_WORLD); |
176 | } | |
177 | ||
178 | #endif // is_mpi | |
# | Line 180 | Line 182 | namespace OpenMD { | |
182 | void RestWriter::writeRest(std::vector<std::map<int, Restraint::RealPair> > restInfo) { | |
183 | ||
184 | #ifdef IS_MPI | |
185 | < | MPI::Status istatus; |
185 | > | MPI_Status* istatus; |
186 | #endif | |
187 | ||
188 | #ifndef IS_MPI | |
# | Line 224 | Line 226 | namespace OpenMD { | |
226 | (*output_) << buffer; | |
227 | ||
228 | int nProc; | |
229 | < | nProc = MPI::COMM_WORLD.Get_size(); |
229 | > | MPI_Comm_size( MPI_COMM_WORLD, &nProc); |
230 | for (int i = 1; i < nProc; ++i) { | |
231 | ||
232 | // receive the length of the string buffer that was | |
233 | // prepared by processor i | |
234 | ||
235 | int recvLength; | |
236 | < | MPI::COMM_WORLD.Recv(&recvLength, 1, MPI::INT, i, 0, istatus); |
236 | > | MPI_Recv(&recvLength, 1, MPI_INT, i, 0, MPI_COMM_WORLD, istatus); |
237 | char* recvBuffer = new char[recvLength]; | |
238 | if (recvBuffer == NULL) { | |
239 | } else { | |
240 | < | MPI::COMM_WORLD.Recv(recvBuffer, recvLength, MPI::CHAR, i, 0, |
241 | < | istatus); |
240 | > | MPI_Recv(recvBuffer, recvLength, MPI_CHAR, i, 0, MPI_COMM_WORLD, |
241 | > | istatus); |
242 | (*output_) << recvBuffer; | |
243 | ||
244 | delete [] recvBuffer; | |
# | Line 245 | Line 247 | namespace OpenMD { | |
247 | (*output_).flush(); | |
248 | } else { | |
249 | int sendBufferLength = buffer.size() + 1; | |
250 | < | MPI::COMM_WORLD.Send(&sendBufferLength, 1, MPI::INT, masterNode, 0); |
251 | < | MPI::COMM_WORLD.Send((void *)buffer.c_str(), sendBufferLength, |
252 | < | MPI::CHAR, masterNode, 0); |
250 | > | MPI_Send(&sendBufferLength, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD); |
251 | > | MPI_Send((void *)buffer.c_str(), sendBufferLength, |
252 | > | MPI_CHAR, masterNode, 0, MPI_COMM_WORLD); |
253 | } | |
254 | #endif // is_mpi | |
255 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |