Index: /issm/trunk/externalpackages/scotch/scotch.patch
===================================================================
--- /issm/trunk/externalpackages/scotch/scotch.patch	(revision 4704)
+++ /issm/trunk/externalpackages/scotch/scotch.patch	(revision 4705)
@@ -4,5 +4,5 @@
 diff -rc src/src/libscotch/arch.c new5/src/libscotch/arch.c
 *** src/src/libscotch/arch.c	2008-09-27 07:48:01.000000000 -0700
---- new5/src/libscotch/arch.c	2010-07-20 10:07:11.591403732 -0700
+--- new5/src/libscotch/arch.c	2010-07-21 17:13:15.583257119 -0700
 ***************
 *** 173,187 ****
@@ -70,5 +70,5 @@
 diff -rc src/src/libscotch/arch_cmplt.c new5/src/libscotch/arch_cmplt.c
 *** src/src/libscotch/arch_cmplt.c	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_cmplt.c	2010-07-20 10:08:51.983495478 -0700
+--- new5/src/libscotch/arch_cmplt.c	2010-07-21 17:13:15.585257133 -0700
 ***************
 *** 90,99 ****
@@ -122,5 +122,5 @@
 diff -rc src/src/libscotch/arch_cmplt.h new5/src/libscotch/arch_cmplt.h
 *** src/src/libscotch/arch_cmplt.h	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_cmplt.h	2010-07-19 14:57:40.109618053 -0700
+--- new5/src/libscotch/arch_cmplt.h	2010-07-21 17:13:15.588257154 -0700
 ***************
 *** 87,93 ****
@@ -139,5 +139,5 @@
 diff -rc src/src/libscotch/arch_cmpltw.c new5/src/libscotch/arch_cmpltw.c
 *** src/src/libscotch/arch_cmpltw.c	2008-08-27 14:22:22.000000000 -0700
---- new5/src/libscotch/arch_cmpltw.c	2010-07-20 10:09:00.028502844 -0700
+--- new5/src/libscotch/arch_cmpltw.c	2010-07-21 17:13:15.590257168 -0700
 ***************
 *** 200,211 ****
@@ -211,5 +211,5 @@
 diff -rc src/src/libscotch/arch_cmpltw.h new5/src/libscotch/arch_cmpltw.h
 *** src/src/libscotch/arch_cmpltw.h	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_cmpltw.h	2010-07-19 14:57:58.393634859 -0700
+--- new5/src/libscotch/arch_cmpltw.h	2010-07-21 17:13:15.592257181 -0700
 ***************
 *** 86,92 ****
@@ -228,5 +228,5 @@
 diff -rc src/src/libscotch/arch_deco.c new5/src/libscotch/arch_deco.c
 *** src/src/libscotch/arch_deco.c	2008-09-28 06:35:27.000000000 -0700
---- new5/src/libscotch/arch_deco.c	2010-07-20 10:09:13.608515282 -0700
+--- new5/src/libscotch/arch_deco.c	2010-07-21 17:13:15.595257202 -0700
 ***************
 *** 211,217 ****
@@ -269,5 +269,5 @@
 diff -rc src/src/libscotch/arch_deco.h new5/src/libscotch/arch_deco.h
 *** src/src/libscotch/arch_deco.h	2008-09-27 07:49:46.000000000 -0700
---- new5/src/libscotch/arch_deco.h	2010-07-19 14:58:09.531645102 -0700
+--- new5/src/libscotch/arch_deco.h	2010-07-21 17:13:15.597257216 -0700
 ***************
 *** 113,119 ****
@@ -286,5 +286,5 @@
 diff -rc src/src/libscotch/arch.h new5/src/libscotch/arch.h
 *** src/src/libscotch/arch.h	2009-04-28 08:11:27.000000000 -0700
---- new5/src/libscotch/arch.h	2010-07-19 14:58:14.368649552 -0700
+--- new5/src/libscotch/arch.h	2010-07-21 17:13:15.600257237 -0700
 ***************
 *** 175,181 ****
@@ -303,5 +303,5 @@
 diff -rc src/src/libscotch/arch_hcub.c new5/src/libscotch/arch_hcub.c
 *** src/src/libscotch/arch_hcub.c	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_hcub.c	2010-07-20 10:09:19.956521099 -0700
+--- new5/src/libscotch/arch_hcub.c	2010-07-21 17:13:15.602257251 -0700
 ***************
 *** 88,95 ****
@@ -351,5 +351,5 @@
 diff -rc src/src/libscotch/arch_hcub.h new5/src/libscotch/arch_hcub.h
 *** src/src/libscotch/arch_hcub.h	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_hcub.h	2010-07-19 14:58:27.010661184 -0700
+--- new5/src/libscotch/arch_hcub.h	2010-07-21 17:13:15.604257265 -0700
 ***************
 *** 85,91 ****
@@ -368,5 +368,5 @@
 diff -rc src/src/libscotch/arch_mesh.c new5/src/libscotch/arch_mesh.c
 *** src/src/libscotch/arch_mesh.c	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_mesh.c	2010-07-20 10:09:26.031526666 -0700
+--- new5/src/libscotch/arch_mesh.c	2010-07-21 17:13:15.607257286 -0700
 ***************
 *** 96,103 ****
@@ -467,5 +467,5 @@
 diff -rc src/src/libscotch/arch_mesh.h new5/src/libscotch/arch_mesh.h
 *** src/src/libscotch/arch_mesh.h	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_mesh.h	2010-07-19 14:58:58.560698969 -0700
+--- new5/src/libscotch/arch_mesh.h	2010-07-21 17:13:15.610257307 -0700
 ***************
 *** 96,102 ****
@@ -498,5 +498,5 @@
 diff -rc src/src/libscotch/arch_tleaf.c new5/src/libscotch/arch_tleaf.c
 *** src/src/libscotch/arch_tleaf.c	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_tleaf.c	2010-07-20 10:09:30.666530915 -0700
+--- new5/src/libscotch/arch_tleaf.c	2010-07-21 17:13:15.612257320 -0700
 ***************
 *** 92,99 ****
@@ -556,5 +556,5 @@
 diff -rc src/src/libscotch/arch_tleaf.h new5/src/libscotch/arch_tleaf.h
 *** src/src/libscotch/arch_tleaf.h	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_tleaf.h	2010-07-19 14:59:12.907720214 -0700
+--- new5/src/libscotch/arch_tleaf.h	2010-07-21 17:13:15.615257341 -0700
 ***************
 *** 89,95 ****
@@ -573,5 +573,5 @@
 diff -rc src/src/libscotch/arch_torus.c new5/src/libscotch/arch_torus.c
 *** src/src/libscotch/arch_torus.c	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_torus.c	2010-07-20 10:09:36.887536618 -0700
+--- new5/src/libscotch/arch_torus.c	2010-07-21 17:13:15.618257362 -0700
 ***************
 *** 90,97 ****
@@ -672,5 +672,5 @@
 diff -rc src/src/libscotch/arch_torus.h new5/src/libscotch/arch_torus.h
 *** src/src/libscotch/arch_torus.h	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/arch_torus.h	2010-07-19 14:59:34.966752838 -0700
+--- new5/src/libscotch/arch_torus.h	2010-07-21 17:13:15.620257376 -0700
 ***************
 *** 96,102 ****
@@ -703,5 +703,5 @@
 diff -rc src/src/libscotch/common.c new5/src/libscotch/common.c
 *** src/src/libscotch/common.c	2008-05-22 06:44:41.000000000 -0700
---- new5/src/libscotch/common.c	2010-07-15 15:09:01.721095620 -0700
+--- new5/src/libscotch/common.c	2010-07-21 17:13:15.622257390 -0700
 ***************
 *** 100,106 ****
@@ -722,5 +722,5 @@
 diff -rc src/src/libscotch/common.h new5/src/libscotch/common.h
 *** src/src/libscotch/common.h	2009-02-06 14:20:55.000000000 -0800
---- new5/src/libscotch/common.h	2010-07-21 14:16:02.178336967 -0700
+--- new5/src/libscotch/common.h	2010-07-21 17:15:06.061025001 -0700
 ***************
 *** 1,3 ****
@@ -753,29 +753,80 @@
 --- 109,114 ----
 ***************
-*** 201,214 ****
---- 202,224 ----
+*** 190,216 ****
+  size_t                      memMax              ();
+  #endif /* COMMON_MEMORY_TRACE */
+  
+- void                        usagePrint          (FILE * const, const char (* []));
+  
+- int                         fileBlockOpen       (File * const, const int);
+  int                         fileBlockOpenDist   (File * const, const int, const int, const int, const int);
+- void                        fileBlockClose      (File * const, const int);
+  FILE *                      fileCompress        (FILE * const, const int);
+  int                         fileCompressType    (const char * const);
+  FILE *                      fileUncompress      (FILE * const, const int);
   int                         fileUncompressType  (const char * const);
   int                         fileNameDistExpand  (char ** const, const int, const int, const int);
   
-+ #ifdef __cplusplus
-+ extern "C" {
-+ #endif /* __cplusplus */
-+ 
   void                        errorProg           (const char * const);
   void                        errorPrint          (const char * const, ...);
   void                        errorPrintW         (const char * const, ...);
   
-+ #ifdef __cplusplus
-+ }
-+ #endif /* __cplusplus */
-+ 
   int                         intLoad             (FILE * const, INT * const);
   int                         intSave             (FILE * const, const INT);
   void                        intAscn             (INT * const, const INT, const INT);
   void                        intPerm             (INT * const, const INT);
+  void                        intRandReset        (void);
+- void                        intRandInit         (void);
+  INT                         intRandVal          (INT);
+  void                        intSort1asc1        (void * const, const INT);
+  void                        intSort2asc1        (void * const, const INT);
+--- 191,227 ----
+  size_t                      memMax              ();
+  #endif /* COMMON_MEMORY_TRACE */
+  
+  
+  int                         fileBlockOpenDist   (File * const, const int, const int, const int, const int);
+  FILE *                      fileCompress        (FILE * const, const int);
+  int                         fileCompressType    (const char * const);
+  FILE *                      fileUncompress      (FILE * const, const int);
+  int                         fileUncompressType  (const char * const);
+  int                         fileNameDistExpand  (char ** const, const int, const int, const int);
+  
++ #ifdef __cplusplus
++ extern "C" {
++ #endif /* __cplusplus */
++ 
+  void                        errorProg           (const char * const);
+  void                        errorPrint          (const char * const, ...);
+  void                        errorPrintW         (const char * const, ...);
++ double                      clockGet            (void);
++ void                        usagePrint          (FILE * const, const char (* []));
++ void                        intRandInit         (void);
++ int                         fileBlockOpen       (File * const, const int);
++ void                        fileBlockClose      (File * const, const int);
 + void                        intRandResetStatic  (void);
++ 
++ #ifdef __cplusplus
++ }
++ #endif /* __cplusplus */
+  
+  int                         intLoad             (FILE * const, INT * const);
+  int                         intSave             (FILE * const, const INT);
+  void                        intAscn             (INT * const, const INT, const INT);
+  void                        intPerm             (INT * const, const INT);
   void                        intRandReset        (void);
-  void                        intRandInit         (void);
   INT                         intRandVal          (INT);
+  void                        intSort1asc1        (void * const, const INT);
+  void                        intSort2asc1        (void * const, const INT);
+***************
+*** 221,227 ****
+  void                        clockStart          (Clock * const);
+  void                        clockStop           (Clock * const);
+  double                      clockVal            (Clock * const);
+- double                      clockGet            (void);
+  
+  /*
+  **  Macro definitions.
+--- 232,237 ----
 ***************
 *** 249,251 ****
@@ -788,5 +839,5 @@
 diff -rc src/src/libscotch/common_integer.c new5/src/libscotch/common_integer.c
 *** src/src/libscotch/common_integer.c	2009-01-21 01:32:32.000000000 -0800
---- new5/src/libscotch/common_integer.c	2010-07-20 10:11:29.029639629 -0700
+--- new5/src/libscotch/common_integer.c	2010-07-21 17:13:15.628257432 -0700
 ***************
 *** 191,196 ****
@@ -861,5 +912,5 @@
 diff -rc src/src/libscotch/common_memory.c new5/src/libscotch/common_memory.c
 *** src/src/libscotch/common_memory.c	2009-01-03 02:16:11.000000000 -0800
---- new5/src/libscotch/common_memory.c	2010-07-15 15:09:01.740095640 -0700
+--- new5/src/libscotch/common_memory.c	2010-07-21 17:13:15.630257445 -0700
 ***************
 *** 87,93 ****
@@ -969,5 +1020,5 @@
 diff -rc src/src/libscotch/dummysizes.c new5/src/libscotch/dummysizes.c
 *** src/src/libscotch/dummysizes.c	2009-05-09 16:08:02.000000000 -0700
---- new5/src/libscotch/dummysizes.c	2010-07-15 15:09:01.746095647 -0700
+--- new5/src/libscotch/dummysizes.c	2010-07-21 17:13:15.633257466 -0700
 ***************
 *** 267,271 ****
@@ -982,5 +1033,5 @@
 diff -rc src/src/libscotch/graph.c new5/src/libscotch/graph.c
 *** src/src/libscotch/graph.c	2008-05-22 06:44:42.000000000 -0700
---- new5/src/libscotch/graph.c	2010-07-15 15:09:01.752095654 -0700
+--- new5/src/libscotch/graph.c	2010-07-21 17:13:15.635257480 -0700
 ***************
 *** 135,141 ****
@@ -1005,5 +1056,5 @@
 diff -rc src/src/libscotch/graph.h new5/src/libscotch/graph.h
 *** src/src/libscotch/graph.h	2008-06-01 02:49:11.000000000 -0700
---- new5/src/libscotch/graph.h	2010-07-19 15:00:58.693876214 -0700
+--- new5/src/libscotch/graph.h	2010-07-21 17:13:15.637257494 -0700
 ***************
 *** 159,165 ****
@@ -1022,5 +1073,5 @@
 diff -rc src/src/libscotch/graph_io.c new5/src/libscotch/graph_io.c
 *** src/src/libscotch/graph_io.c	2008-05-22 06:44:42.000000000 -0700
---- new5/src/libscotch/graph_io.c	2010-07-20 10:06:59.951393115 -0700
+--- new5/src/libscotch/graph_io.c	2010-07-21 17:13:15.639257508 -0700
 ***************
 *** 86,92 ****
@@ -1260,5 +1311,5 @@
 diff -rc src/src/libscotch/graph_io_scot.c new5/src/libscotch/graph_io_scot.c
 *** src/src/libscotch/graph_io_scot.c	2008-05-22 06:44:42.000000000 -0700
---- new5/src/libscotch/graph_io_scot.c	2010-07-19 15:02:03.105970631 -0700
+--- new5/src/libscotch/graph_io_scot.c	2010-07-21 17:13:15.641257522 -0700
 ***************
 *** 89,95 ****
@@ -1277,5 +1328,5 @@
 diff -rc src/src/libscotch/library_arch.c new5/src/libscotch/library_arch.c
 *** src/src/libscotch/library_arch.c	2008-05-22 06:44:42.000000000 -0700
---- new5/src/libscotch/library_arch.c	2010-07-19 15:02:10.011980730 -0700
+--- new5/src/libscotch/library_arch.c	2010-07-21 17:13:15.643257536 -0700
 ***************
 *** 120,128 ****
@@ -1312,5 +1363,5 @@
 diff -rc src/src/libscotch/library_arch_f.c new5/src/libscotch/library_arch_f.c
 *** src/src/libscotch/library_arch_f.c	2008-05-22 06:44:42.000000000 -0700
---- new5/src/libscotch/library_arch_f.c	2010-07-19 15:02:16.632990408 -0700
+--- new5/src/libscotch/library_arch_f.c	2010-07-21 17:13:15.645257550 -0700
 ***************
 *** 121,127 ****
@@ -1329,5 +1380,5 @@
 diff -rc src/src/libscotch/library_error_exit.c new5/src/libscotch/library_error_exit.c
 *** src/src/libscotch/library_error_exit.c	2009-01-20 00:36:33.000000000 -0800
---- new5/src/libscotch/library_error_exit.c	2010-07-15 15:09:01.789095694 -0700
+--- new5/src/libscotch/library_error_exit.c	2010-07-21 17:13:15.648257570 -0700
 ***************
 *** 114,119 ****
@@ -1404,5 +1455,5 @@
 diff -rc src/src/libscotch/library_graph.c new5/src/libscotch/library_graph.c
 *** src/src/libscotch/library_graph.c	2008-05-22 07:28:12.000000000 -0700
---- new5/src/libscotch/library_graph.c	2010-07-19 15:03:08.833066562 -0700
+--- new5/src/libscotch/library_graph.c	2010-07-21 17:13:15.650257584 -0700
 ***************
 *** 137,143 ****
@@ -1449,5 +1500,5 @@
 diff -rc src/src/libscotch/library_graph_f.c new5/src/libscotch/library_graph_f.c
 *** src/src/libscotch/library_graph_f.c	2008-05-22 06:44:43.000000000 -0700
---- new5/src/libscotch/library_graph_f.c	2010-07-19 15:03:14.148074301 -0700
+--- new5/src/libscotch/library_graph_f.c	2010-07-21 17:13:15.652257598 -0700
 ***************
 *** 136,142 ****
@@ -1466,5 +1517,5 @@
 diff -rc src/src/libscotch/library_graph_map.c new5/src/libscotch/library_graph_map.c
 *** src/src/libscotch/library_graph_map.c	2008-09-28 04:04:05.000000000 -0700
---- new5/src/libscotch/library_graph_map.c	2010-07-19 15:03:29.338096404 -0700
+--- new5/src/libscotch/library_graph_map.c	2010-07-21 17:13:15.654257612 -0700
 ***************
 *** 182,192 ****
@@ -1491,5 +1542,5 @@
 diff -rc src/src/libscotch/library_graph_map_f.c new5/src/libscotch/library_graph_map_f.c
 *** src/src/libscotch/library_graph_map_f.c	2008-06-28 03:44:26.000000000 -0700
---- new5/src/libscotch/library_graph_map_f.c	2010-07-19 15:03:34.344103682 -0700
+--- new5/src/libscotch/library_graph_map_f.c	2010-07-21 17:13:15.656257626 -0700
 ***************
 *** 183,189 ****
@@ -1508,5 +1559,5 @@
 diff -rc src/src/libscotch/library.h new5/src/libscotch/library.h
 *** src/src/libscotch/library.h	2009-05-09 16:08:03.000000000 -0700
---- new5/src/libscotch/library.h	2010-07-21 11:55:39.022504459 -0700
+--- new5/src/libscotch/library.h	2010-07-21 17:13:15.660257654 -0700
 ***************
 *** 1,3 ****
@@ -1569,5 +1620,5 @@
 diff -rc src/src/libscotch/Makefile new5/src/libscotch/Makefile
 *** src/src/libscotch/Makefile	2009-05-09 16:08:04.000000000 -0700
---- new5/src/libscotch/Makefile	2010-07-19 16:00:02.225745769 -0700
+--- new5/src/libscotch/Makefile	2010-07-21 17:13:15.665257689 -0700
 ***************
 *** 49,55 ****
@@ -1988,5 +2039,5 @@
 diff -rc src/src/libscotch/mapping.h new5/src/libscotch/mapping.h
 *** src/src/libscotch/mapping.h	2008-10-27 08:27:47.000000000 -0700
---- new5/src/libscotch/mapping.h	2010-07-19 15:03:48.720124571 -0700
+--- new5/src/libscotch/mapping.h	2010-07-21 17:13:15.667257702 -0700
 ***************
 *** 106,112 ****
@@ -2005,5 +2056,5 @@
 diff -rc src/src/libscotch/mapping_io.c new5/src/libscotch/mapping_io.c
 *** src/src/libscotch/mapping_io.c	2008-05-22 06:44:43.000000000 -0700
---- new5/src/libscotch/mapping_io.c	2010-07-20 10:07:35.070425160 -0700
+--- new5/src/libscotch/mapping_io.c	2010-07-21 17:13:15.670257723 -0700
 ***************
 *** 199,204 ****
@@ -2094,5 +2145,5 @@
 diff -rc src/src/libscotch/mesh_io_scot.c new5/src/libscotch/mesh_io_scot.c
 *** src/src/libscotch/mesh_io_scot.c	2008-05-22 06:44:43.000000000 -0700
---- new5/src/libscotch/mesh_io_scot.c	2010-07-19 15:04:11.402157488 -0700
+--- new5/src/libscotch/mesh_io_scot.c	2010-07-21 17:13:15.672257737 -0700
 ***************
 *** 85,91 ****
@@ -2111,5 +2162,5 @@
 diff -rc src/src/libscotch/module.h new5/src/libscotch/module.h
 *** src/src/libscotch/module.h	2009-04-26 23:07:14.000000000 -0700
---- new5/src/libscotch/module.h	2010-07-21 12:00:44.312746389 -0700
+--- new5/src/libscotch/module.h	2010-07-21 17:13:15.675257758 -0700
 ***************
 *** 1,3 ****
@@ -2152,5 +2203,5 @@
 diff -rc src/src/libscotch/parser_ll.l new5/src/libscotch/parser_ll.l
 *** src/src/libscotch/parser_ll.l	2008-05-22 06:44:43.000000000 -0700
---- new5/src/libscotch/parser_ll.l	2010-07-15 15:09:01.866095777 -0700
+--- new5/src/libscotch/parser_ll.l	2010-07-21 17:13:15.677257772 -0700
 ***************
 *** 192,197 ****
@@ -2181,5 +2232,5 @@
 diff -rc src/src/libscotch/parser_yy.y new5/src/libscotch/parser_yy.y
 *** src/src/libscotch/parser_yy.y	2008-10-22 15:12:48.000000000 -0700
---- new5/src/libscotch/parser_yy.y	2010-07-15 15:09:01.874095786 -0700
+--- new5/src/libscotch/parser_yy.y	2010-07-21 17:13:15.679257786 -0700
 ***************
 *** 774,779 ****
@@ -2194,5 +2245,5 @@
 diff -rc src/src/libscotch/vgraph_separate_vw.c new5/src/libscotch/vgraph_separate_vw.c
 *** src/src/libscotch/vgraph_separate_vw.c	2008-05-22 06:44:43.000000000 -0700
---- new5/src/libscotch/vgraph_separate_vw.c	2010-07-15 15:09:01.882095795 -0700
+--- new5/src/libscotch/vgraph_separate_vw.c	2010-07-21 17:13:15.682257807 -0700
 ***************
 *** 83,88 ****
@@ -2216,5 +2267,5 @@
 diff -rc src/src/Makefile new5/src/Makefile
 *** src/src/Makefile	2008-09-15 05:50:51.000000000 -0700
---- new5/src/Makefile	2010-07-19 15:29:59.056369854 -0700
+--- new5/src/Makefile	2010-07-21 17:13:15.684257821 -0700
 ***************
 *** 97,102 ****
@@ -2236,5 +2287,5 @@
 diff -rc src/src/scotch/gmap.h new5/src/scotch/gmap.h
 *** src/src/scotch/gmap.h	2008-06-18 11:05:17.000000000 -0700
---- new5/src/scotch/gmap.h	2010-07-21 11:29:31.069238000 -0700
+--- new5/src/scotch/gmap.h	2010-07-21 17:13:15.686257834 -0700
 ***************
 *** 1,3 ****
@@ -2257,5 +2308,5 @@
 diff -rc src/src/scotch/Makefile new5/src/scotch/Makefile
 *** src/src/scotch/Makefile	2009-04-27 02:19:43.000000000 -0700
---- new5/src/scotch/Makefile	2010-07-20 10:38:13.641149208 -0700
+--- new5/src/scotch/Makefile	2010-07-21 17:13:15.689257855 -0700
 ***************
 *** 49,59 ****