--- branches/mmeineke/OOPSE/libBASS/simError.c 2003/03/21 17:42:12 377 +++ trunk/OOPSE/libBASS/simError.c 2003/10/03 22:01:46 796 @@ -9,7 +9,16 @@ int nChecks; #include "simError.h" +errorStruct painCave; +#ifdef IS_MPI + +char checkPointMsg[MAX_SIM_ERROR_MSG_LENGTH]; +int worldRank; + +#endif + + void initSimError( void ){ painCave.errMsg[0] = '\0'; painCave.isFatal = 0; @@ -25,7 +34,6 @@ int simError( void ) { #ifdef IS_MPI int myError = 1; int isError; - int isFatal; if( painCave.isEventLoop ){ fprintf( stderr, @@ -37,6 +45,7 @@ int simError( void ) { else{ if( painCave.isFatal ){ fprintf( stderr, + "\n" "MPI Fatal Error on node %d: %s\n", worldRank, painCave.errMsg ); @@ -47,7 +56,8 @@ int simError( void ) { } else{ fprintf( stderr, - "MPI Non-Fatal Error on node %d: %s\n", + "\n" + "MPI Warning on node %d: %s\n", worldRank, painCave.errMsg ); } @@ -58,12 +68,14 @@ int simError( void ) { if( painCave.isFatal ){ fprintf( stderr, + "\n" "Fatal Error: %s\n", painCave.errMsg ); exit(0); } else{ fprintf( stderr, + "\n" "Warning: %s\n", painCave.errMsg ); } @@ -71,8 +83,6 @@ int simError( void ) { #endif // IS_MPI - return 0; // in case nobody caught that. - }