Changeset 14993


Ignore:
Timestamp:
05/09/13 11:53:32 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: fixed warning of char* conversion to const char* by changing File struct

Location:
issm/trunk-jpl/externalpackages/scotch
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/scotch/install.sh

    r13948 r14993  
    1818tar -xvzf scotch_5.1.6.tar.gz
    1919
     20# Apply patches (all at once, since many)
     21# (written by diff -rc old_src new_src > scotch.patch)
     22patch -p0 < scotch.patch
     23
    2024# Move scotch to src directory
    2125mv scotch_5.1/* src
    2226rm -rf scotch_5.1
    23 
    24 # Apply patches (all at once, since many)
    25 # (written by diff -rc old_src new_src > scotch.patch)
    26 patch -p0 < scotch.patch
    2727
    2828# Build scotch

  • issm/trunk-jpl/externalpackages/scotch/scotch.patch

    r4705 r14993  
    1 Only in new5: bin
    2 Only in new5: include
    3 Only in new5: lib
    4 diff -rc src/src/libscotch/arch.c new5/src/libscotch/arch.c
    5 *** src/src/libscotch/arch.c    2008-09-27 07:48:01.000000000 -0700
    6 --- new5/src/libscotch/arch.c   2010-07-21 17:13:15.583257119 -0700
     1Only in src: bin
     2Only in src: include
     3Only in src: lib
     4diff -crB scotch_5.1/src/libscotch/arch.c src/src/libscotch/arch.c
     5*** scotch_5.1/src/libscotch/arch.c     2008-09-27 07:48:01.000000000 -0700
     6--- src/src/libscotch/arch.c    2013-05-06 14:14:11.000000000 -0700
    77***************
    88*** 173,187 ****
    … …  
    6868        memset     (archptr, 0, sizeof (Arch));     /* Initialize architecture body */
    6969        return     (1);
    70 diff -rc src/src/libscotch/arch_cmplt.c new5/src/libscotch/arch_cmplt.c
    71 *** src/src/libscotch/arch_cmplt.c      2008-05-22 06:44:41.000000000 -0700
    72 --- new5/src/libscotch/arch_cmplt.c     2010-07-21 17:13:15.585257133 -0700
     70diff -crB scotch_5.1/src/libscotch/arch_cmplt.c src/src/libscotch/arch_cmplt.c
     71*** scotch_5.1/src/libscotch/arch_cmplt.c       2008-05-22 06:44:41.000000000 -0700
     72--- src/src/libscotch/arch_cmplt.c      2013-05-06 14:14:11.000000000 -0700
    7373***************
    7474*** 90,99 ****
    … …  
    120120      return     (1);
    121121    }
    122 diff -rc src/src/libscotch/arch_cmplt.h new5/src/libscotch/arch_cmplt.h
    123 *** src/src/libscotch/arch_cmplt.h      2008-05-22 06:44:41.000000000 -0700
    124 --- new5/src/libscotch/arch_cmplt.h     2010-07-21 17:13:15.588257154 -0700
     122diff -crB scotch_5.1/src/libscotch/arch_cmplt.h src/src/libscotch/arch_cmplt.h
     123*** scotch_5.1/src/libscotch/arch_cmplt.h       2008-05-22 06:44:41.000000000 -0700
     124--- src/src/libscotch/arch_cmplt.h      2013-05-06 14:14:11.000000000 -0700
    125125***************
    126126*** 87,93 ****
    … …  
    137137  #define archCmpltArchFree           NULL
    138138  ArchDomNum                  archCmpltDomNum     (const ArchCmplt * const, const ArchCmpltDom * const);
    139 diff -rc src/src/libscotch/arch_cmpltw.c new5/src/libscotch/arch_cmpltw.c
    140 *** src/src/libscotch/arch_cmpltw.c     2008-08-27 14:22:22.000000000 -0700
    141 --- new5/src/libscotch/arch_cmpltw.c    2010-07-21 17:13:15.590257168 -0700
     139diff -crB scotch_5.1/src/libscotch/arch_cmpltw.c src/src/libscotch/arch_cmpltw.c
     140*** scotch_5.1/src/libscotch/arch_cmpltw.c      2008-08-27 14:22:22.000000000 -0700
     141--- src/src/libscotch/arch_cmpltw.c     2013-05-06 14:14:12.000000000 -0700
    142142***************
    143143*** 200,211 ****
    … …  
    209209        return     (1);
    210210      }
    211 diff -rc src/src/libscotch/arch_cmpltw.h new5/src/libscotch/arch_cmpltw.h
    212 *** src/src/libscotch/arch_cmpltw.h     2008-05-22 06:44:41.000000000 -0700
    213 --- new5/src/libscotch/arch_cmpltw.h    2010-07-21 17:13:15.592257181 -0700
     211diff -crB scotch_5.1/src/libscotch/arch_cmpltw.h src/src/libscotch/arch_cmpltw.h
     212*** scotch_5.1/src/libscotch/arch_cmpltw.h      2008-05-22 06:44:41.000000000 -0700
     213--- src/src/libscotch/arch_cmpltw.h     2013-05-06 14:14:12.000000000 -0700
    214214***************
    215215*** 86,92 ****
    … …  
    226226  int                         archCmpltwArchFree  (ArchCmpltw * restrict const);
    227227  ArchDomNum                  archCmpltwDomNum    (const ArchCmpltw * const, const ArchCmpltwDom * const);
    228 diff -rc src/src/libscotch/arch_deco.c new5/src/libscotch/arch_deco.c
    229 *** src/src/libscotch/arch_deco.c       2008-09-28 06:35:27.000000000 -0700
    230 --- new5/src/libscotch/arch_deco.c      2010-07-21 17:13:15.595257202 -0700
     228diff -crB scotch_5.1/src/libscotch/arch_deco.c src/src/libscotch/arch_deco.c
     229*** scotch_5.1/src/libscotch/arch_deco.c        2008-09-28 06:35:27.000000000 -0700
     230--- src/src/libscotch/arch_deco.c       2013-05-06 14:14:12.000000000 -0700
    231231***************
    232232*** 211,217 ****
    … …  
    267267    if ((sizeof (ArchDeco)    > sizeof (ArchDummy)) ||
    268268        (sizeof (ArchDecoDom) > sizeof (ArchDomDummy))) {
    269 diff -rc src/src/libscotch/arch_deco.h new5/src/libscotch/arch_deco.h
    270 *** src/src/libscotch/arch_deco.h       2008-09-27 07:49:46.000000000 -0700
    271 --- new5/src/libscotch/arch_deco.h      2010-07-21 17:13:15.597257216 -0700
     269diff -crB scotch_5.1/src/libscotch/arch_deco.h src/src/libscotch/arch_deco.h
     270*** scotch_5.1/src/libscotch/arch_deco.h        2008-09-27 07:49:46.000000000 -0700
     271--- src/src/libscotch/arch_deco.h       2013-05-06 14:14:13.000000000 -0700
    272272***************
    273273*** 113,119 ****
    … …  
    284284  int                         archDecoArchFree    (ArchDeco * const);
    285285  Anum                        archDecoArchSize    (ArchDeco * const, const Anum);
    286 diff -rc src/src/libscotch/arch.h new5/src/libscotch/arch.h
    287 *** src/src/libscotch/arch.h    2009-04-28 08:11:27.000000000 -0700
    288 --- new5/src/libscotch/arch.h   2010-07-21 17:13:15.600257237 -0700
     286diff -crB scotch_5.1/src/libscotch/arch.h src/src/libscotch/arch.h
     287*** scotch_5.1/src/libscotch/arch.h     2009-04-28 08:11:27.000000000 -0700
     288--- src/src/libscotch/arch.h    2013-05-06 14:14:13.000000000 -0700
    289289***************
    290290*** 175,181 ****
    … …  
    301301  char *                      archName            (const Arch * const);
    302302  const ArchClass *           archClass           (const char * const);
    303 diff -rc src/src/libscotch/arch_hcub.c new5/src/libscotch/arch_hcub.c
    304 *** src/src/libscotch/arch_hcub.c       2008-05-22 06:44:41.000000000 -0700
    305 --- new5/src/libscotch/arch_hcub.c      2010-07-21 17:13:15.602257251 -0700
     303diff -crB scotch_5.1/src/libscotch/arch_hcub.c src/src/libscotch/arch_hcub.c
     304*** scotch_5.1/src/libscotch/arch_hcub.c        2008-05-22 06:44:41.000000000 -0700
     305--- src/src/libscotch/arch_hcub.c       2013-05-06 14:14:13.000000000 -0700
    306306***************
    307307*** 88,95 ****
    … …  
    310310  ArchHcub * restrict const   archptr,
    311311! FILE * restrict const       stream)
    312 ! {
     312  {
    313313  #ifdef SCOTCH_DEBUG_ARCH1
    314314    if ((sizeof (ArchHcub)    > sizeof (ArchDummy)) ||
    … …  
    325325! #endif /* NOFILEIO */
    326326!                                    )
    327 ! {
    328 ! #ifdef NOFILEIO
    329 ! //  printf("archHcubArchLoad - napar=%d,archpar=%p\n",napar,archpar);
    330 ! #endif /* NOFILEIO */
    331 !
     327  {
     328+ #ifdef NOFILEIO
     329+ //  printf("archHcubArchLoad - napar=%d,archpar=%p\n",napar,archpar);
     330+ #endif /* NOFILEIO */
     331+
    332332  #ifdef SCOTCH_DEBUG_ARCH1
    333333    if ((sizeof (ArchHcub)    > sizeof (ArchDummy)) ||
    … …  
    349349      errorPrint ("archHcubArchLoad: bad input");
    350350      return     (1);
    351 diff -rc src/src/libscotch/arch_hcub.h new5/src/libscotch/arch_hcub.h
    352 *** src/src/libscotch/arch_hcub.h       2008-05-22 06:44:41.000000000 -0700
    353 --- new5/src/libscotch/arch_hcub.h      2010-07-21 17:13:15.604257265 -0700
     351diff -crB scotch_5.1/src/libscotch/arch_hcub.h src/src/libscotch/arch_hcub.h
     352*** scotch_5.1/src/libscotch/arch_hcub.h        2008-05-22 06:44:41.000000000 -0700
     353--- src/src/libscotch/arch_hcub.h       2013-05-06 14:14:14.000000000 -0700
    354354***************
    355355*** 85,91 ****
    … …  
    366366  #define archHcubArchFree            NULL
    367367  ArchDomNum                  archHcubDomNum      (const ArchHcub * const, const ArchHcubDom * const);
    368 diff -rc src/src/libscotch/arch_mesh.c new5/src/libscotch/arch_mesh.c
    369 *** src/src/libscotch/arch_mesh.c       2008-05-22 06:44:41.000000000 -0700
    370 --- new5/src/libscotch/arch_mesh.c      2010-07-21 17:13:15.607257286 -0700
     368diff -crB scotch_5.1/src/libscotch/arch_mesh.c src/src/libscotch/arch_mesh.c
     369*** scotch_5.1/src/libscotch/arch_mesh.c        2008-05-22 06:44:41.000000000 -0700
     370--- src/src/libscotch/arch_mesh.c       2013-05-06 14:14:14.000000000 -0700
    371371***************
    372372*** 96,103 ****
    … …  
    465465      return     (1);
    466466    }
    467 diff -rc src/src/libscotch/arch_mesh.h new5/src/libscotch/arch_mesh.h
    468 *** src/src/libscotch/arch_mesh.h       2008-05-22 06:44:41.000000000 -0700
    469 --- new5/src/libscotch/arch_mesh.h      2010-07-21 17:13:15.610257307 -0700
     467diff -crB scotch_5.1/src/libscotch/arch_mesh.h src/src/libscotch/arch_mesh.h
     468*** scotch_5.1/src/libscotch/arch_mesh.h        2008-05-22 06:44:41.000000000 -0700
     469--- src/src/libscotch/arch_mesh.h       2013-05-06 14:14:14.000000000 -0700
    470470***************
    471471*** 96,102 ****
    … …  
    496496  #define archMesh3ArchFree           NULL
    497497  ArchDomNum                  archMesh3DomNum     (const ArchMesh3 * const, const ArchMesh3Dom * const);
    498 diff -rc src/src/libscotch/arch_tleaf.c new5/src/libscotch/arch_tleaf.c
    499 *** src/src/libscotch/arch_tleaf.c      2008-05-22 06:44:41.000000000 -0700
    500 --- new5/src/libscotch/arch_tleaf.c     2010-07-21 17:13:15.612257320 -0700
     498diff -crB scotch_5.1/src/libscotch/arch_tleaf.c src/src/libscotch/arch_tleaf.c
     499*** scotch_5.1/src/libscotch/arch_tleaf.c       2008-05-22 06:44:41.000000000 -0700
     500--- src/src/libscotch/arch_tleaf.c      2013-05-06 14:14:14.000000000 -0700
    501501***************
    502502*** 92,99 ****
    … …  
    505505  ArchTleaf * restrict const  archptr,
    506506! FILE * restrict const       stream)
    507 ! {
     507  {
    508508  #ifdef SCOTCH_DEBUG_ARCH1
    509509    if ((sizeof (ArchTleaf)    > sizeof (ArchDummy)) ||
    … …  
    520520! #endif /* NOFILEIO */
    521521!                                    )
    522 ! {
    523 ! #ifdef NOFILEIO
    524 ! //  printf("archTleafArchLoad - napar=%d,archpar=%p\n",napar,archpar);
    525 ! #endif /* NOFILEIO */
    526 !
     522  {
     523+ #ifdef NOFILEIO
     524+ //  printf("archTleafArchLoad - napar=%d,archpar=%p\n",napar,archpar);
     525+ #endif /* NOFILEIO */
     526+
    527527  #ifdef SCOTCH_DEBUG_ARCH1
    528528    if ((sizeof (ArchTleaf)    > sizeof (ArchDummy)) ||
    … …  
    554554      return     (1);
    555555    }
    556 diff -rc src/src/libscotch/arch_tleaf.h new5/src/libscotch/arch_tleaf.h
    557 *** src/src/libscotch/arch_tleaf.h      2008-05-22 06:44:41.000000000 -0700
    558 --- new5/src/libscotch/arch_tleaf.h     2010-07-21 17:13:15.615257341 -0700
     556diff -crB scotch_5.1/src/libscotch/arch_tleaf.h src/src/libscotch/arch_tleaf.h
     557*** scotch_5.1/src/libscotch/arch_tleaf.h       2008-05-22 06:44:41.000000000 -0700
     558--- src/src/libscotch/arch_tleaf.h      2013-05-06 14:14:15.000000000 -0700
    559559***************
    560560*** 89,95 ****
    … …  
    571571  #define archTleafArchFree           NULL
    572572  ArchDomNum                  archTleafDomNum     (const ArchTleaf * const, const ArchTleafDom * const);
    573 diff -rc src/src/libscotch/arch_torus.c new5/src/libscotch/arch_torus.c
    574 *** src/src/libscotch/arch_torus.c      2008-05-22 06:44:41.000000000 -0700
    575 --- new5/src/libscotch/arch_torus.c     2010-07-21 17:13:15.618257362 -0700
     573diff -crB scotch_5.1/src/libscotch/arch_torus.c src/src/libscotch/arch_torus.c
     574*** scotch_5.1/src/libscotch/arch_torus.c       2008-05-22 06:44:41.000000000 -0700
     575--- src/src/libscotch/arch_torus.c      2013-05-06 14:14:15.000000000 -0700
    576576***************
    577577*** 90,97 ****
    … …  
    670670      return     (1);
    671671    }
    672 diff -rc src/src/libscotch/arch_torus.h new5/src/libscotch/arch_torus.h
    673 *** src/src/libscotch/arch_torus.h      2008-05-22 06:44:41.000000000 -0700
    674 --- new5/src/libscotch/arch_torus.h     2010-07-21 17:13:15.620257376 -0700
     672diff -crB scotch_5.1/src/libscotch/arch_torus.h src/src/libscotch/arch_torus.h
     673*** scotch_5.1/src/libscotch/arch_torus.h       2008-05-22 06:44:41.000000000 -0700
     674--- src/src/libscotch/arch_torus.h      2013-05-06 14:14:15.000000000 -0700
    675675***************
    676676*** 96,102 ****
    … …  
    701701  #define archTorus3ArchFree          NULL
    702702  ArchDomNum                  archTorus3DomNum    (const ArchTorus3 * const, const ArchTorus3Dom * const);
    703 diff -rc src/src/libscotch/common.c new5/src/libscotch/common.c
    704 *** src/src/libscotch/common.c  2008-05-22 06:44:41.000000000 -0700
    705 --- new5/src/libscotch/common.c 2010-07-21 17:13:15.622257390 -0700
     703diff -crB scotch_5.1/src/libscotch/common.c src/src/libscotch/common.c
     704*** scotch_5.1/src/libscotch/common.c   2008-05-22 06:44:41.000000000 -0700
     705--- src/src/libscotch/common.c  2013-05-06 14:14:15.000000000 -0700
    706706***************
    707707*** 100,106 ****
    … …  
    720720+ #endif /* MATLAB */
    721721  }
    722 diff -rc src/src/libscotch/common.h new5/src/libscotch/common.h
    723 *** src/src/libscotch/common.h  2009-02-06 14:20:55.000000000 -0800
    724 --- new5/src/libscotch/common.h 2010-07-21 17:15:06.061025001 -0700
     722diff -crB scotch_5.1/src/libscotch/common.h src/src/libscotch/common.h
     723*** scotch_5.1/src/libscotch/common.h   2009-02-06 14:20:55.000000000 -0800
     724--- src/src/libscotch/common.h  2013-05-09 11:49:35.317220518 -0700
    725725***************
    726726*** 1,3 ****
    … …  
    752752 
    753753--- 109,114 ----
     754***************
     755*** 171,179 ****
     756  /** The file structure. **/
     757 
     758  typedef struct File_ {
     759!   char *                    name;                 /*+ File name    +*/
     760    FILE *                    pntr;                 /*+ File pointer +*/
     761!   char *                    mode;                 /*+ Opening mode +*/
     762  } File;
     763 
     764  /*
     765--- 172,180 ----
     766  /** The file structure. **/
     767 
     768  typedef struct File_ {
     769!   const char *              name;                 /*+ File name    +*/
     770    FILE *                    pntr;                 /*+ File pointer +*/
     771!   const char *              mode;                 /*+ Opening mode +*/
     772  } File;
     773 
     774  /*
    754775***************
    755776*** 190,216 ****
    … …  
    837858+
    838859+ #endif //#ifndef _SCOTCH_COMMON_H_
    839 diff -rc src/src/libscotch/common_integer.c new5/src/libscotch/common_integer.c
    840 *** src/src/libscotch/common_integer.c  2009-01-21 01:32:32.000000000 -0800
    841 --- new5/src/libscotch/common_integer.c 2010-07-21 17:13:15.628257432 -0700
     860diff -crB scotch_5.1/src/libscotch/common_integer.c src/src/libscotch/common_integer.c
     861*** scotch_5.1/src/libscotch/common_integer.c   2009-01-21 01:32:32.000000000 -0800
     862--- src/src/libscotch/common_integer.c  2013-05-06 14:14:16.000000000 -0700
    842863***************
    843864*** 191,196 ****
    … …  
    910931 
    911932  /*********************/
    912 diff -rc src/src/libscotch/common_memory.c new5/src/libscotch/common_memory.c
    913 *** src/src/libscotch/common_memory.c   2009-01-03 02:16:11.000000000 -0800
    914 --- new5/src/libscotch/common_memory.c  2010-07-21 17:13:15.630257445 -0700
     933diff -crB scotch_5.1/src/libscotch/common_memory.c src/src/libscotch/common_memory.c
     934*** scotch_5.1/src/libscotch/common_memory.c    2009-01-03 02:16:11.000000000 -0800
     935--- src/src/libscotch/common_memory.c   2013-05-06 14:14:16.000000000 -0700
    915936***************
    916937*** 87,93 ****
    … …  
    10181039  }
    10191040  #endif /* COMMON_MEMORY_TRACE */
    1020 diff -rc src/src/libscotch/dummysizes.c new5/src/libscotch/dummysizes.c
    1021 *** src/src/libscotch/dummysizes.c      2009-05-09 16:08:02.000000000 -0700
    1022 --- new5/src/libscotch/dummysizes.c     2010-07-21 17:13:15.633257466 -0700
     1041diff -crB scotch_5.1/src/libscotch/dummysizes.c src/src/libscotch/dummysizes.c
     1042*** scotch_5.1/src/libscotch/dummysizes.c       2009-05-09 16:08:02.000000000 -0700
     1043--- src/src/libscotch/dummysizes.c      2013-05-06 14:14:16.000000000 -0700
    10231044***************
    10241045*** 267,271 ****
    … …  
    10311052+ #endif /* MATLAB */
    10321053  }
    1033 diff -rc src/src/libscotch/graph.c new5/src/libscotch/graph.c
    1034 *** src/src/libscotch/graph.c   2008-05-22 06:44:42.000000000 -0700
    1035 --- new5/src/libscotch/graph.c  2010-07-21 17:13:15.635257480 -0700
     1054diff -crB scotch_5.1/src/libscotch/graph.c src/src/libscotch/graph.c
     1055*** scotch_5.1/src/libscotch/graph.c    2008-05-22 06:44:42.000000000 -0700
     1056--- src/src/libscotch/graph.c   2013-05-06 14:14:17.000000000 -0700
    10361057***************
    10371058*** 135,141 ****
    … …  
    10541075      if ((grafptr->edlotax != NULL) &&
    10551076          ((grafptr->flagval & GRAPHEDGEGROUP) == 0))
    1056 diff -rc src/src/libscotch/graph.h new5/src/libscotch/graph.h
    1057 *** src/src/libscotch/graph.h   2008-06-01 02:49:11.000000000 -0700
    1058 --- new5/src/libscotch/graph.h  2010-07-21 17:13:15.637257494 -0700
     1077diff -crB scotch_5.1/src/libscotch/graph.h src/src/libscotch/graph.h
     1078*** scotch_5.1/src/libscotch/graph.h    2008-06-01 02:49:11.000000000 -0700
     1079--- src/src/libscotch/graph.h   2013-05-06 14:14:17.000000000 -0700
    10591080***************
    10601081*** 159,165 ****
    … …  
    10711092  int                         graphSave           (const Graph * const, FILE * const);
    10721093  Gnum                        graphBase           (Graph * const, const Gnum);
    1073 diff -rc src/src/libscotch/graph_io.c new5/src/libscotch/graph_io.c
    1074 *** src/src/libscotch/graph_io.c        2008-05-22 06:44:42.000000000 -0700
    1075 --- new5/src/libscotch/graph_io.c       2010-07-21 17:13:15.639257508 -0700
     1094diff -crB scotch_5.1/src/libscotch/graph_io.c src/src/libscotch/graph_io.c
     1095*** scotch_5.1/src/libscotch/graph_io.c 2008-05-22 06:44:42.000000000 -0700
     1096--- src/src/libscotch/graph_io.c        2013-05-06 14:14:17.000000000 -0700
    10761097***************
    10771098*** 86,92 ****
    … …  
    13091330    }
    13101331 
    1311 diff -rc src/src/libscotch/graph_io_scot.c new5/src/libscotch/graph_io_scot.c
    1312 *** src/src/libscotch/graph_io_scot.c   2008-05-22 06:44:42.000000000 -0700
    1313 --- new5/src/libscotch/graph_io_scot.c  2010-07-21 17:13:15.641257522 -0700
     1332diff -crB scotch_5.1/src/libscotch/graph_io_scot.c src/src/libscotch/graph_io_scot.c
     1333*** scotch_5.1/src/libscotch/graph_io_scot.c    2008-05-22 06:44:42.000000000 -0700
     1334--- src/src/libscotch/graph_io_scot.c   2013-05-06 14:14:17.000000000 -0700
    13141335***************
    13151336*** 89,95 ****
    … …  
    13261347    }
    13271348 
    1328 diff -rc src/src/libscotch/library_arch.c new5/src/libscotch/library_arch.c
    1329 *** src/src/libscotch/library_arch.c    2008-05-22 06:44:42.000000000 -0700
    1330 --- new5/src/libscotch/library_arch.c   2010-07-21 17:13:15.643257536 -0700
     1349diff -crB scotch_5.1/src/libscotch/library_arch.c src/src/libscotch/library_arch.c
     1350*** scotch_5.1/src/libscotch/library_arch.c     2008-05-22 06:44:42.000000000 -0700
     1351--- src/src/libscotch/library_arch.c    2013-05-06 14:14:17.000000000 -0700
    13311352***************
    13321353*** 120,128 ****
    … …  
    13611382 
    13621383  /*+ This routine saves the given opaque
    1363 diff -rc src/src/libscotch/library_arch_f.c new5/src/libscotch/library_arch_f.c
    1364 *** src/src/libscotch/library_arch_f.c  2008-05-22 06:44:42.000000000 -0700
    1365 --- new5/src/libscotch/library_arch_f.c 2010-07-21 17:13:15.645257550 -0700
     1384diff -crB scotch_5.1/src/libscotch/library_arch_f.c src/src/libscotch/library_arch_f.c
     1385*** scotch_5.1/src/libscotch/library_arch_f.c   2008-05-22 06:44:42.000000000 -0700
     1386--- src/src/libscotch/library_arch_f.c  2013-05-06 14:14:18.000000000 -0700
    13661387***************
    13671388*** 121,127 ****
    … …  
    13781399    fclose (stream);                                /* This closes filenum too */
    13791400 
    1380 diff -rc src/src/libscotch/library_error_exit.c new5/src/libscotch/library_error_exit.c
    1381 *** src/src/libscotch/library_error_exit.c      2009-01-20 00:36:33.000000000 -0800
    1382 --- new5/src/libscotch/library_error_exit.c     2010-07-21 17:13:15.648257570 -0700
     1401diff -crB scotch_5.1/src/libscotch/library_error_exit.c src/src/libscotch/library_error_exit.c
     1402*** scotch_5.1/src/libscotch/library_error_exit.c       2009-01-20 00:36:33.000000000 -0800
     1403--- src/src/libscotch/library_error_exit.c      2013-05-06 14:14:18.000000000 -0700
    13831404***************
    13841405*** 114,119 ****
    … …  
    14531474+ #endif /* MATLAB */
    14541475  }
    1455 diff -rc src/src/libscotch/library_graph.c new5/src/libscotch/library_graph.c
    1456 *** src/src/libscotch/library_graph.c   2008-05-22 07:28:12.000000000 -0700
    1457 --- new5/src/libscotch/library_graph.c  2010-07-21 17:13:15.650257584 -0700
     1476diff -crB scotch_5.1/src/libscotch/library_graph.c src/src/libscotch/library_graph.c
     1477*** scotch_5.1/src/libscotch/library_graph.c    2008-05-22 07:28:12.000000000 -0700
     1478--- src/src/libscotch/library_graph.c   2013-05-06 14:14:18.000000000 -0700
    14581479***************
    14591480*** 137,143 ****
    … …  
    14981519 
    14991520  /*+ This routine saves the contents of the given
    1500 diff -rc src/src/libscotch/library_graph_f.c new5/src/libscotch/library_graph_f.c
    1501 *** src/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700
    1502 --- new5/src/libscotch/library_graph_f.c        2010-07-21 17:13:15.652257598 -0700
     1521diff -crB scotch_5.1/src/libscotch/library_graph_f.c src/src/libscotch/library_graph_f.c
     1522*** scotch_5.1/src/libscotch/library_graph_f.c  2008-05-22 06:44:43.000000000 -0700
     1523--- src/src/libscotch/library_graph_f.c 2013-05-06 14:14:18.000000000 -0700
    15031524***************
    15041525*** 136,142 ****
    … …  
    15151536    fclose (stream);                                /* This closes filenum too */
    15161537 
    1517 diff -rc src/src/libscotch/library_graph_map.c new5/src/libscotch/library_graph_map.c
    1518 *** src/src/libscotch/library_graph_map.c       2008-09-28 04:04:05.000000000 -0700
    1519 --- new5/src/libscotch/library_graph_map.c      2010-07-21 17:13:15.654257612 -0700
     1538diff -crB scotch_5.1/src/libscotch/library_graph_map.c src/src/libscotch/library_graph_map.c
     1539*** scotch_5.1/src/libscotch/library_graph_map.c        2008-09-28 04:04:05.000000000 -0700
     1540--- src/src/libscotch/library_graph_map.c       2013-05-06 14:14:19.000000000 -0700
    15201541***************
    15211542*** 182,192 ****
    … …  
    15401561 
    15411562  /*+ This routine computes a mapping
    1542 diff -rc src/src/libscotch/library_graph_map_f.c new5/src/libscotch/library_graph_map_f.c
    1543 *** src/src/libscotch/library_graph_map_f.c     2008-06-28 03:44:26.000000000 -0700
    1544 --- new5/src/libscotch/library_graph_map_f.c    2010-07-21 17:13:15.656257626 -0700
     1563diff -crB scotch_5.1/src/libscotch/library_graph_map_f.c src/src/libscotch/library_graph_map_f.c
     1564*** scotch_5.1/src/libscotch/library_graph_map_f.c      2008-06-28 03:44:26.000000000 -0700
     1565--- src/src/libscotch/library_graph_map_f.c     2013-05-06 14:14:19.000000000 -0700
    15451566***************
    15461567*** 183,189 ****
    … …  
    15571578    fclose (stream);                                /* This closes filenum too */
    15581579 
    1559 diff -rc src/src/libscotch/library.h new5/src/libscotch/library.h
    1560 *** src/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700
    1561 --- new5/src/libscotch/library.h        2010-07-21 17:13:15.660257654 -0700
     1580diff -crB scotch_5.1/src/libscotch/library.h src/src/libscotch/library.h
     1581*** scotch_5.1/src/libscotch/library.h  2009-05-09 16:08:03.000000000 -0700
     1582--- src/src/libscotch/library.h 2013-05-06 14:14:19.000000000 -0700
    15621583***************
    15631584*** 1,3 ****
    … …  
    16181639+
    16191640+ #endif //#ifndef _SCOTCH_H_
    1620 diff -rc src/src/libscotch/Makefile new5/src/libscotch/Makefile
    1621 *** src/src/libscotch/Makefile  2009-05-09 16:08:04.000000000 -0700
    1622 --- new5/src/libscotch/Makefile 2010-07-21 17:13:15.665257689 -0700
     1641diff -crB scotch_5.1/src/libscotch/Makefile src/src/libscotch/Makefile
     1642*** scotch_5.1/src/libscotch/Makefile   2009-05-09 16:08:04.000000000 -0700
     1643--- src/src/libscotch/Makefile  2013-05-06 14:14:19.000000000 -0700
    16231644***************
    16241645*** 49,55 ****
    … …  
    20372058+                                       $(AR) $(ARFLAGS) $(@) $(?)
    20382059+                                       -$(RANLIB) $(@)
    2039 diff -rc src/src/libscotch/mapping.h new5/src/libscotch/mapping.h
    2040 *** src/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700
    2041 --- new5/src/libscotch/mapping.h        2010-07-21 17:13:15.667257702 -0700
     2060diff -crB scotch_5.1/src/libscotch/mapping.h src/src/libscotch/mapping.h
     2061*** scotch_5.1/src/libscotch/mapping.h  2008-10-27 08:27:47.000000000 -0700
     2062--- src/src/libscotch/mapping.h 2013-05-06 14:14:20.000000000 -0700
    20422063***************
    20432064*** 106,112 ****
    … …  
    20542075 
    20552076  #undef static
    2056 diff -rc src/src/libscotch/mapping_io.c new5/src/libscotch/mapping_io.c
    2057 *** src/src/libscotch/mapping_io.c      2008-05-22 06:44:43.000000000 -0700
    2058 --- new5/src/libscotch/mapping_io.c     2010-07-21 17:13:15.670257723 -0700
     2077diff -crB scotch_5.1/src/libscotch/mapping_io.c src/src/libscotch/mapping_io.c
     2078*** scotch_5.1/src/libscotch/mapping_io.c       2008-05-22 06:44:43.000000000 -0700
     2079--- src/src/libscotch/mapping_io.c      2013-05-06 14:14:20.000000000 -0700
    20592080***************
    20602081*** 199,204 ****
    … …  
    21432164    return (0);
    21442165  }
    2145 diff -rc src/src/libscotch/mesh_io_scot.c new5/src/libscotch/mesh_io_scot.c
    2146 *** src/src/libscotch/mesh_io_scot.c    2008-05-22 06:44:43.000000000 -0700
    2147 --- new5/src/libscotch/mesh_io_scot.c   2010-07-21 17:13:15.672257737 -0700
     2166diff -crB scotch_5.1/src/libscotch/mesh_io_scot.c src/src/libscotch/mesh_io_scot.c
     2167*** scotch_5.1/src/libscotch/mesh_io_scot.c     2008-05-22 06:44:43.000000000 -0700
     2168--- src/src/libscotch/mesh_io_scot.c    2013-05-06 14:14:20.000000000 -0700
    21482169***************
    21492170*** 85,91 ****
    … …  
    21602181    }
    21612182 
    2162 diff -rc src/src/libscotch/module.h new5/src/libscotch/module.h
    2163 *** src/src/libscotch/module.h  2009-04-26 23:07:14.000000000 -0700
    2164 --- new5/src/libscotch/module.h 2010-07-21 17:13:15.675257758 -0700
     2183diff -crB scotch_5.1/src/libscotch/module.h src/src/libscotch/module.h
     2184*** scotch_5.1/src/libscotch/module.h   2009-04-26 23:07:14.000000000 -0700
     2185--- src/src/libscotch/module.h  2013-05-06 14:14:20.000000000 -0700
    21652186***************
    21662187*** 1,3 ****
    … …  
    22012222+
    22022223+ #endif //#ifndef _SCOTCH_MODULE_H_
    2203 diff -rc src/src/libscotch/parser_ll.l new5/src/libscotch/parser_ll.l
    2204 *** src/src/libscotch/parser_ll.l       2008-05-22 06:44:43.000000000 -0700
    2205 --- new5/src/libscotch/parser_ll.l      2010-07-21 17:13:15.677257772 -0700
     2224diff -crB scotch_5.1/src/libscotch/parser_ll.l src/src/libscotch/parser_ll.l
     2225*** scotch_5.1/src/libscotch/parser_ll.l        2008-05-22 06:44:43.000000000 -0700
     2226--- src/src/libscotch/parser_ll.l       2013-05-06 14:14:21.000000000 -0700
    22062227***************
    22072228*** 192,197 ****
    … …  
    22302251    yyrestart (yyin);                               /* (Re-)initialize the parser */
    22312252  #endif /* FLEX_SCANNER */
    2232 diff -rc src/src/libscotch/parser_yy.y new5/src/libscotch/parser_yy.y
    2233 *** src/src/libscotch/parser_yy.y       2008-10-22 15:12:48.000000000 -0700
    2234 --- new5/src/libscotch/parser_yy.y      2010-07-21 17:13:15.679257786 -0700
     2253diff -crB scotch_5.1/src/libscotch/parser_yy.y src/src/libscotch/parser_yy.y
     2254*** scotch_5.1/src/libscotch/parser_yy.y        2008-10-22 15:12:48.000000000 -0700
     2255--- src/src/libscotch/parser_yy.y       2013-05-06 14:14:21.000000000 -0700
    22352256***************
    22362257*** 774,779 ****
    … …  
    22432264    if (stratParserParse2 () != 0) {                /* Parse the strategy string */
    22442265      if (parserstratcurr != NULL)
    2245 diff -rc src/src/libscotch/vgraph_separate_vw.c new5/src/libscotch/vgraph_separate_vw.c
    2246 *** src/src/libscotch/vgraph_separate_vw.c      2008-05-22 06:44:43.000000000 -0700
    2247 --- new5/src/libscotch/vgraph_separate_vw.c     2010-07-21 17:13:15.682257807 -0700
     2266diff -crB scotch_5.1/src/libscotch/vgraph_separate_vw.c src/src/libscotch/vgraph_separate_vw.c
     2267*** scotch_5.1/src/libscotch/vgraph_separate_vw.c       2008-05-22 06:44:43.000000000 -0700
     2268--- src/src/libscotch/vgraph_separate_vw.c      2013-05-06 14:14:21.000000000 -0700
    22482269***************
    22492270*** 83,88 ****
    … …  
    22652286    return (0);
    22662287  }
    2267 diff -rc src/src/Makefile new5/src/Makefile
    2268 *** src/src/Makefile    2008-09-15 05:50:51.000000000 -0700
    2269 --- new5/src/Makefile   2010-07-21 17:13:15.684257821 -0700
     2288diff -crB scotch_5.1/src/Makefile src/src/Makefile
     2289*** scotch_5.1/src/Makefile     2008-09-15 05:50:51.000000000 -0700
     2290--- src/src/Makefile    2013-05-06 14:14:21.000000000 -0700
    22702291***************
    22712292*** 97,102 ****
    … …  
    22842305                                        -$(CP) -f ../bin/[agm]*$(EXE) $(bindir)
    22852306                                        -$(CP) -f ../include/*scotch*.h $(includedir)
    2286 Only in new5/src: Makefile.inc
    2287 diff -rc src/src/scotch/gmap.h new5/src/scotch/gmap.h
    2288 *** src/src/scotch/gmap.h       2008-06-18 11:05:17.000000000 -0700
    2289 --- new5/src/scotch/gmap.h      2010-07-21 17:13:15.686257834 -0700
     2307Only in src/src: Makefile.inc
     2308diff -crB scotch_5.1/src/scotch/gmap.h src/src/scotch/gmap.h
     2309*** scotch_5.1/src/scotch/gmap.h        2008-06-18 11:05:17.000000000 -0700
     2310--- src/src/scotch/gmap.h       2013-05-06 14:14:22.000000000 -0700
    22902311***************
    22912312*** 1,3 ****
    … …  
    23042325+
    23052326+ #endif //#ifndef _SCOTCH_GMAP_H_
    2306 Only in new5/src/scotch: gmap_mex.c
    2307 Only in new5/src/scotch: gmapx.c
    2308 diff -rc src/src/scotch/Makefile new5/src/scotch/Makefile
    2309 *** src/src/scotch/Makefile     2009-04-27 02:19:43.000000000 -0700
    2310 --- new5/src/scotch/Makefile    2010-07-21 17:13:15.689257855 -0700
     2327Only in src/src/scotch: gmap_mex.c
     2328Only in src/src/scotch: gmapx.c
     2329diff -crB scotch_5.1/src/scotch/Makefile src/src/scotch/Makefile
     2330*** scotch_5.1/src/scotch/Makefile      2009-04-27 02:19:43.000000000 -0700
     2331--- src/src/scotch/Makefile     2013-05-06 14:14:22.000000000 -0700
    23112332***************
    23122333*** 49,59 ****
Note: See TracChangeset for help on using the changeset viewer.