--- trunk/mdtools/interface_implementation/BASS_interface.cpp	2002/10/11 15:09:09	134
+++ trunk/mdtools/interface_implementation/BASS_interface.cpp	2002/11/05 22:04:46	164
@@ -6,9 +6,10 @@
 #include "SimSetup.hpp"
 #include "Globals.hpp"
 #include "BASS_interface.h"
+#include "simError.h"
 
 #ifdef IS_MPI
-#include "mpiInterface.h"
+#include "mpiBASS.h"
 #endif
 
 
@@ -262,11 +263,14 @@ void incr_block( block_type new_block ){
   block_stack_ptr++;
   
   if( block_stack_ptr >= MAX_NEST ){
-    fprintf( stderr, "Event blocks nested too deeply\n" );
+    sprintf( painCave.errMsg,
+	     "Event blocks nested too deeply\n" );
+    painCave.isFatal = 1;
+    simError();
+
 #ifdef IS_MPI
-    mpiInterfaceExit();
-#endif
-    exit(1);
+    if( worldRank == 0 ) mpiInterfaceExit();
+#endif //is_mpi
   }
 
   else current_block = new_block; 
@@ -279,11 +283,15 @@ void decr_block( void ){
 
   if( block_stack_ptr < 0 ){
     
-    fprintf( stderr, "Too many event blocks closed\n" );
+    sprintf( painCave.errMsg,
+	     "Too many event blocks closed\n" );
+    painCave.isFatal = 1;
+    simError();
+
 #ifdef IS_MPI
-    mpiInterfaceExit();
-#endif
-    exit(1);
+    if( worldRank == 0 ) mpiInterfaceExit();
+#endif //is_mpi
+
   }
   
   else current_block = block_stack[block_stack_ptr];