Changes for CCTK_Exit and CCTK_Abort

New argument lists

Added MPI_Abort to overload CCTK_Abort


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@240 b61c5cb5-eaca-4651-9a7a-d64986f99364

1 files changed, 19 insertions, 2 deletions

diff --git a/src/SetupPGH.c b/src/SetupPGH.c
index 730955e..74cf461 100644
--- a/src/SetupPGH.c
+++ b/src/SetupPGH.c
@@ -359,7 +359,7 @@ int PUGH_ParallelInit(cGH *GH)
   return 0;
 }
 
-int PUGH_Exit(int retval, cGH *GH)
+int PUGH_Exit(cGH *GH, int retval)
 {
 #ifdef CCTK_MPI
   CACTUS_MPI_ERROR(MPI_Finalize());
@@ -367,9 +367,26 @@ int PUGH_Exit(int retval, cGH *GH)
   exit(retval);
   return(retval);
 }
-int PUGH_Abort(cGH *GH)
+
+int PUGH_Abort(cGH *GH, int retval)
 {
+#ifdef CCTK_MPI
+  MPI_Comm COMM;
+#endif
+
+#ifdef CCTK_MPI
+  if (GH)
+  {
+    COMM = PUGH_pGH(GH)->PUGH_COMM_WORLD;
+  }
+  else
+  {
+    COMM = MPI_COMM_WORLD;
+  }
+  CACTUS_MPI_ERROR(MPI_Abort(COMM,retval));
+#else
   assert(0);
+#endif
   exit(0);
   return(0);
 }