# | Line 1 | Line 1 | |
---|---|---|
1 | < | /* |
1 | > | /* |
2 | * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. | |
3 | * | |
4 | * The University of Notre Dame grants you ("Licensee") a | |
# | Line 43 | Line 43 | |
43 | #include <stdio.h> | |
44 | #include <string.h> | |
45 | #include "config.h" | |
46 | – | |
46 | #ifdef IS_MPI | |
47 | #include <mpi.h> | |
48 | + | #endif |
49 | ||
50 | int nChecks; | |
51 | – | #endif // IS_MPI |
51 | ||
52 | #include "utils/simError.h" | |
53 | ||
54 | errorStruct painCave; | |
55 | ||
57 | – | #ifdef IS_MPI |
58 | – | |
56 | char checkPointMsg[MAX_SIM_ERROR_MSG_LENGTH]; | |
57 | int worldRank; | |
58 | ||
62 | – | #endif |
63 | – | |
64 | – | |
59 | void initSimError( void ){ | |
60 | painCave.errMsg[0] = '\0'; | |
61 | painCave.isFatal = 0; | |
62 | painCave.severity = OOPSE_ERROR; | |
69 | – | #ifdef IS_MPI |
63 | painCave.isEventLoop = 0; | |
64 | nChecks = 0; | |
65 | + | #ifdef IS_MPI |
66 | MPI_Comm_rank( MPI_COMM_WORLD, &worldRank ); | |
67 | + | #else |
68 | + | worldRank = 0; |
69 | #endif | |
70 | } | |
71 | ||
# | Line 125 | Line 121 | int simError( void ) { | |
121 | return 1; | |
122 | } | |
123 | ||
128 | – | |
129 | – | #ifdef IS_MPI |
124 | ||
125 | < | void MPIcheckPoint( void ){ |
126 | < | |
125 | > | void errorCheckPoint( void ){ |
126 | > | |
127 | int myError = 0; | |
128 | < | int isError; |
128 | > | int isError = 0; |
129 | ||
130 | + | #ifdef IS_MPI |
131 | MPI_Allreduce( &myError, &isError, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD ); | |
132 | + | #else |
133 | + | isError = myError; |
134 | + | #endif |
135 | + | |
136 | if( isError ){ | |
137 | + | |
138 | + | #ifdef IS_MPI |
139 | MPI_Finalize(); | |
140 | + | #endif |
141 | + | |
142 | exit(0); | |
143 | } | |
144 | ||
145 | #ifdef CHECKPOINT_VERBOSE | |
146 | nChecks++; | |
147 | + | |
148 | + | #ifdef IS_MPI |
149 | if( worldRank == 0 ){ | |
150 | + | #endif |
151 | + | |
152 | fprintf(stderr, | |
153 | "Checkpoint #%d reached: %s\n", | |
154 | nChecks, | |
155 | checkPointMsg ); | |
156 | + | #ifdef IS_MPI |
157 | } | |
158 | < | #endif // CHECKPOINT_VERBOSE |
158 | > | #endif |
159 | ||
160 | + | #endif |
161 | } | |
162 | ||
163 | < | #endif // IS_MPI |
163 | > |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |