Index: /issm/trunk-jpl/externalpackages/scotch/install.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/scotch/install.sh	(revision 14992)
+++ /issm/trunk-jpl/externalpackages/scotch/install.sh	(revision 14993)
@@ -18,11 +18,11 @@
 tar -xvzf scotch_5.1.6.tar.gz
 
+# Apply patches (all at once, since many)
+# (written by diff -rc old_src new_src > scotch.patch)
+patch -p0 < scotch.patch
+
 # Move scotch to src directory
 mv scotch_5.1/* src
 rm -rf scotch_5.1
-
-# Apply patches (all at once, since many)
-# (written by diff -rc old_src new_src > scotch.patch)
-patch -p0 < scotch.patch
 
 # Build scotch
Index: /issm/trunk-jpl/externalpackages/scotch/scotch.patch
===================================================================
--- /issm/trunk-jpl/externalpackages/scotch/scotch.patch	(revision 14992)
+++ /issm/trunk-jpl/externalpackages/scotch/scotch.patch	(revision 14993)
@@ -1,8 +1,8 @@
-Only in new5: bin
-Only in new5: include
-Only in new5: lib
-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-21 17:13:15.583257119 -0700
+Only in src: bin
+Only in src: include
+Only in src: lib
+diff -crB scotch_5.1/src/libscotch/arch.c src/src/libscotch/arch.c
+*** scotch_5.1/src/libscotch/arch.c	2008-09-27 07:48:01.000000000 -0700
+--- src/src/libscotch/arch.c	2013-05-06 14:14:11.000000000 -0700
 ***************
 *** 173,187 ****
@@ -68,7 +68,7 @@
         memset     (archptr, 0, sizeof (Arch));     /* Initialize architecture body */
         return     (1);
-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-21 17:13:15.585257133 -0700
+diff -crB scotch_5.1/src/libscotch/arch_cmplt.c src/src/libscotch/arch_cmplt.c
+*** scotch_5.1/src/libscotch/arch_cmplt.c	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_cmplt.c	2013-05-06 14:14:11.000000000 -0700
 ***************
 *** 90,99 ****
@@ -120,7 +120,7 @@
       return     (1);
     }
-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-21 17:13:15.588257154 -0700
+diff -crB scotch_5.1/src/libscotch/arch_cmplt.h src/src/libscotch/arch_cmplt.h
+*** scotch_5.1/src/libscotch/arch_cmplt.h	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_cmplt.h	2013-05-06 14:14:11.000000000 -0700
 ***************
 *** 87,93 ****
@@ -137,7 +137,7 @@
   #define archCmpltArchFree           NULL
   ArchDomNum                  archCmpltDomNum     (const ArchCmplt * const, const ArchCmpltDom * const);
-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-21 17:13:15.590257168 -0700
+diff -crB scotch_5.1/src/libscotch/arch_cmpltw.c src/src/libscotch/arch_cmpltw.c
+*** scotch_5.1/src/libscotch/arch_cmpltw.c	2008-08-27 14:22:22.000000000 -0700
+--- src/src/libscotch/arch_cmpltw.c	2013-05-06 14:14:12.000000000 -0700
 ***************
 *** 200,211 ****
@@ -209,7 +209,7 @@
         return     (1);
       }
-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-21 17:13:15.592257181 -0700
+diff -crB scotch_5.1/src/libscotch/arch_cmpltw.h src/src/libscotch/arch_cmpltw.h
+*** scotch_5.1/src/libscotch/arch_cmpltw.h	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_cmpltw.h	2013-05-06 14:14:12.000000000 -0700
 ***************
 *** 86,92 ****
@@ -226,7 +226,7 @@
   int                         archCmpltwArchFree  (ArchCmpltw * restrict const);
   ArchDomNum                  archCmpltwDomNum    (const ArchCmpltw * const, const ArchCmpltwDom * const);
-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-21 17:13:15.595257202 -0700
+diff -crB scotch_5.1/src/libscotch/arch_deco.c src/src/libscotch/arch_deco.c
+*** scotch_5.1/src/libscotch/arch_deco.c	2008-09-28 06:35:27.000000000 -0700
+--- src/src/libscotch/arch_deco.c	2013-05-06 14:14:12.000000000 -0700
 ***************
 *** 211,217 ****
@@ -267,7 +267,7 @@
     if ((sizeof (ArchDeco)    > sizeof (ArchDummy)) ||
         (sizeof (ArchDecoDom) > sizeof (ArchDomDummy))) {
-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-21 17:13:15.597257216 -0700
+diff -crB scotch_5.1/src/libscotch/arch_deco.h src/src/libscotch/arch_deco.h
+*** scotch_5.1/src/libscotch/arch_deco.h	2008-09-27 07:49:46.000000000 -0700
+--- src/src/libscotch/arch_deco.h	2013-05-06 14:14:13.000000000 -0700
 ***************
 *** 113,119 ****
@@ -284,7 +284,7 @@
   int                         archDecoArchFree    (ArchDeco * const);
   Anum                        archDecoArchSize    (ArchDeco * const, const Anum);
-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-21 17:13:15.600257237 -0700
+diff -crB scotch_5.1/src/libscotch/arch.h src/src/libscotch/arch.h
+*** scotch_5.1/src/libscotch/arch.h	2009-04-28 08:11:27.000000000 -0700
+--- src/src/libscotch/arch.h	2013-05-06 14:14:13.000000000 -0700
 ***************
 *** 175,181 ****
@@ -301,7 +301,7 @@
   char *                      archName            (const Arch * const);
   const ArchClass *           archClass           (const char * const);
-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-21 17:13:15.602257251 -0700
+diff -crB scotch_5.1/src/libscotch/arch_hcub.c src/src/libscotch/arch_hcub.c
+*** scotch_5.1/src/libscotch/arch_hcub.c	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_hcub.c	2013-05-06 14:14:13.000000000 -0700
 ***************
 *** 88,95 ****
@@ -310,5 +310,5 @@
   ArchHcub * restrict const   archptr,
 ! FILE * restrict const       stream)
-! {
+  {
   #ifdef SCOTCH_DEBUG_ARCH1
     if ((sizeof (ArchHcub)    > sizeof (ArchDummy)) ||
@@ -325,9 +325,9 @@
 ! #endif /* NOFILEIO */
 !                                    )
-! {
-! #ifdef NOFILEIO
-! //  printf("archHcubArchLoad - napar=%d,archpar=%p\n",napar,archpar);
-! #endif /* NOFILEIO */
-! 
+  {
++ #ifdef NOFILEIO
++ //  printf("archHcubArchLoad - napar=%d,archpar=%p\n",napar,archpar);
++ #endif /* NOFILEIO */
++ 
   #ifdef SCOTCH_DEBUG_ARCH1
     if ((sizeof (ArchHcub)    > sizeof (ArchDummy)) ||
@@ -349,7 +349,7 @@
       errorPrint ("archHcubArchLoad: bad input");
       return     (1);
-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-21 17:13:15.604257265 -0700
+diff -crB scotch_5.1/src/libscotch/arch_hcub.h src/src/libscotch/arch_hcub.h
+*** scotch_5.1/src/libscotch/arch_hcub.h	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_hcub.h	2013-05-06 14:14:14.000000000 -0700
 ***************
 *** 85,91 ****
@@ -366,7 +366,7 @@
   #define archHcubArchFree            NULL
   ArchDomNum                  archHcubDomNum      (const ArchHcub * const, const ArchHcubDom * const);
-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-21 17:13:15.607257286 -0700
+diff -crB scotch_5.1/src/libscotch/arch_mesh.c src/src/libscotch/arch_mesh.c
+*** scotch_5.1/src/libscotch/arch_mesh.c	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_mesh.c	2013-05-06 14:14:14.000000000 -0700
 ***************
 *** 96,103 ****
@@ -465,7 +465,7 @@
       return     (1);
     }
-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-21 17:13:15.610257307 -0700
+diff -crB scotch_5.1/src/libscotch/arch_mesh.h src/src/libscotch/arch_mesh.h
+*** scotch_5.1/src/libscotch/arch_mesh.h	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_mesh.h	2013-05-06 14:14:14.000000000 -0700
 ***************
 *** 96,102 ****
@@ -496,7 +496,7 @@
   #define archMesh3ArchFree           NULL
   ArchDomNum                  archMesh3DomNum     (const ArchMesh3 * const, const ArchMesh3Dom * const);
-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-21 17:13:15.612257320 -0700
+diff -crB scotch_5.1/src/libscotch/arch_tleaf.c src/src/libscotch/arch_tleaf.c
+*** scotch_5.1/src/libscotch/arch_tleaf.c	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_tleaf.c	2013-05-06 14:14:14.000000000 -0700
 ***************
 *** 92,99 ****
@@ -505,5 +505,5 @@
   ArchTleaf * restrict const  archptr,
 ! FILE * restrict const       stream)
-! {
+  {
   #ifdef SCOTCH_DEBUG_ARCH1
     if ((sizeof (ArchTleaf)    > sizeof (ArchDummy)) ||
@@ -520,9 +520,9 @@
 ! #endif /* NOFILEIO */
 !                                    )
-! {
-! #ifdef NOFILEIO
-! //  printf("archTleafArchLoad - napar=%d,archpar=%p\n",napar,archpar);
-! #endif /* NOFILEIO */
-! 
+  {
++ #ifdef NOFILEIO
++ //  printf("archTleafArchLoad - napar=%d,archpar=%p\n",napar,archpar);
++ #endif /* NOFILEIO */
++ 
   #ifdef SCOTCH_DEBUG_ARCH1
     if ((sizeof (ArchTleaf)    > sizeof (ArchDummy)) ||
@@ -554,7 +554,7 @@
       return     (1);
     }
-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-21 17:13:15.615257341 -0700
+diff -crB scotch_5.1/src/libscotch/arch_tleaf.h src/src/libscotch/arch_tleaf.h
+*** scotch_5.1/src/libscotch/arch_tleaf.h	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_tleaf.h	2013-05-06 14:14:15.000000000 -0700
 ***************
 *** 89,95 ****
@@ -571,7 +571,7 @@
   #define archTleafArchFree           NULL
   ArchDomNum                  archTleafDomNum     (const ArchTleaf * const, const ArchTleafDom * const);
-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-21 17:13:15.618257362 -0700
+diff -crB scotch_5.1/src/libscotch/arch_torus.c src/src/libscotch/arch_torus.c
+*** scotch_5.1/src/libscotch/arch_torus.c	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_torus.c	2013-05-06 14:14:15.000000000 -0700
 ***************
 *** 90,97 ****
@@ -670,7 +670,7 @@
       return     (1);
     }
-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-21 17:13:15.620257376 -0700
+diff -crB scotch_5.1/src/libscotch/arch_torus.h src/src/libscotch/arch_torus.h
+*** scotch_5.1/src/libscotch/arch_torus.h	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/arch_torus.h	2013-05-06 14:14:15.000000000 -0700
 ***************
 *** 96,102 ****
@@ -701,7 +701,7 @@
   #define archTorus3ArchFree          NULL
   ArchDomNum                  archTorus3DomNum    (const ArchTorus3 * const, const ArchTorus3Dom * const);
-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-21 17:13:15.622257390 -0700
+diff -crB scotch_5.1/src/libscotch/common.c src/src/libscotch/common.c
+*** scotch_5.1/src/libscotch/common.c	2008-05-22 06:44:41.000000000 -0700
+--- src/src/libscotch/common.c	2013-05-06 14:14:15.000000000 -0700
 ***************
 *** 100,106 ****
@@ -720,7 +720,7 @@
 + #endif /* MATLAB */
   }
-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 17:15:06.061025001 -0700
+diff -crB scotch_5.1/src/libscotch/common.h src/src/libscotch/common.h
+*** scotch_5.1/src/libscotch/common.h	2009-02-06 14:20:55.000000000 -0800
+--- src/src/libscotch/common.h	2013-05-09 11:49:35.317220518 -0700
 ***************
 *** 1,3 ****
@@ -752,4 +752,25 @@
   
 --- 109,114 ----
+***************
+*** 171,179 ****
+  /** The file structure. **/
+  
+  typedef struct File_ {
+!   char *                    name;                 /*+ File name    +*/
+    FILE *                    pntr;                 /*+ File pointer +*/
+!   char *                    mode;                 /*+ Opening mode +*/
+  } File;
+  
+  /*
+--- 172,180 ----
+  /** The file structure. **/
+  
+  typedef struct File_ {
+!   const char *              name;                 /*+ File name    +*/
+    FILE *                    pntr;                 /*+ File pointer +*/
+!   const char *              mode;                 /*+ Opening mode +*/
+  } File;
+  
+  /*
 ***************
 *** 190,216 ****
@@ -837,7 +858,7 @@
 + 
 + #endif //#ifndef _SCOTCH_COMMON_H_
-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-21 17:13:15.628257432 -0700
+diff -crB scotch_5.1/src/libscotch/common_integer.c src/src/libscotch/common_integer.c
+*** scotch_5.1/src/libscotch/common_integer.c	2009-01-21 01:32:32.000000000 -0800
+--- src/src/libscotch/common_integer.c	2013-05-06 14:14:16.000000000 -0700
 ***************
 *** 191,196 ****
@@ -910,7 +931,7 @@
   
   /*********************/
-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-21 17:13:15.630257445 -0700
+diff -crB scotch_5.1/src/libscotch/common_memory.c src/src/libscotch/common_memory.c
+*** scotch_5.1/src/libscotch/common_memory.c	2009-01-03 02:16:11.000000000 -0800
+--- src/src/libscotch/common_memory.c	2013-05-06 14:14:16.000000000 -0700
 ***************
 *** 87,93 ****
@@ -1018,7 +1039,7 @@
   }
   #endif /* COMMON_MEMORY_TRACE */
-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-21 17:13:15.633257466 -0700
+diff -crB scotch_5.1/src/libscotch/dummysizes.c src/src/libscotch/dummysizes.c
+*** scotch_5.1/src/libscotch/dummysizes.c	2009-05-09 16:08:02.000000000 -0700
+--- src/src/libscotch/dummysizes.c	2013-05-06 14:14:16.000000000 -0700
 ***************
 *** 267,271 ****
@@ -1031,7 +1052,7 @@
 + #endif /* MATLAB */
   }
-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-21 17:13:15.635257480 -0700
+diff -crB scotch_5.1/src/libscotch/graph.c src/src/libscotch/graph.c
+*** scotch_5.1/src/libscotch/graph.c	2008-05-22 06:44:42.000000000 -0700
+--- src/src/libscotch/graph.c	2013-05-06 14:14:17.000000000 -0700
 ***************
 *** 135,141 ****
@@ -1054,7 +1075,7 @@
       if ((grafptr->edlotax != NULL) &&
           ((grafptr->flagval & GRAPHEDGEGROUP) == 0))
-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-21 17:13:15.637257494 -0700
+diff -crB scotch_5.1/src/libscotch/graph.h src/src/libscotch/graph.h
+*** scotch_5.1/src/libscotch/graph.h	2008-06-01 02:49:11.000000000 -0700
+--- src/src/libscotch/graph.h	2013-05-06 14:14:17.000000000 -0700
 ***************
 *** 159,165 ****
@@ -1071,7 +1092,7 @@
   int                         graphSave           (const Graph * const, FILE * const);
   Gnum                        graphBase           (Graph * const, const Gnum);
-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-21 17:13:15.639257508 -0700
+diff -crB scotch_5.1/src/libscotch/graph_io.c src/src/libscotch/graph_io.c
+*** scotch_5.1/src/libscotch/graph_io.c	2008-05-22 06:44:42.000000000 -0700
+--- src/src/libscotch/graph_io.c	2013-05-06 14:14:17.000000000 -0700
 ***************
 *** 86,92 ****
@@ -1309,7 +1330,7 @@
     }
   
-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-21 17:13:15.641257522 -0700
+diff -crB scotch_5.1/src/libscotch/graph_io_scot.c src/src/libscotch/graph_io_scot.c
+*** scotch_5.1/src/libscotch/graph_io_scot.c	2008-05-22 06:44:42.000000000 -0700
+--- src/src/libscotch/graph_io_scot.c	2013-05-06 14:14:17.000000000 -0700
 ***************
 *** 89,95 ****
@@ -1326,7 +1347,7 @@
     }
   
-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-21 17:13:15.643257536 -0700
+diff -crB scotch_5.1/src/libscotch/library_arch.c src/src/libscotch/library_arch.c
+*** scotch_5.1/src/libscotch/library_arch.c	2008-05-22 06:44:42.000000000 -0700
+--- src/src/libscotch/library_arch.c	2013-05-06 14:14:17.000000000 -0700
 ***************
 *** 120,128 ****
@@ -1361,7 +1382,7 @@
   
   /*+ This routine saves the given opaque
-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-21 17:13:15.645257550 -0700
+diff -crB scotch_5.1/src/libscotch/library_arch_f.c src/src/libscotch/library_arch_f.c
+*** scotch_5.1/src/libscotch/library_arch_f.c	2008-05-22 06:44:42.000000000 -0700
+--- src/src/libscotch/library_arch_f.c	2013-05-06 14:14:18.000000000 -0700
 ***************
 *** 121,127 ****
@@ -1378,7 +1399,7 @@
     fclose (stream);                                /* This closes filenum too */
   
-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-21 17:13:15.648257570 -0700
+diff -crB scotch_5.1/src/libscotch/library_error_exit.c src/src/libscotch/library_error_exit.c
+*** scotch_5.1/src/libscotch/library_error_exit.c	2009-01-20 00:36:33.000000000 -0800
+--- src/src/libscotch/library_error_exit.c	2013-05-06 14:14:18.000000000 -0700
 ***************
 *** 114,119 ****
@@ -1453,7 +1474,7 @@
 + #endif /* MATLAB */
   }
-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-21 17:13:15.650257584 -0700
+diff -crB scotch_5.1/src/libscotch/library_graph.c src/src/libscotch/library_graph.c
+*** scotch_5.1/src/libscotch/library_graph.c	2008-05-22 07:28:12.000000000 -0700
+--- src/src/libscotch/library_graph.c	2013-05-06 14:14:18.000000000 -0700
 ***************
 *** 137,143 ****
@@ -1498,7 +1519,7 @@
   
   /*+ This routine saves the contents of the given
-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-21 17:13:15.652257598 -0700
+diff -crB scotch_5.1/src/libscotch/library_graph_f.c src/src/libscotch/library_graph_f.c
+*** scotch_5.1/src/libscotch/library_graph_f.c	2008-05-22 06:44:43.000000000 -0700
+--- src/src/libscotch/library_graph_f.c	2013-05-06 14:14:18.000000000 -0700
 ***************
 *** 136,142 ****
@@ -1515,7 +1536,7 @@
     fclose (stream);                                /* This closes filenum too */
   
-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-21 17:13:15.654257612 -0700
+diff -crB scotch_5.1/src/libscotch/library_graph_map.c src/src/libscotch/library_graph_map.c
+*** scotch_5.1/src/libscotch/library_graph_map.c	2008-09-28 04:04:05.000000000 -0700
+--- src/src/libscotch/library_graph_map.c	2013-05-06 14:14:19.000000000 -0700
 ***************
 *** 182,192 ****
@@ -1540,7 +1561,7 @@
   
   /*+ This routine computes a mapping
-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-21 17:13:15.656257626 -0700
+diff -crB scotch_5.1/src/libscotch/library_graph_map_f.c src/src/libscotch/library_graph_map_f.c
+*** scotch_5.1/src/libscotch/library_graph_map_f.c	2008-06-28 03:44:26.000000000 -0700
+--- src/src/libscotch/library_graph_map_f.c	2013-05-06 14:14:19.000000000 -0700
 ***************
 *** 183,189 ****
@@ -1557,7 +1578,7 @@
     fclose (stream);                                /* This closes filenum too */
   
-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 17:13:15.660257654 -0700
+diff -crB scotch_5.1/src/libscotch/library.h src/src/libscotch/library.h
+*** scotch_5.1/src/libscotch/library.h	2009-05-09 16:08:03.000000000 -0700
+--- src/src/libscotch/library.h	2013-05-06 14:14:19.000000000 -0700
 ***************
 *** 1,3 ****
@@ -1618,7 +1639,7 @@
 + 
 + #endif //#ifndef _SCOTCH_H_
-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-21 17:13:15.665257689 -0700
+diff -crB scotch_5.1/src/libscotch/Makefile src/src/libscotch/Makefile
+*** scotch_5.1/src/libscotch/Makefile	2009-05-09 16:08:04.000000000 -0700
+--- src/src/libscotch/Makefile	2013-05-06 14:14:19.000000000 -0700
 ***************
 *** 49,55 ****
@@ -2037,7 +2058,7 @@
 + 					$(AR) $(ARFLAGS) $(@) $(?)
 + 					-$(RANLIB) $(@)
-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-21 17:13:15.667257702 -0700
+diff -crB scotch_5.1/src/libscotch/mapping.h src/src/libscotch/mapping.h
+*** scotch_5.1/src/libscotch/mapping.h	2008-10-27 08:27:47.000000000 -0700
+--- src/src/libscotch/mapping.h	2013-05-06 14:14:20.000000000 -0700
 ***************
 *** 106,112 ****
@@ -2054,7 +2075,7 @@
   
   #undef static
-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-21 17:13:15.670257723 -0700
+diff -crB scotch_5.1/src/libscotch/mapping_io.c src/src/libscotch/mapping_io.c
+*** scotch_5.1/src/libscotch/mapping_io.c	2008-05-22 06:44:43.000000000 -0700
+--- src/src/libscotch/mapping_io.c	2013-05-06 14:14:20.000000000 -0700
 ***************
 *** 199,204 ****
@@ -2143,7 +2164,7 @@
     return (0);
   }
-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-21 17:13:15.672257737 -0700
+diff -crB scotch_5.1/src/libscotch/mesh_io_scot.c src/src/libscotch/mesh_io_scot.c
+*** scotch_5.1/src/libscotch/mesh_io_scot.c	2008-05-22 06:44:43.000000000 -0700
+--- src/src/libscotch/mesh_io_scot.c	2013-05-06 14:14:20.000000000 -0700
 ***************
 *** 85,91 ****
@@ -2160,7 +2181,7 @@
     }
   
-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 17:13:15.675257758 -0700
+diff -crB scotch_5.1/src/libscotch/module.h src/src/libscotch/module.h
+*** scotch_5.1/src/libscotch/module.h	2009-04-26 23:07:14.000000000 -0700
+--- src/src/libscotch/module.h	2013-05-06 14:14:20.000000000 -0700
 ***************
 *** 1,3 ****
@@ -2201,7 +2222,7 @@
 + 
 + #endif //#ifndef _SCOTCH_MODULE_H_
-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-21 17:13:15.677257772 -0700
+diff -crB scotch_5.1/src/libscotch/parser_ll.l src/src/libscotch/parser_ll.l
+*** scotch_5.1/src/libscotch/parser_ll.l	2008-05-22 06:44:43.000000000 -0700
+--- src/src/libscotch/parser_ll.l	2013-05-06 14:14:21.000000000 -0700
 ***************
 *** 192,197 ****
@@ -2230,7 +2251,7 @@
     yyrestart (yyin);                               /* (Re-)initialize the parser */
   #endif /* FLEX_SCANNER */
-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-21 17:13:15.679257786 -0700
+diff -crB scotch_5.1/src/libscotch/parser_yy.y src/src/libscotch/parser_yy.y
+*** scotch_5.1/src/libscotch/parser_yy.y	2008-10-22 15:12:48.000000000 -0700
+--- src/src/libscotch/parser_yy.y	2013-05-06 14:14:21.000000000 -0700
 ***************
 *** 774,779 ****
@@ -2243,7 +2264,7 @@
     if (stratParserParse2 () != 0) {                /* Parse the strategy string */
       if (parserstratcurr != NULL)
-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-21 17:13:15.682257807 -0700
+diff -crB scotch_5.1/src/libscotch/vgraph_separate_vw.c src/src/libscotch/vgraph_separate_vw.c
+*** scotch_5.1/src/libscotch/vgraph_separate_vw.c	2008-05-22 06:44:43.000000000 -0700
+--- src/src/libscotch/vgraph_separate_vw.c	2013-05-06 14:14:21.000000000 -0700
 ***************
 *** 83,88 ****
@@ -2265,7 +2286,7 @@
     return (0);
   }
-diff -rc src/src/Makefile new5/src/Makefile
-*** src/src/Makefile	2008-09-15 05:50:51.000000000 -0700
---- new5/src/Makefile	2010-07-21 17:13:15.684257821 -0700
+diff -crB scotch_5.1/src/Makefile src/src/Makefile
+*** scotch_5.1/src/Makefile	2008-09-15 05:50:51.000000000 -0700
+--- src/src/Makefile	2013-05-06 14:14:21.000000000 -0700
 ***************
 *** 97,102 ****
@@ -2284,8 +2305,8 @@
   					-$(CP) -f ../bin/[agm]*$(EXE) $(bindir)
   					-$(CP) -f ../include/*scotch*.h $(includedir)
-Only in new5/src: Makefile.inc
-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 17:13:15.686257834 -0700
+Only in src/src: Makefile.inc
+diff -crB scotch_5.1/src/scotch/gmap.h src/src/scotch/gmap.h
+*** scotch_5.1/src/scotch/gmap.h	2008-06-18 11:05:17.000000000 -0700
+--- src/src/scotch/gmap.h	2013-05-06 14:14:22.000000000 -0700
 ***************
 *** 1,3 ****
@@ -2304,9 +2325,9 @@
 + 
 + #endif //#ifndef _SCOTCH_GMAP_H_
-Only in new5/src/scotch: gmap_mex.c
-Only in new5/src/scotch: gmapx.c
-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-21 17:13:15.689257855 -0700
+Only in src/src/scotch: gmap_mex.c
+Only in src/src/scotch: gmapx.c
+diff -crB scotch_5.1/src/scotch/Makefile src/src/scotch/Makefile
+*** scotch_5.1/src/scotch/Makefile	2009-04-27 02:19:43.000000000 -0700
+--- src/src/scotch/Makefile	2013-05-06 14:14:22.000000000 -0700
 ***************
 *** 49,59 ****