Index: /issm/trunk/externalpackages/scotch/scotch.patch
===================================================================
--- /issm/trunk/externalpackages/scotch/scotch.patch	(revision 4654)
+++ /issm/trunk/externalpackages/scotch/scotch.patch	(revision 4655)
@@ -3,5 +3,5 @@
 Only in src: lib
 diff -rc src/src/libscotch/arch.c old/src/libscotch/arch.c
-*** src/src/libscotch/arch.c	2010-07-19 11:51:37.187617636 -0700
+*** src/src/libscotch/arch.c	2010-07-19 12:08:20.485684277 -0700
 --- old/src/libscotch/arch.c	2008-09-27 07:48:01.000000000 -0700
 ***************
@@ -69,5 +69,5 @@
 --- 190,196 ----
 diff -rc src/src/libscotch/arch_cmplt.c old/src/libscotch/arch_cmplt.c
-*** src/src/libscotch/arch_cmplt.c	2010-07-19 11:51:37.190617657 -0700
+*** src/src/libscotch/arch_cmplt.c	2010-07-19 12:08:20.488684298 -0700
 --- old/src/libscotch/arch_cmplt.c	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -121,5 +121,5 @@
 --- 102,109 ----
 diff -rc src/src/libscotch/arch_cmplt.h old/src/libscotch/arch_cmplt.h
-*** src/src/libscotch/arch_cmplt.h	2010-07-19 11:51:37.193617678 -0700
+*** src/src/libscotch/arch_cmplt.h	2010-07-19 12:08:20.490684312 -0700
 --- old/src/libscotch/arch_cmplt.h	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -138,5 +138,5 @@
 --- 87,93 ----
 diff -rc src/src/libscotch/arch_cmpltw.c old/src/libscotch/arch_cmpltw.c
-*** src/src/libscotch/arch_cmpltw.c	2010-07-19 11:51:37.195617692 -0700
+*** src/src/libscotch/arch_cmpltw.c	2010-07-19 12:08:20.493684332 -0700
 --- old/src/libscotch/arch_cmpltw.c	2008-08-27 14:22:22.000000000 -0700
 ***************
@@ -210,5 +210,5 @@
 --- 230,237 ----
 diff -rc src/src/libscotch/arch_cmpltw.h old/src/libscotch/arch_cmpltw.h
-*** src/src/libscotch/arch_cmpltw.h	2010-07-19 11:51:37.198617713 -0700
+*** src/src/libscotch/arch_cmpltw.h	2010-07-19 12:08:20.496684353 -0700
 --- old/src/libscotch/arch_cmpltw.h	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -227,5 +227,5 @@
 --- 86,92 ----
 diff -rc src/src/libscotch/arch_deco.c old/src/libscotch/arch_deco.c
-*** src/src/libscotch/arch_deco.c	2010-07-19 11:51:37.201617734 -0700
+*** src/src/libscotch/arch_deco.c	2010-07-19 12:08:20.498684367 -0700
 --- old/src/libscotch/arch_deco.c	2008-09-28 06:35:27.000000000 -0700
 ***************
@@ -268,5 +268,5 @@
 --- 220,225 ----
 diff -rc src/src/libscotch/arch_deco.h old/src/libscotch/arch_deco.h
-*** src/src/libscotch/arch_deco.h	2010-07-19 11:51:37.204617756 -0700
+*** src/src/libscotch/arch_deco.h	2010-07-19 12:08:20.501684388 -0700
 --- old/src/libscotch/arch_deco.h	2008-09-27 07:49:46.000000000 -0700
 ***************
@@ -285,5 +285,5 @@
 --- 113,119 ----
 diff -rc src/src/libscotch/arch.h old/src/libscotch/arch.h
-*** src/src/libscotch/arch.h	2010-07-19 11:51:37.206617770 -0700
+*** src/src/libscotch/arch.h	2010-07-19 12:08:20.503684402 -0700
 --- old/src/libscotch/arch.h	2009-04-28 08:11:27.000000000 -0700
 ***************
@@ -302,5 +302,5 @@
 --- 175,181 ----
 diff -rc src/src/libscotch/arch_hcub.c old/src/libscotch/arch_hcub.c
-*** src/src/libscotch/arch_hcub.c	2010-07-19 11:51:37.209617791 -0700
+*** src/src/libscotch/arch_hcub.c	2010-07-19 12:08:20.506684423 -0700
 --- old/src/libscotch/arch_hcub.c	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -350,5 +350,5 @@
 --- 98,105 ----
 diff -rc src/src/libscotch/arch_hcub.h old/src/libscotch/arch_hcub.h
-*** src/src/libscotch/arch_hcub.h	2010-07-19 11:51:37.212617812 -0700
+*** src/src/libscotch/arch_hcub.h	2010-07-19 12:08:20.508684437 -0700
 --- old/src/libscotch/arch_hcub.h	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -367,5 +367,5 @@
 --- 85,91 ----
 diff -rc src/src/libscotch/arch_mesh.c old/src/libscotch/arch_mesh.c
-*** src/src/libscotch/arch_mesh.c	2010-07-19 11:51:37.215617833 -0700
+*** src/src/libscotch/arch_mesh.c	2010-07-19 12:08:20.511684458 -0700
 --- old/src/libscotch/arch_mesh.c	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -466,5 +466,5 @@
 --- 431,440 ----
 diff -rc src/src/libscotch/arch_mesh.h old/src/libscotch/arch_mesh.h
-*** src/src/libscotch/arch_mesh.h	2010-07-19 11:51:37.217617847 -0700
+*** src/src/libscotch/arch_mesh.h	2010-07-19 12:08:20.514684479 -0700
 --- old/src/libscotch/arch_mesh.h	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -497,5 +497,5 @@
 --- 114,120 ----
 diff -rc src/src/libscotch/arch_tleaf.c old/src/libscotch/arch_tleaf.c
-*** src/src/libscotch/arch_tleaf.c	2010-07-19 11:51:37.220617868 -0700
+*** src/src/libscotch/arch_tleaf.c	2010-07-19 12:08:20.517684499 -0700
 --- old/src/libscotch/arch_tleaf.c	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -555,5 +555,5 @@
 --- 109,114 ----
 diff -rc src/src/libscotch/arch_tleaf.h old/src/libscotch/arch_tleaf.h
-*** src/src/libscotch/arch_tleaf.h	2010-07-19 11:51:37.223617890 -0700
+*** src/src/libscotch/arch_tleaf.h	2010-07-19 12:08:20.519684513 -0700
 --- old/src/libscotch/arch_tleaf.h	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -572,5 +572,5 @@
 --- 89,95 ----
 diff -rc src/src/libscotch/arch_torus.c old/src/libscotch/arch_torus.c
-*** src/src/libscotch/arch_torus.c	2010-07-19 11:51:37.226617911 -0700
+*** src/src/libscotch/arch_torus.c	2010-07-19 12:08:20.522684534 -0700
 --- old/src/libscotch/arch_torus.c	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -671,5 +671,5 @@
 --- 373,382 ----
 diff -rc src/src/libscotch/arch_torus.h old/src/libscotch/arch_torus.h
-*** src/src/libscotch/arch_torus.h	2010-07-19 11:51:37.228617925 -0700
+*** src/src/libscotch/arch_torus.h	2010-07-19 12:08:20.524684548 -0700
 --- old/src/libscotch/arch_torus.h	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -702,5 +702,5 @@
 --- 114,120 ----
 diff -rc src/src/libscotch/common.c old/src/libscotch/common.c
-*** src/src/libscotch/common.c	2010-07-19 11:51:37.231617946 -0700
+*** src/src/libscotch/common.c	2010-07-19 12:08:20.527684569 -0700
 --- old/src/libscotch/common.c	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -721,5 +721,5 @@
 --- 100,106 ----
 diff -rc src/src/libscotch/common.h old/src/libscotch/common.h
-*** src/src/libscotch/common.h	2010-07-19 11:51:37.233617960 -0700
+*** src/src/libscotch/common.h	2010-07-19 12:08:20.529684583 -0700
 --- old/src/libscotch/common.h	2009-02-06 14:20:55.000000000 -0800
 ***************
@@ -732,5 +732,47 @@
 --- 1,3 ----
 ***************
-*** 251,255 ****
+*** 81,87 ****
+  #include            <sys/resource.h>
+  #endif /* COMMON_TIMING_OLD */
+  #include            <unistd.h>
+- #include            <sys/param.h>
+  
+  #ifdef SCOTCH_PTSCOTCH
+  #include            <mpi.h>
+--- 79,84 ----
+***************
+*** 109,114 ****
+--- 106,113 ----
+  #define memCpy(dst,src,siz)         memcpy((dst),(src),(siz))
+  #define memMov(dst,src,siz)         memmove((dst),(src),(siz))
+  
++ #define MIN(x,y)                    (((x) < (y)) ? (x) : (y))
++ #define MAX(x,y)                    (((x) < (y)) ? (y) : (x))
+  #define ABS(x)                      MAX ((x), -(x))
+  #define SIGN(x)                     (((x) < 0) ? -1 : 1)
+  
+***************
+*** 202,219 ****
+  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);
+--- 201,210 ----
+***************
+*** 258,262 ****
   void nl##__ pl                                   \
   { nu pc; }                                       \
@@ -740,5 +782,5 @@
 --- 249,251 ----
 diff -rc src/src/libscotch/common_integer.c old/src/libscotch/common_integer.c
-*** src/src/libscotch/common_integer.c	2010-07-19 11:51:37.236617981 -0700
+*** src/src/libscotch/common_integer.c	2010-07-19 12:11:35.015039059 -0700
 --- old/src/libscotch/common_integer.c	2009-01-21 01:32:32.000000000 -0800
 ***************
@@ -801,5 +843,5 @@
 --- 237,242 ----
 diff -rc src/src/libscotch/common_memory.c old/src/libscotch/common_memory.c
-*** src/src/libscotch/common_memory.c	2010-07-19 11:51:37.239618002 -0700
+*** src/src/libscotch/common_memory.c	2010-07-19 12:08:20.535684625 -0700
 --- old/src/libscotch/common_memory.c	2009-01-03 02:16:11.000000000 -0800
 ***************
@@ -909,5 +951,5 @@
 --- 185,192 ----
 diff -rc src/src/libscotch/dummysizes.c old/src/libscotch/dummysizes.c
-*** src/src/libscotch/dummysizes.c	2010-07-19 11:51:37.241618017 -0700
+*** src/src/libscotch/dummysizes.c	2010-07-19 12:08:20.538684646 -0700
 --- old/src/libscotch/dummysizes.c	2009-05-09 16:08:02.000000000 -0700
 ***************
@@ -922,5 +964,5 @@
 --- 267,271 ----
 diff -rc src/src/libscotch/graph.c old/src/libscotch/graph.c
-*** src/src/libscotch/graph.c	2010-07-19 11:51:37.244618038 -0700
+*** src/src/libscotch/graph.c	2010-07-19 12:08:20.540684660 -0700
 --- old/src/libscotch/graph.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -945,5 +987,5 @@
           ((grafptr->flagval & GRAPHEDGEGROUP) == 0))
 diff -rc src/src/libscotch/graph.h old/src/libscotch/graph.h
-*** src/src/libscotch/graph.h	2010-07-19 11:51:37.247618059 -0700
+*** src/src/libscotch/graph.h	2010-07-19 12:08:20.543684680 -0700
 --- old/src/libscotch/graph.h	2008-06-01 02:49:11.000000000 -0700
 ***************
@@ -962,5 +1004,5 @@
 --- 159,165 ----
 diff -rc src/src/libscotch/graph_io.c old/src/libscotch/graph_io.c
-*** src/src/libscotch/graph_io.c	2010-07-19 11:51:37.250618080 -0700
+*** src/src/libscotch/graph_io.c	2010-07-19 12:08:20.546684701 -0700
 --- old/src/libscotch/graph_io.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -1200,5 +1242,5 @@
 --- 307,313 ----
 diff -rc src/src/libscotch/graph_io_scot.c old/src/libscotch/graph_io_scot.c
-*** src/src/libscotch/graph_io_scot.c	2010-07-19 11:51:37.253618101 -0700
+*** src/src/libscotch/graph_io_scot.c	2010-07-19 12:08:20.549684722 -0700
 --- old/src/libscotch/graph_io_scot.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -1217,5 +1259,5 @@
 --- 89,95 ----
 diff -rc src/src/libscotch/library_arch.c old/src/libscotch/library_arch.c
-*** src/src/libscotch/library_arch.c	2010-07-19 11:51:37.255618115 -0700
+*** src/src/libscotch/library_arch.c	2010-07-19 12:08:20.550684729 -0700
 --- old/src/libscotch/library_arch.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -1252,5 +1294,5 @@
   /*+ This routine saves the given opaque
 diff -rc src/src/libscotch/library_arch_f.c old/src/libscotch/library_arch_f.c
-*** src/src/libscotch/library_arch_f.c	2010-07-19 11:51:37.257618129 -0700
+*** src/src/libscotch/library_arch_f.c	2010-07-19 12:08:20.552684743 -0700
 --- old/src/libscotch/library_arch_f.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -1269,5 +1311,5 @@
 --- 121,127 ----
 diff -rc src/src/libscotch/library_error_exit.c old/src/libscotch/library_error_exit.c
-*** src/src/libscotch/library_error_exit.c	2010-07-19 11:51:37.260618150 -0700
+*** src/src/libscotch/library_error_exit.c	2010-07-19 12:08:20.556684771 -0700
 --- old/src/libscotch/library_error_exit.c	2009-01-20 00:36:33.000000000 -0800
 ***************
@@ -1344,5 +1386,5 @@
 --- 171,174 ----
 diff -rc src/src/libscotch/library_graph.c old/src/libscotch/library_graph.c
-*** src/src/libscotch/library_graph.c	2010-07-19 11:51:37.263618172 -0700
+*** src/src/libscotch/library_graph.c	2010-07-19 12:08:20.559684792 -0700
 --- old/src/libscotch/library_graph.c	2008-05-22 07:28:12.000000000 -0700
 ***************
@@ -1389,5 +1431,5 @@
 --- 153,159 ----
 diff -rc src/src/libscotch/library_graph_f.c old/src/libscotch/library_graph_f.c
-*** src/src/libscotch/library_graph_f.c	2010-07-19 11:51:37.265618186 -0700
+*** src/src/libscotch/library_graph_f.c	2010-07-19 12:08:20.561684806 -0700
 --- old/src/libscotch/library_graph_f.c	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1406,5 +1448,5 @@
 --- 136,142 ----
 diff -rc src/src/libscotch/library_graph_map.c old/src/libscotch/library_graph_map.c
-*** src/src/libscotch/library_graph_map.c	2010-07-19 11:51:37.267618200 -0700
+*** src/src/libscotch/library_graph_map.c	2010-07-19 12:08:20.563684820 -0700
 --- old/src/libscotch/library_graph_map.c	2008-09-28 04:04:05.000000000 -0700
 ***************
@@ -1431,5 +1473,5 @@
 --- 182,192 ----
 diff -rc src/src/libscotch/library_graph_map_f.c old/src/libscotch/library_graph_map_f.c
-*** src/src/libscotch/library_graph_map_f.c	2010-07-19 11:51:37.269618214 -0700
+*** src/src/libscotch/library_graph_map_f.c	2010-07-19 12:08:20.565684834 -0700
 --- old/src/libscotch/library_graph_map_f.c	2008-06-28 03:44:26.000000000 -0700
 ***************
@@ -1448,5 +1490,5 @@
 --- 183,189 ----
 diff -rc src/src/libscotch/library.h old/src/libscotch/library.h
-*** src/src/libscotch/library.h	2010-07-19 11:51:37.272618235 -0700
+*** src/src/libscotch/library.h	2010-07-19 12:08:20.568684854 -0700
 --- old/src/libscotch/library.h	2009-05-09 16:08:03.000000000 -0700
 ***************
@@ -1467,5 +1509,5 @@
 --- 278,280 ----
 diff -rc src/src/libscotch/Makefile old/src/libscotch/Makefile
-*** src/src/libscotch/Makefile	2010-07-19 11:51:37.277618270 -0700
+*** src/src/libscotch/Makefile	2010-07-19 12:08:20.573684889 -0700
 --- old/src/libscotch/Makefile	2009-05-09 16:08:04.000000000 -0700
 ***************
@@ -1702,5 +1744,5 @@
 --- 2467,2469 ----
 diff -rc src/src/libscotch/mapping.h old/src/libscotch/mapping.h
-*** src/src/libscotch/mapping.h	2010-07-19 11:51:37.279618284 -0700
+*** src/src/libscotch/mapping.h	2010-07-19 12:08:20.575684903 -0700
 --- old/src/libscotch/mapping.h	2008-10-27 08:27:47.000000000 -0700
 ***************
@@ -1719,5 +1761,5 @@
 --- 106,112 ----
 diff -rc src/src/libscotch/mapping_io.c old/src/libscotch/mapping_io.c
-*** src/src/libscotch/mapping_io.c	2010-07-19 11:51:37.282618306 -0700
+*** src/src/libscotch/mapping_io.c	2010-07-19 12:08:20.578684924 -0700
 --- old/src/libscotch/mapping_io.c	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1808,5 +1850,5 @@
   }
 diff -rc src/src/libscotch/mesh_io_scot.c old/src/libscotch/mesh_io_scot.c
-*** src/src/libscotch/mesh_io_scot.c	2010-07-19 11:51:37.285618327 -0700
+*** src/src/libscotch/mesh_io_scot.c	2010-07-19 12:08:20.581684945 -0700
 --- old/src/libscotch/mesh_io_scot.c	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1825,5 +1867,5 @@
 --- 85,91 ----
 diff -rc src/src/libscotch/module.h old/src/libscotch/module.h
-*** src/src/libscotch/module.h	2010-07-19 11:51:37.288618348 -0700
+*** src/src/libscotch/module.h	2010-07-19 12:08:20.584684966 -0700
 --- old/src/libscotch/module.h	2009-04-26 23:07:14.000000000 -0700
 ***************
@@ -1856,5 +1898,5 @@
 --- 681,683 ----
 diff -rc src/src/libscotch/parser_ll.l old/src/libscotch/parser_ll.l
-*** src/src/libscotch/parser_ll.l	2010-07-19 11:51:37.290618362 -0700
+*** src/src/libscotch/parser_ll.l	2010-07-19 12:08:20.586684980 -0700
 --- old/src/libscotch/parser_ll.l	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1885,5 +1927,5 @@
 --- 192,197 ----
 diff -rc src/src/libscotch/parser_yy.y old/src/libscotch/parser_yy.y
-*** src/src/libscotch/parser_yy.y	2010-07-19 11:51:37.293618383 -0700
+*** src/src/libscotch/parser_yy.y	2010-07-19 12:08:20.589685001 -0700
 --- old/src/libscotch/parser_yy.y	2008-10-22 15:12:48.000000000 -0700
 ***************
@@ -1898,5 +1940,5 @@
 --- 774,779 ----
 diff -rc src/src/libscotch/vgraph_separate_vw.c old/src/libscotch/vgraph_separate_vw.c
-*** src/src/libscotch/vgraph_separate_vw.c	2010-07-19 11:51:37.296618404 -0700
+*** src/src/libscotch/vgraph_separate_vw.c	2010-07-19 12:08:20.592685021 -0700
 --- old/src/libscotch/vgraph_separate_vw.c	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1920,5 +1962,5 @@
 --- 102,106 ----
 diff -rc src/src/Makefile old/src/Makefile
-*** src/src/Makefile	2010-07-19 11:51:37.298618418 -0700
+*** src/src/Makefile	2010-07-19 12:08:20.594685035 -0700
 --- old/src/Makefile	2008-09-15 05:50:51.000000000 -0700
 ***************
@@ -1937,5 +1979,5 @@
 Only in src/src: Makefile.inc
 diff -rc src/src/scotch/gmap.h old/src/scotch/gmap.h
-*** src/src/scotch/gmap.h	2010-07-19 11:52:16.821897100 -0700
+*** src/src/scotch/gmap.h	2010-07-19 12:08:20.597685056 -0700
 --- old/src/scotch/gmap.h	2008-06-18 11:05:17.000000000 -0700
 ***************
@@ -1958,5 +2000,5 @@
 Only in src/src/scotch: gmapx.c
 diff -rc src/src/scotch/Makefile old/src/scotch/Makefile
-*** src/src/scotch/Makefile	2010-07-19 11:51:37.303618454 -0700
+*** src/src/scotch/Makefile	2010-07-19 12:08:20.599685070 -0700
 --- old/src/scotch/Makefile	2009-04-27 02:19:43.000000000 -0700
 ***************