Added CactusDefaultAbort

git-svn-id: http://svn.cactuscode.org/flesh/trunk@1748 17b73243-c579-4c4c-a9d2-2d5706c11dac

3 files changed, 49 insertions, 14 deletions

diff --git a/src/comm/CactusDefaultComm.c b/src/comm/CactusDefaultComm.c
index ccbc203d..d490dff2 100644
--- a/src/comm/CactusDefaultComm.c
+++ b/src/comm/CactusDefaultComm.c
@@ -298,6 +298,36 @@ int CactusDefaultExit(cGH *GH, int retval)
   return (0);
 }
 
+
+
+ /*@@
+   @routine    CactusDefaultAbort
+   @date       Saturday July 15 2000
+   @author     Gabrielle Allen
+   @desc 
+   The default for when people call CCTK_Abort
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
+int CactusDefaultAbort(cGH *GH, int retval)
+{
+#ifdef CCTK_MPI
+  if(MPI_Active)
+  {
+    CACTUS_MPI_ERROR(MPI_Abort(MPI_COMM_WORLD,retval));
+  }
+#else
+  assert(0);
+#endif
+  exit(0);
+  return(0);
+}
+
  /*@@
    @routine    CactusDefaultBarrier
    @date       Tue Apr 18 15:21:42 2000
diff --git a/src/comm/OverloadComm.c b/src/comm/OverloadComm.c
index 13548666..3aaf5ab8 100644
--- a/src/comm/OverloadComm.c
+++ b/src/comm/OverloadComm.c
@@ -27,11 +27,12 @@ CCTK_FILEVERSION(comm_OverloadComm_c)
 #define OVERLOADABLE(name) OVERLOADABLE_DUMMYPROTOTYPE(name)
 
   /* Deal seperately with the SetupGH routine */
+#define CCTKi_DummyAbort    CactusDefaultAbort
+#define CCTKi_DummyBarrier  CactusDefaultBarrier
+#define CCTKi_DummyExit     CactusDefaultExit
+#define CCTKi_DummyMyProc   CactusDefaultMyProc
+#define CCTKi_DummynProcs   CactusDefaultnProcs
 #define CCTKi_DummySetupGH  CactusDefaultSetupGH
-#define CCTKi_DummyMyProc  CactusDefaultMyProc
-#define CCTKi_DummynProcs  CactusDefaultnProcs
-#define CCTKi_DummyBarrier CactusDefaultBarrier
-#define CCTKi_DummyExit    CactusDefaultExit
 
 #include "CommOverloadables.h"
 
@@ -41,6 +42,7 @@ CCTK_FILEVERSION(comm_OverloadComm_c)
 #undef CCTKi_DummynProcs
 #undef CCTKi_DummyBarrier
 #undef CCTKi_DummyExit
+#undef CCTKi_DummyAbort
 
 #undef OVERLOADABLE
 
@@ -74,20 +76,22 @@ int CCTKi_SetupCommFunctions(void)
 #define OVERLOADABLE(name) OVERLOADABLE_CHECK(name)
 
   /* Deal seperately with the SetupGH routine */
-#define CCTKi_DummySetupGH CactusDefaultSetupGH
-#define CCTKi_DummyMyProc  CactusDefaultMyProc
-#define CCTKi_DummynProcs  CactusDefaultnProcs
+#define CCTKi_DummyAbort   CactusDefaultAbort
 #define CCTKi_DummyBarrier CactusDefaultBarrier
 #define CCTKi_DummyExit    CactusDefaultExit
+#define CCTKi_DummyMyProc  CactusDefaultMyProc
+#define CCTKi_DummynProcs  CactusDefaultnProcs
+#define CCTKi_DummySetupGH CactusDefaultSetupGH
 
 #include "CommOverloadables.h"
 
   /* Reset the #define to prevent complications. */
-#undef CCTKi_DummySetupGH  
-#undef CCTKi_DummyMyProc  
-#undef CCTKi_DummynProcs
+#undef CCTKi_DummyAbort
 #undef CCTKi_DummyBarrier
 #undef CCTKi_DummyExit
+#undef CCTKi_DummyMyProc  
+#undef CCTKi_DummynProcs
+#undef CCTKi_DummySetupGH  
 
 #undef OVERLOADABLE
 
diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index b4b7f810..548d115a 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -1659,7 +1659,7 @@ static int CCTKi_SchedulePrintTimesFunction(void *function,
     data->print_headers = 0;
   }
 
-  printf("%-16s: %-50s\t", attribute->thorn, attribute->description);
+  printf("%-10.10s: %-40.40s", attribute->thorn, attribute->description);
 
   CCTKi_SchedulePrintTimerInfo(data->info);
 
@@ -1670,9 +1670,10 @@ static void CCTKi_SchedulePrintTimerInfo(cTimerData *info)
 {
   int i;
 
-  switch(info->vals[0].type)
+  /*  switch(info->vals[0].type) */
+  for(i=0;i < info->n_vals; i++)
   {
-    case val_int:
+    /*   case val_int:
       printf("%d", info->vals[0].val.i); break;
     case val_long:
       printf("%ld", info->vals[0].val.l); break;
@@ -1683,7 +1684,7 @@ static void CCTKi_SchedulePrintTimerInfo(cTimerData *info)
   }
 
   for(i = 1; i < info->n_vals; i++)
-  {
+  {*/
     switch(info->vals[i].type)
     {
       case val_int: