[cig-commits] r5797 - mc/3D/CitcomS/trunk/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-01-16 17:54:39 -0800 (Tue, 16 Jan 2007)
New Revision: 5797

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c
Log:
Replaced 'exit(0)' with correct MPI exit, related to issue69

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2007-01-16 20:37:14 UTC (rev 5796)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2007-01-17 01:54:39 UTC (rev 5797)
@@ -251,7 +251,7 @@
     set_mg_defaults(E);}
   else
     { if (E->parallel.me==0) fprintf(stderr,"Unable to determine how to solve, specify Solver=VALID_OPTION \n");
-    exit(0);
+    parallel_process_termination();
     }
 
 

Modified: mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c	2007-01-16 20:37:14 UTC (rev 5796)
+++ mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c	2007-01-17 01:54:39 UTC (rev 5797)
@@ -1,6 +1,6 @@
 /*
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * 
+ *
  *<LicenseText>
  *
  * CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *</LicenseText>
- * 
+ *
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
@@ -185,7 +185,7 @@
     ptr = malloc((size_t)bytes);
     if (ptr == (void *)NULL) {
 	fprintf(stderr,"Memory: cannot allocate another %d bytes \n(line %d of file %s)\n",bytes,line,file);
-	exit(0);
+	parallel_process_termination();
     }
 
     return(ptr);
@@ -247,7 +247,7 @@
 	fprintf(E->fp,"Unable to open the required file `%s' (this is fatal)",filename);
 	fflush(E->fp);
 
-	exit(1);
+	parallel_process_termination();
     }