Index: /issm/trunk/externalpackages/scotch/install.sh
===================================================================
--- /issm/trunk/externalpackages/scotch/install.sh	(revision 4652)
+++ /issm/trunk/externalpackages/scotch/install.sh	(revision 4653)
@@ -1,3 +1,6 @@
 #!/bin/bash
+
+#get number of CPUS
+NUMCPUS=$1;
 
 # Some cleanup
@@ -18,5 +21,8 @@
 # Apply patches (all at once, since many)
 # (written by diff -rc src ~/Libs/scotch_5.1 > scotch.patch)
-patch -p0 < scotch.patch
+patch -R -p0 < scotch.patch
+#patch -p0 < scotch.patch
+
+
 
 # Build scotch
@@ -26,5 +32,5 @@
 cd src/src
 # For stand-alone scotch modules:
-make scotch
+make -j $NUMCPUS scotch
 #make clean
 # For mex scotch modules:
@@ -40,8 +46,8 @@
 cp -pr src/man install
 mkdir install/include
-cp -p src/src/libscotch/module.h install/include
-cp -p src/src/libscotch/common.h install/include
-cp -p src/include/scotch.h install/include
-cp -p src/src/scotch/gmap.h install/include
+cp -p src/src/libscotch/module.h install/include/scotch_module.h
+cp -p src/src/libscotch/common.h install/include/scotch_common.h
+cp -p src/include/scotch.h install/include/
+cp -p src/src/scotch/gmap.h install/include/scotch_gmap.h
 mkdir install/lib
 mv src/lib/* install/lib
@@ -50,3 +56,2 @@
 #cp -p gmap.m install/bin
 #cp -p gpart.m install/bin
-
Index: /issm/trunk/externalpackages/scotch/scotch.patch
===================================================================
--- /issm/trunk/externalpackages/scotch/scotch.patch	(revision 4652)
+++ /issm/trunk/externalpackages/scotch/scotch.patch	(revision 4653)
@@ -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 10:53:22.888731718 -0700
+*** src/src/libscotch/arch.c	2010-07-19 11:51:37.187617636 -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 10:53:22.891731738 -0700
+*** src/src/libscotch/arch_cmplt.c	2010-07-19 11:51:37.190617657 -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 10:53:22.893731751 -0700
+*** src/src/libscotch/arch_cmplt.h	2010-07-19 11:51:37.193617678 -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 10:53:22.896731770 -0700
+*** src/src/libscotch/arch_cmpltw.c	2010-07-19 11:51:37.195617692 -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 10:53:22.899731789 -0700
+*** src/src/libscotch/arch_cmpltw.h	2010-07-19 11:51:37.198617713 -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 10:53:22.902731808 -0700
+*** src/src/libscotch/arch_deco.c	2010-07-19 11:51:37.201617734 -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 10:53:22.904731821 -0700
+*** src/src/libscotch/arch_deco.h	2010-07-19 11:51:37.204617756 -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 10:53:22.907731841 -0700
+*** src/src/libscotch/arch.h	2010-07-19 11:51:37.206617770 -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 10:53:22.910731860 -0700
+*** src/src/libscotch/arch_hcub.c	2010-07-19 11:51:37.209617791 -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 10:53:22.912731873 -0700
+*** src/src/libscotch/arch_hcub.h	2010-07-19 11:51:37.212617812 -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 10:53:22.915731892 -0700
+*** src/src/libscotch/arch_mesh.c	2010-07-19 11:51:37.215617833 -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 10:53:22.918731911 -0700
+*** src/src/libscotch/arch_mesh.h	2010-07-19 11:51:37.217617847 -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 10:53:22.920731924 -0700
+*** src/src/libscotch/arch_tleaf.c	2010-07-19 11:51:37.220617868 -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 10:53:22.923731944 -0700
+*** src/src/libscotch/arch_tleaf.h	2010-07-19 11:51:37.223617890 -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 10:53:22.926731963 -0700
+*** src/src/libscotch/arch_torus.c	2010-07-19 11:51:37.226617911 -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 10:53:22.928731976 -0700
+*** src/src/libscotch/arch_torus.h	2010-07-19 11:51:37.228617925 -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 10:53:22.931731995 -0700
+*** src/src/libscotch/common.c	2010-07-19 11:51:37.231617946 -0700
 --- old/src/libscotch/common.c	2008-05-22 06:44:41.000000000 -0700
 ***************
@@ -721,51 +721,24 @@
 --- 100,106 ----
 diff -rc src/src/libscotch/common.h old/src/libscotch/common.h
-*** src/src/libscotch/common.h	2010-07-19 10:53:22.933732008 -0700
+*** src/src/libscotch/common.h	2010-07-19 11:51:37.233617960 -0700
 --- old/src/libscotch/common.h	2009-02-06 14:20:55.000000000 -0800
 ***************
-*** 66,72 ****
-  #include            <stdio.h>
-  #include            <stdarg.h>
-  #include            <stdlib.h>
-- #include            <stdint.h>                    /* added for intptr_t */
-  #ifdef HAVE_MALLOC_H
-  #include            <malloc.h>                    /* Deprecated, but required on some old systems */
-  #endif /* HAVE_MALLOC_H */
---- 66,71 ----
-***************
-*** 89,108 ****
-  #include            <pthread.h>
-  #endif /* ((defined COMMON_PTHREAD) || (defined SCOTCH_PTHREAD)) */
-  
-- #ifdef MATLAB
--     #include "mat.h"
--     #include "mex.h"
--     #include "matrix.h"
-- 
--     #define printf mexPrintf
--     #define fprintf(file,...) (file == stdout || file == stderr ? mexPrintf(__VA_ARGS__) : fprintf(file,__VA_ARGS__))
--     #define malloc mxMalloc
--     #define calloc mxCalloc
--     #define realloc mxRealloc
--     #define free mxFree
--     #define exit(status) mexErrMsgTxt("exit=" #status)
-- #endif
-- 
-  /*
-  **  Working definitions.
-  */
---- 88,93 ----
-***************
-*** 224,230 ****
-  int                         intSave             (FILE * const, const INT);
-  void                        intAscn             (INT * const, const INT, const INT);
-  void                        intPerm             (INT * const, const INT);
-- void                        intRandResetStatic  (void);
-  void                        intRandReset        (void);
-  void                        intRandInit         (void);
-  INT                         intRandVal          (INT);
---- 209,214 ----
+*** 1,5 ****
+- #ifndef _SCOTCH_COMMON_H_
+- #define _SCOTCH_COMMON_H_
+  /* Copyright 2004,2007-2009 ENSEIRB, INRIA & CNRS
+  **
+  ** This file is part of the Scotch software package for static mapping,
+--- 1,3 ----
+***************
+*** 251,255 ****
+  void nl##__ pl                                   \
+  { nu pc; }                                       \
+  void nu pl
+- 
+- #endif //#ifndef _SCOTCH_COMMON_H_
+--- 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 10:53:22.936732027 -0700
+*** src/src/libscotch/common_integer.c	2010-07-19 11:51:37.236617981 -0700
 --- old/src/libscotch/common_integer.c	2009-01-21 01:32:32.000000000 -0800
 ***************
@@ -828,5 +801,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 10:53:22.939732046 -0700
+*** src/src/libscotch/common_memory.c	2010-07-19 11:51:37.239618002 -0700
 --- old/src/libscotch/common_memory.c	2009-01-03 02:16:11.000000000 -0800
 ***************
@@ -936,5 +909,5 @@
 --- 185,192 ----
 diff -rc src/src/libscotch/dummysizes.c old/src/libscotch/dummysizes.c
-*** src/src/libscotch/dummysizes.c	2010-07-19 10:53:22.941732059 -0700
+*** src/src/libscotch/dummysizes.c	2010-07-19 11:51:37.241618017 -0700
 --- old/src/libscotch/dummysizes.c	2009-05-09 16:08:02.000000000 -0700
 ***************
@@ -949,5 +922,5 @@
 --- 267,271 ----
 diff -rc src/src/libscotch/graph.c old/src/libscotch/graph.c
-*** src/src/libscotch/graph.c	2010-07-19 10:53:22.943732072 -0700
+*** src/src/libscotch/graph.c	2010-07-19 11:51:37.244618038 -0700
 --- old/src/libscotch/graph.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -972,5 +945,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 10:53:22.946732092 -0700
+*** src/src/libscotch/graph.h	2010-07-19 11:51:37.247618059 -0700
 --- old/src/libscotch/graph.h	2008-06-01 02:49:11.000000000 -0700
 ***************
@@ -989,5 +962,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 10:53:22.949732111 -0700
+*** src/src/libscotch/graph_io.c	2010-07-19 11:51:37.250618080 -0700
 --- old/src/libscotch/graph_io.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -1227,5 +1200,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 10:53:22.952732130 -0700
+*** src/src/libscotch/graph_io_scot.c	2010-07-19 11:51:37.253618101 -0700
 --- old/src/libscotch/graph_io_scot.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -1244,5 +1217,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 10:53:22.954732143 -0700
+*** src/src/libscotch/library_arch.c	2010-07-19 11:51:37.255618115 -0700
 --- old/src/libscotch/library_arch.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -1279,5 +1252,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 10:53:22.956732156 -0700
+*** src/src/libscotch/library_arch_f.c	2010-07-19 11:51:37.257618129 -0700
 --- old/src/libscotch/library_arch_f.c	2008-05-22 06:44:42.000000000 -0700
 ***************
@@ -1296,5 +1269,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 10:53:22.959732175 -0700
+*** src/src/libscotch/library_error_exit.c	2010-07-19 11:51:37.260618150 -0700
 --- old/src/libscotch/library_error_exit.c	2009-01-20 00:36:33.000000000 -0800
 ***************
@@ -1371,5 +1344,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 10:53:22.962732194 -0700
+*** src/src/libscotch/library_graph.c	2010-07-19 11:51:37.263618172 -0700
 --- old/src/libscotch/library_graph.c	2008-05-22 07:28:12.000000000 -0700
 ***************
@@ -1416,5 +1389,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 10:53:22.964732207 -0700
+*** src/src/libscotch/library_graph_f.c	2010-07-19 11:51:37.265618186 -0700
 --- old/src/libscotch/library_graph_f.c	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1433,5 +1406,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 10:53:22.967732227 -0700
+*** src/src/libscotch/library_graph_map.c	2010-07-19 11:51:37.267618200 -0700
 --- old/src/libscotch/library_graph_map.c	2008-09-28 04:04:05.000000000 -0700
 ***************
@@ -1458,5 +1431,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 10:53:22.969732239 -0700
+*** src/src/libscotch/library_graph_map_f.c	2010-07-19 11:51:37.269618214 -0700
 --- old/src/libscotch/library_graph_map_f.c	2008-06-28 03:44:26.000000000 -0700
 ***************
@@ -1475,50 +1448,24 @@
 --- 183,189 ----
 diff -rc src/src/libscotch/library.h old/src/libscotch/library.h
-*** src/src/libscotch/library.h	2010-07-19 10:53:22.972732259 -0700
+*** src/src/libscotch/library.h	2010-07-19 11:51:37.272618235 -0700
 --- old/src/libscotch/library.h	2009-05-09 16:08:03.000000000 -0700
 ***************
-*** 134,144 ****
-  
-  int                         SCOTCH_archInit     (SCOTCH_Arch * const);
-  void                        SCOTCH_archExit     (SCOTCH_Arch * const);
-- #ifndef MATLAB
-  int                         SCOTCH_archLoad     (SCOTCH_Arch * const, FILE * const);
-- #else /* MATLAB */
-- int                         SCOTCH_archLoad     (SCOTCH_Arch * const, FILE * const, const char *, const SCOTCH_Num, const SCOTCH_Num *);
-- #endif /* MATLAB */
-  int                         SCOTCH_archSave     (const SCOTCH_Arch * const, FILE * const);
-  int                         SCOTCH_archBuild    (SCOTCH_Arch * const, const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_Num * const, const SCOTCH_Strat * const);
-  int                         SCOTCH_archCmplt    (SCOTCH_Arch * const, const SCOTCH_Num);
---- 134,140 ----
-***************
-*** 195,205 ****
-  int                         SCOTCH_graphInit    (SCOTCH_Graph * const);
-  void                        SCOTCH_graphExit    (SCOTCH_Graph * const);
-  void                        SCOTCH_graphFree    (SCOTCH_Graph * const);
-- #ifndef MATLAB
-  int                         SCOTCH_graphLoad    (SCOTCH_Graph * const, FILE * const, const SCOTCH_Num, const SCOTCH_Num);
-- #else /* MATLAB */
-- int                         SCOTCH_graphLoad    (SCOTCH_Graph * const, FILE * const, const SCOTCH_Num, const SCOTCH_Num, const SCOTCH_Num, const SCOTCH_Num, const SCOTCH_Num *, const SCOTCH_Num *, const SCOTCH_Num *, const SCOTCH_Num *, const SCOTCH_Num *);
-- #endif /* MATLAB */
-  int                         SCOTCH_graphSave    (const SCOTCH_Graph * const, FILE * const);
-  int                         SCOTCH_graphBuild   (SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_Num, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num, const SCOTCH_Num * const, const SCOTCH_Num * const);
-  SCOTCH_Num                  SCOTCH_graphBase    (SCOTCH_Graph * const, const SCOTCH_Num baseval);
---- 191,197 ----
-***************
-*** 218,228 ****
-  int                         SCOTCH_graphMapInit (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Arch * const, SCOTCH_Num * const);
-  void                        SCOTCH_graphMapExit (const SCOTCH_Graph * const, SCOTCH_Mapping * const);
-  int                         SCOTCH_graphMapLoad (const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const);
-- #ifndef MATLAB
-  int                         SCOTCH_graphMapSave (const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const);
-- #else /* MATLAB */
-- int                         SCOTCH_graphMapSave (SCOTCH_Num *, SCOTCH_Num (**)[2], const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const);
-- #endif /* MATLAB */
-  int                         SCOTCH_graphMapView (const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const);
-  int                         SCOTCH_graphMapCompute (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Strat * const);
-  int                         SCOTCH_graphMap     (const SCOTCH_Graph * const, const SCOTCH_Arch * const, const SCOTCH_Strat * const, SCOTCH_Num * const);
---- 210,216 ----
+*** 1,5 ****
+- #ifndef _SCOTCH_H_
+- #define _SCOTCH_H_
+  /* Copyright 2004,2007-2009 ENSEIRB, INRIA & CNRS
+  **
+  ** This file is part of the Scotch software package for static mapping,
+--- 1,3 ----
+***************
+*** 280,284 ****
+  #ifdef __cplusplus
+  }
+  #endif /* __cplusplus */
+- 
+- #endif //#ifndef _SCOTCH_H_
+--- 278,280 ----
 diff -rc src/src/libscotch/Makefile old/src/libscotch/Makefile
-*** src/src/libscotch/Makefile	2010-07-19 10:53:22.977732291 -0700
+*** src/src/libscotch/Makefile	2010-07-19 11:51:37.277618270 -0700
 --- old/src/libscotch/Makefile	2009-05-09 16:08:04.000000000 -0700
 ***************
@@ -1755,5 +1702,5 @@
 --- 2467,2469 ----
 diff -rc src/src/libscotch/mapping.h old/src/libscotch/mapping.h
-*** src/src/libscotch/mapping.h	2010-07-19 10:53:22.980732310 -0700
+*** src/src/libscotch/mapping.h	2010-07-19 11:51:37.279618284 -0700
 --- old/src/libscotch/mapping.h	2008-10-27 08:27:47.000000000 -0700
 ***************
@@ -1772,5 +1719,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 10:53:22.983732330 -0700
+*** src/src/libscotch/mapping_io.c	2010-07-19 11:51:37.282618306 -0700
 --- old/src/libscotch/mapping_io.c	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1861,5 +1808,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 10:53:22.986732349 -0700
+*** src/src/libscotch/mesh_io_scot.c	2010-07-19 11:51:37.285618327 -0700
 --- old/src/libscotch/mesh_io_scot.c	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1878,18 +1825,36 @@
 --- 85,91 ----
 diff -rc src/src/libscotch/module.h old/src/libscotch/module.h
-*** src/src/libscotch/module.h	2010-07-19 10:53:22.990732375 -0700
+*** src/src/libscotch/module.h	2010-07-19 11:51:37.288618348 -0700
 --- old/src/libscotch/module.h	2009-04-26 23:07:14.000000000 -0700
 ***************
-*** 156,162 ****
-  #define intSave                     _SCOTCHintSave
-  #define intAscn                     _SCOTCHintAscn
-  #define intPerm                     _SCOTCHintPerm
-- #define intRandResetStatic          _SCOTCHintRandResetStatic
-  #define intRandReset                _SCOTCHintRandReset
-  #define intRandInit                 _SCOTCHintRandInit
-  /* #define intRandVal               _SCOTCHintRandVal Already a macro */
---- 156,161 ----
+*** 1,5 ****
+- #ifndef _SCOTCH_MODULE_H_
+- #define _SCOTCH_MODULE_H_
+  /* Copyright 2004,2007-2009 ENSEIRB, INRIA & CNRS
+  **
+  ** This file is part of the Scotch software package for static mapping,
+--- 1,3 ----
+***************
+*** 57,65 ****
+  
+  #define MODULE_H
+  
+- /*Don't forget stdint.h:*/
+- #include "stdint.h"
+- 
+  /*
+  ** Collective communication handling.
+  */
+--- 55,60 ----
+***************
+*** 686,690 ****
+  #define vmeshStoreSave              _SCOTCHvmeshStoreSave
+  #define vmeshStoreUpdt              _SCOTCHvmeshStoreUpdt
+  #endif /* SCOTCH_RENAME */
+- 
+- #endif //#ifndef _SCOTCH_MODULE_H_
+--- 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 10:53:22.993732394 -0700
+*** src/src/libscotch/parser_ll.l	2010-07-19 11:51:37.290618362 -0700
 --- old/src/libscotch/parser_ll.l	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1920,5 +1885,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 10:53:22.997732420 -0700
+*** src/src/libscotch/parser_yy.y	2010-07-19 11:51:37.293618383 -0700
 --- old/src/libscotch/parser_yy.y	2008-10-22 15:12:48.000000000 -0700
 ***************
@@ -1933,5 +1898,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 10:53:22.999732432 -0700
+*** src/src/libscotch/vgraph_separate_vw.c	2010-07-19 11:51:37.296618404 -0700
 --- old/src/libscotch/vgraph_separate_vw.c	2008-05-22 06:44:43.000000000 -0700
 ***************
@@ -1955,5 +1920,5 @@
 --- 102,106 ----
 diff -rc src/src/Makefile old/src/Makefile
-*** src/src/Makefile	2010-07-19 10:53:23.001732445 -0700
+*** src/src/Makefile	2010-07-19 11:51:37.298618418 -0700
 --- old/src/Makefile	2008-09-15 05:50:51.000000000 -0700
 ***************
@@ -1971,8 +1936,27 @@
 --- 97,102 ----
 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
+--- old/src/scotch/gmap.h	2008-06-18 11:05:17.000000000 -0700
+***************
+*** 1,5 ****
+- #ifndef _SCOTCH_GMAP_H_
+- #define _SCOTCH_GMAP_H_
+  /* Copyright 2004,2007,2008 ENSEIRB, INRIA & CNRS
+  **
+  ** This file is part of the Scotch software package for static mapping,
+--- 1,3 ----
+***************
+*** 89,93 ****
+  #define C_FLAGVERBSTR               0x0002        /* Verbose flags */
+  #define C_FLAGVERBTIM               0x0004
+  #define C_FLAGVERBMAP               0x0008
+- 
+- #endif //#ifndef _SCOTCH_GMAP_H_
+--- 87,89 ----
 Only in src/src/scotch: gmap_mex.c
 Only in src/src/scotch: gmapx.c
 diff -rc src/src/scotch/Makefile old/src/scotch/Makefile
-*** src/src/scotch/Makefile	2010-07-19 10:53:23.004732465 -0700
+*** src/src/scotch/Makefile	2010-07-19 11:51:37.303618454 -0700
 --- old/src/scotch/Makefile	2009-04-27 02:19:43.000000000 -0700
 ***************