| 64 |
|
painCave.isEventLoop = 0; |
| 65 |
|
nChecks = 0; |
| 66 |
|
#ifdef IS_MPI |
| 67 |
< |
MPI_Comm_rank( MPI_COMM_WORLD, &worldRank ); |
| 67 |
> |
worldRank = MPI::COMM_WORLD.Get_rank(); |
| 68 |
|
#else |
| 69 |
|
worldRank = 0; |
| 70 |
|
#endif |
| 73 |
|
int simError( void ) { |
| 74 |
|
|
| 75 |
|
int myError = 1; |
| 76 |
– |
int isError; |
| 76 |
|
char errorMsg[MAX_SIM_ERROR_MSG_LENGTH]; |
| 77 |
+ |
|
| 78 |
+ |
#ifdef IS_MPI |
| 79 |
+ |
int isError; |
| 80 |
|
char nodeMsg[MAX_SIM_ERROR_MSG_LENGTH]; |
| 81 |
+ |
#endif |
| 82 |
|
|
| 83 |
|
strcpy(errorMsg, "OpenMD "); |
| 84 |
|
switch( painCave.severity ) { |
| 118 |
|
|
| 119 |
|
if (painCave.isFatal) { |
| 120 |
|
#ifdef IS_MPI |
| 121 |
< |
MPI_Allreduce( &myError, &isError, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD ); |
| 122 |
< |
MPI_Finalize(); |
| 121 |
> |
MPI::COMM_WORLD.Allreduce(&myError, &isError, 1, MPI::INT, MPI::LOR); |
| 122 |
> |
MPI::Finalize(); |
| 123 |
|
#endif |
| 124 |
|
exit(0); |
| 125 |
< |
} |
| 123 |
< |
|
| 125 |
> |
} |
| 126 |
|
return 1; |
| 127 |
|
} |
| 126 |
– |
|
| 128 |
|
|
| 129 |
+ |
|
| 130 |
|
void errorCheckPoint( void ){ |
| 131 |
< |
|
| 131 |
> |
|
| 132 |
|
int myError = 0; |
| 133 |
|
int isError = 0; |
| 134 |
< |
|
| 134 |
> |
|
| 135 |
|
#ifdef IS_MPI |
| 136 |
< |
MPI_Allreduce( &myError, &isError, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD ); |
| 136 |
> |
MPI::COMM_WORLD.Allreduce(&myError, &isError, 1, MPI::INT, MPI::LOR); |
| 137 |
|
#else |
| 138 |
|
isError = myError; |
| 139 |
|
#endif |
| 140 |
< |
|
| 141 |
< |
if( isError ){ |
| 140 |
< |
|
| 140 |
> |
|
| 141 |
> |
if( isError ){ |
| 142 |
|
#ifdef IS_MPI |
| 143 |
< |
MPI_Finalize(); |
| 144 |
< |
#endif |
| 144 |
< |
|
| 143 |
> |
MPI::Finalize(); |
| 144 |
> |
#endif |
| 145 |
|
exit(0); |
| 146 |
|
} |
| 147 |
< |
|
| 147 |
> |
|
| 148 |
|
#ifdef CHECKPOINT_VERBOSE |
| 149 |
|
nChecks++; |
| 150 |
|
|
