Changeset 4655


Ignore:
Timestamp:
07/19/10 12:33:30 (15 years ago)
Author:
Eric.Larour
Message:

some minor corrections

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/externalpackages/scotch/scotch.patch

    r4653 r4655  
    33Only in src: lib
    44diff -rc src/src/libscotch/arch.c old/src/libscotch/arch.c
    5 *** src/src/libscotch/arch.c    2010-07-19 11:51:37.187617636 -0700
     5*** src/src/libscotch/arch.c    2010-07-19 12:08:20.485684277 -0700
    66--- old/src/libscotch/arch.c    2008-09-27 07:48:01.000000000 -0700
    77***************
     
    6969--- 190,196 ----
    7070diff -rc src/src/libscotch/arch_cmplt.c old/src/libscotch/arch_cmplt.c
    71 *** src/src/libscotch/arch_cmplt.c      2010-07-19 11:51:37.190617657 -0700
     71*** src/src/libscotch/arch_cmplt.c      2010-07-19 12:08:20.488684298 -0700
    7272--- old/src/libscotch/arch_cmplt.c      2008-05-22 06:44:41.000000000 -0700
    7373***************
     
    121121--- 102,109 ----
    122122diff -rc src/src/libscotch/arch_cmplt.h old/src/libscotch/arch_cmplt.h
    123 *** src/src/libscotch/arch_cmplt.h      2010-07-19 11:51:37.193617678 -0700
     123*** src/src/libscotch/arch_cmplt.h      2010-07-19 12:08:20.490684312 -0700
    124124--- old/src/libscotch/arch_cmplt.h      2008-05-22 06:44:41.000000000 -0700
    125125***************
     
    138138--- 87,93 ----
    139139diff -rc src/src/libscotch/arch_cmpltw.c old/src/libscotch/arch_cmpltw.c
    140 *** src/src/libscotch/arch_cmpltw.c     2010-07-19 11:51:37.195617692 -0700
     140*** src/src/libscotch/arch_cmpltw.c     2010-07-19 12:08:20.493684332 -0700
    141141--- old/src/libscotch/arch_cmpltw.c     2008-08-27 14:22:22.000000000 -0700
    142142***************
     
    210210--- 230,237 ----
    211211diff -rc src/src/libscotch/arch_cmpltw.h old/src/libscotch/arch_cmpltw.h
    212 *** src/src/libscotch/arch_cmpltw.h     2010-07-19 11:51:37.198617713 -0700
     212*** src/src/libscotch/arch_cmpltw.h     2010-07-19 12:08:20.496684353 -0700
    213213--- old/src/libscotch/arch_cmpltw.h     2008-05-22 06:44:41.000000000 -0700
    214214***************
     
    227227--- 86,92 ----
    228228diff -rc src/src/libscotch/arch_deco.c old/src/libscotch/arch_deco.c
    229 *** src/src/libscotch/arch_deco.c       2010-07-19 11:51:37.201617734 -0700
     229*** src/src/libscotch/arch_deco.c       2010-07-19 12:08:20.498684367 -0700
    230230--- old/src/libscotch/arch_deco.c       2008-09-28 06:35:27.000000000 -0700
    231231***************
     
    268268--- 220,225 ----
    269269diff -rc src/src/libscotch/arch_deco.h old/src/libscotch/arch_deco.h
    270 *** src/src/libscotch/arch_deco.h       2010-07-19 11:51:37.204617756 -0700
     270*** src/src/libscotch/arch_deco.h       2010-07-19 12:08:20.501684388 -0700
    271271--- old/src/libscotch/arch_deco.h       2008-09-27 07:49:46.000000000 -0700
    272272***************
     
    285285--- 113,119 ----
    286286diff -rc src/src/libscotch/arch.h old/src/libscotch/arch.h
    287 *** src/src/libscotch/arch.h    2010-07-19 11:51:37.206617770 -0700
     287*** src/src/libscotch/arch.h    2010-07-19 12:08:20.503684402 -0700
    288288--- old/src/libscotch/arch.h    2009-04-28 08:11:27.000000000 -0700
    289289***************
     
    302302--- 175,181 ----
    303303diff -rc src/src/libscotch/arch_hcub.c old/src/libscotch/arch_hcub.c
    304 *** src/src/libscotch/arch_hcub.c       2010-07-19 11:51:37.209617791 -0700
     304*** src/src/libscotch/arch_hcub.c       2010-07-19 12:08:20.506684423 -0700
    305305--- old/src/libscotch/arch_hcub.c       2008-05-22 06:44:41.000000000 -0700
    306306***************
     
    350350--- 98,105 ----
    351351diff -rc src/src/libscotch/arch_hcub.h old/src/libscotch/arch_hcub.h
    352 *** src/src/libscotch/arch_hcub.h       2010-07-19 11:51:37.212617812 -0700
     352*** src/src/libscotch/arch_hcub.h       2010-07-19 12:08:20.508684437 -0700
    353353--- old/src/libscotch/arch_hcub.h       2008-05-22 06:44:41.000000000 -0700
    354354***************
     
    367367--- 85,91 ----
    368368diff -rc src/src/libscotch/arch_mesh.c old/src/libscotch/arch_mesh.c
    369 *** src/src/libscotch/arch_mesh.c       2010-07-19 11:51:37.215617833 -0700
     369*** src/src/libscotch/arch_mesh.c       2010-07-19 12:08:20.511684458 -0700
    370370--- old/src/libscotch/arch_mesh.c       2008-05-22 06:44:41.000000000 -0700
    371371***************
     
    466466--- 431,440 ----
    467467diff -rc src/src/libscotch/arch_mesh.h old/src/libscotch/arch_mesh.h
    468 *** src/src/libscotch/arch_mesh.h       2010-07-19 11:51:37.217617847 -0700
     468*** src/src/libscotch/arch_mesh.h       2010-07-19 12:08:20.514684479 -0700
    469469--- old/src/libscotch/arch_mesh.h       2008-05-22 06:44:41.000000000 -0700
    470470***************
     
    497497--- 114,120 ----
    498498diff -rc src/src/libscotch/arch_tleaf.c old/src/libscotch/arch_tleaf.c
    499 *** src/src/libscotch/arch_tleaf.c      2010-07-19 11:51:37.220617868 -0700
     499*** src/src/libscotch/arch_tleaf.c      2010-07-19 12:08:20.517684499 -0700
    500500--- old/src/libscotch/arch_tleaf.c      2008-05-22 06:44:41.000000000 -0700
    501501***************
     
    555555--- 109,114 ----
    556556diff -rc src/src/libscotch/arch_tleaf.h old/src/libscotch/arch_tleaf.h
    557 *** src/src/libscotch/arch_tleaf.h      2010-07-19 11:51:37.223617890 -0700
     557*** src/src/libscotch/arch_tleaf.h      2010-07-19 12:08:20.519684513 -0700
    558558--- old/src/libscotch/arch_tleaf.h      2008-05-22 06:44:41.000000000 -0700
    559559***************
     
    572572--- 89,95 ----
    573573diff -rc src/src/libscotch/arch_torus.c old/src/libscotch/arch_torus.c
    574 *** src/src/libscotch/arch_torus.c      2010-07-19 11:51:37.226617911 -0700
     574*** src/src/libscotch/arch_torus.c      2010-07-19 12:08:20.522684534 -0700
    575575--- old/src/libscotch/arch_torus.c      2008-05-22 06:44:41.000000000 -0700
    576576***************
     
    671671--- 373,382 ----
    672672diff -rc src/src/libscotch/arch_torus.h old/src/libscotch/arch_torus.h
    673 *** src/src/libscotch/arch_torus.h      2010-07-19 11:51:37.228617925 -0700
     673*** src/src/libscotch/arch_torus.h      2010-07-19 12:08:20.524684548 -0700
    674674--- old/src/libscotch/arch_torus.h      2008-05-22 06:44:41.000000000 -0700
    675675***************
     
    702702--- 114,120 ----
    703703diff -rc src/src/libscotch/common.c old/src/libscotch/common.c
    704 *** src/src/libscotch/common.c  2010-07-19 11:51:37.231617946 -0700
     704*** src/src/libscotch/common.c  2010-07-19 12:08:20.527684569 -0700
    705705--- old/src/libscotch/common.c  2008-05-22 06:44:41.000000000 -0700
    706706***************
     
    721721--- 100,106 ----
    722722diff -rc src/src/libscotch/common.h old/src/libscotch/common.h
    723 *** src/src/libscotch/common.h  2010-07-19 11:51:37.233617960 -0700
     723*** src/src/libscotch/common.h  2010-07-19 12:08:20.529684583 -0700
    724724--- old/src/libscotch/common.h  2009-02-06 14:20:55.000000000 -0800
    725725***************
     
    732732--- 1,3 ----
    733733***************
    734 *** 251,255 ****
     734*** 81,87 ****
     735  #include            <sys/resource.h>
     736  #endif /* COMMON_TIMING_OLD */
     737  #include            <unistd.h>
     738- #include            <sys/param.h>
     739 
     740  #ifdef SCOTCH_PTSCOTCH
     741  #include            <mpi.h>
     742--- 79,84 ----
     743***************
     744*** 109,114 ****
     745--- 106,113 ----
     746  #define memCpy(dst,src,siz)         memcpy((dst),(src),(siz))
     747  #define memMov(dst,src,siz)         memmove((dst),(src),(siz))
     748 
     749+ #define MIN(x,y)                    (((x) < (y)) ? (x) : (y))
     750+ #define MAX(x,y)                    (((x) < (y)) ? (y) : (x))
     751  #define ABS(x)                      MAX ((x), -(x))
     752  #define SIGN(x)                     (((x) < 0) ? -1 : 1)
     753 
     754***************
     755*** 202,219 ****
     756  int                         fileUncompressType  (const char * const);
     757  int                         fileNameDistExpand  (char ** const, const int, const int, const int);
     758 
     759- #ifdef __cplusplus
     760- extern "C" {
     761- #endif /* __cplusplus */
     762-
     763  void                        errorProg           (const char * const);
     764  void                        errorPrint          (const char * const, ...);
     765  void                        errorPrintW         (const char * const, ...);
     766 
     767- #ifdef __cplusplus
     768- }
     769- #endif /* __cplusplus */
     770-
     771  int                         intLoad             (FILE * const, INT * const);
     772  int                         intSave             (FILE * const, const INT);
     773  void                        intAscn             (INT * const, const INT, const INT);
     774--- 201,210 ----
     775***************
     776*** 258,262 ****
    735777  void nl##__ pl                                   \
    736778  { nu pc; }                                       \
     
    740782--- 249,251 ----
    741783diff -rc src/src/libscotch/common_integer.c old/src/libscotch/common_integer.c
    742 *** src/src/libscotch/common_integer.c  2010-07-19 11:51:37.236617981 -0700
     784*** src/src/libscotch/common_integer.c  2010-07-19 12:11:35.015039059 -0700
    743785--- old/src/libscotch/common_integer.c  2009-01-21 01:32:32.000000000 -0800
    744786***************
     
    801843--- 237,242 ----
    802844diff -rc src/src/libscotch/common_memory.c old/src/libscotch/common_memory.c
    803 *** src/src/libscotch/common_memory.c   2010-07-19 11:51:37.239618002 -0700
     845*** src/src/libscotch/common_memory.c   2010-07-19 12:08:20.535684625 -0700
    804846--- old/src/libscotch/common_memory.c   2009-01-03 02:16:11.000000000 -0800
    805847***************
     
    909951--- 185,192 ----
    910952diff -rc src/src/libscotch/dummysizes.c old/src/libscotch/dummysizes.c
    911 *** src/src/libscotch/dummysizes.c      2010-07-19 11:51:37.241618017 -0700
     953*** src/src/libscotch/dummysizes.c      2010-07-19 12:08:20.538684646 -0700
    912954--- old/src/libscotch/dummysizes.c      2009-05-09 16:08:02.000000000 -0700
    913955***************
     
    922964--- 267,271 ----
    923965diff -rc src/src/libscotch/graph.c old/src/libscotch/graph.c
    924 *** src/src/libscotch/graph.c   2010-07-19 11:51:37.244618038 -0700
     966*** src/src/libscotch/graph.c   2010-07-19 12:08:20.540684660 -0700
    925967--- old/src/libscotch/graph.c   2008-05-22 06:44:42.000000000 -0700
    926968***************
     
    945987          ((grafptr->flagval & GRAPHEDGEGROUP) == 0))
    946988diff -rc src/src/libscotch/graph.h old/src/libscotch/graph.h
    947 *** src/src/libscotch/graph.h   2010-07-19 11:51:37.247618059 -0700
     989*** src/src/libscotch/graph.h   2010-07-19 12:08:20.543684680 -0700
    948990--- old/src/libscotch/graph.h   2008-06-01 02:49:11.000000000 -0700
    949991***************
     
    9621004--- 159,165 ----
    9631005diff -rc src/src/libscotch/graph_io.c old/src/libscotch/graph_io.c
    964 *** src/src/libscotch/graph_io.c        2010-07-19 11:51:37.250618080 -0700
     1006*** src/src/libscotch/graph_io.c        2010-07-19 12:08:20.546684701 -0700
    9651007--- old/src/libscotch/graph_io.c        2008-05-22 06:44:42.000000000 -0700
    9661008***************
     
    12001242--- 307,313 ----
    12011243diff -rc src/src/libscotch/graph_io_scot.c old/src/libscotch/graph_io_scot.c
    1202 *** src/src/libscotch/graph_io_scot.c   2010-07-19 11:51:37.253618101 -0700
     1244*** src/src/libscotch/graph_io_scot.c   2010-07-19 12:08:20.549684722 -0700
    12031245--- old/src/libscotch/graph_io_scot.c   2008-05-22 06:44:42.000000000 -0700
    12041246***************
     
    12171259--- 89,95 ----
    12181260diff -rc src/src/libscotch/library_arch.c old/src/libscotch/library_arch.c
    1219 *** src/src/libscotch/library_arch.c    2010-07-19 11:51:37.255618115 -0700
     1261*** src/src/libscotch/library_arch.c    2010-07-19 12:08:20.550684729 -0700
    12201262--- old/src/libscotch/library_arch.c    2008-05-22 06:44:42.000000000 -0700
    12211263***************
     
    12521294  /*+ This routine saves the given opaque
    12531295diff -rc src/src/libscotch/library_arch_f.c old/src/libscotch/library_arch_f.c
    1254 *** src/src/libscotch/library_arch_f.c  2010-07-19 11:51:37.257618129 -0700
     1296*** src/src/libscotch/library_arch_f.c  2010-07-19 12:08:20.552684743 -0700
    12551297--- old/src/libscotch/library_arch_f.c  2008-05-22 06:44:42.000000000 -0700
    12561298***************
     
    12691311--- 121,127 ----
    12701312diff -rc src/src/libscotch/library_error_exit.c old/src/libscotch/library_error_exit.c
    1271 *** src/src/libscotch/library_error_exit.c      2010-07-19 11:51:37.260618150 -0700
     1313*** src/src/libscotch/library_error_exit.c      2010-07-19 12:08:20.556684771 -0700
    12721314--- old/src/libscotch/library_error_exit.c      2009-01-20 00:36:33.000000000 -0800
    12731315***************
     
    13441386--- 171,174 ----
    13451387diff -rc src/src/libscotch/library_graph.c old/src/libscotch/library_graph.c
    1346 *** src/src/libscotch/library_graph.c   2010-07-19 11:51:37.263618172 -0700
     1388*** src/src/libscotch/library_graph.c   2010-07-19 12:08:20.559684792 -0700
    13471389--- old/src/libscotch/library_graph.c   2008-05-22 07:28:12.000000000 -0700
    13481390***************
     
    13891431--- 153,159 ----
    13901432diff -rc src/src/libscotch/library_graph_f.c old/src/libscotch/library_graph_f.c
    1391 *** src/src/libscotch/library_graph_f.c 2010-07-19 11:51:37.265618186 -0700
     1433*** src/src/libscotch/library_graph_f.c 2010-07-19 12:08:20.561684806 -0700
    13921434--- old/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700
    13931435***************
     
    14061448--- 136,142 ----
    14071449diff -rc src/src/libscotch/library_graph_map.c old/src/libscotch/library_graph_map.c
    1408 *** src/src/libscotch/library_graph_map.c       2010-07-19 11:51:37.267618200 -0700
     1450*** src/src/libscotch/library_graph_map.c       2010-07-19 12:08:20.563684820 -0700
    14091451--- old/src/libscotch/library_graph_map.c       2008-09-28 04:04:05.000000000 -0700
    14101452***************
     
    14311473--- 182,192 ----
    14321474diff -rc src/src/libscotch/library_graph_map_f.c old/src/libscotch/library_graph_map_f.c
    1433 *** src/src/libscotch/library_graph_map_f.c     2010-07-19 11:51:37.269618214 -0700
     1475*** src/src/libscotch/library_graph_map_f.c     2010-07-19 12:08:20.565684834 -0700
    14341476--- old/src/libscotch/library_graph_map_f.c     2008-06-28 03:44:26.000000000 -0700
    14351477***************
     
    14481490--- 183,189 ----
    14491491diff -rc src/src/libscotch/library.h old/src/libscotch/library.h
    1450 *** src/src/libscotch/library.h 2010-07-19 11:51:37.272618235 -0700
     1492*** src/src/libscotch/library.h 2010-07-19 12:08:20.568684854 -0700
    14511493--- old/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700
    14521494***************
     
    14671509--- 278,280 ----
    14681510diff -rc src/src/libscotch/Makefile old/src/libscotch/Makefile
    1469 *** src/src/libscotch/Makefile  2010-07-19 11:51:37.277618270 -0700
     1511*** src/src/libscotch/Makefile  2010-07-19 12:08:20.573684889 -0700
    14701512--- old/src/libscotch/Makefile  2009-05-09 16:08:04.000000000 -0700
    14711513***************
     
    17021744--- 2467,2469 ----
    17031745diff -rc src/src/libscotch/mapping.h old/src/libscotch/mapping.h
    1704 *** src/src/libscotch/mapping.h 2010-07-19 11:51:37.279618284 -0700
     1746*** src/src/libscotch/mapping.h 2010-07-19 12:08:20.575684903 -0700
    17051747--- old/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700
    17061748***************
     
    17191761--- 106,112 ----
    17201762diff -rc src/src/libscotch/mapping_io.c old/src/libscotch/mapping_io.c
    1721 *** src/src/libscotch/mapping_io.c      2010-07-19 11:51:37.282618306 -0700
     1763*** src/src/libscotch/mapping_io.c      2010-07-19 12:08:20.578684924 -0700
    17221764--- old/src/libscotch/mapping_io.c      2008-05-22 06:44:43.000000000 -0700
    17231765***************
     
    18081850  }
    18091851diff -rc src/src/libscotch/mesh_io_scot.c old/src/libscotch/mesh_io_scot.c
    1810 *** src/src/libscotch/mesh_io_scot.c    2010-07-19 11:51:37.285618327 -0700
     1852*** src/src/libscotch/mesh_io_scot.c    2010-07-19 12:08:20.581684945 -0700
    18111853--- old/src/libscotch/mesh_io_scot.c    2008-05-22 06:44:43.000000000 -0700
    18121854***************
     
    18251867--- 85,91 ----
    18261868diff -rc src/src/libscotch/module.h old/src/libscotch/module.h
    1827 *** src/src/libscotch/module.h  2010-07-19 11:51:37.288618348 -0700
     1869*** src/src/libscotch/module.h  2010-07-19 12:08:20.584684966 -0700
    18281870--- old/src/libscotch/module.h  2009-04-26 23:07:14.000000000 -0700
    18291871***************
     
    18561898--- 681,683 ----
    18571899diff -rc src/src/libscotch/parser_ll.l old/src/libscotch/parser_ll.l
    1858 *** src/src/libscotch/parser_ll.l       2010-07-19 11:51:37.290618362 -0700
     1900*** src/src/libscotch/parser_ll.l       2010-07-19 12:08:20.586684980 -0700
    18591901--- old/src/libscotch/parser_ll.l       2008-05-22 06:44:43.000000000 -0700
    18601902***************
     
    18851927--- 192,197 ----
    18861928diff -rc src/src/libscotch/parser_yy.y old/src/libscotch/parser_yy.y
    1887 *** src/src/libscotch/parser_yy.y       2010-07-19 11:51:37.293618383 -0700
     1929*** src/src/libscotch/parser_yy.y       2010-07-19 12:08:20.589685001 -0700
    18881930--- old/src/libscotch/parser_yy.y       2008-10-22 15:12:48.000000000 -0700
    18891931***************
     
    18981940--- 774,779 ----
    18991941diff -rc src/src/libscotch/vgraph_separate_vw.c old/src/libscotch/vgraph_separate_vw.c
    1900 *** src/src/libscotch/vgraph_separate_vw.c      2010-07-19 11:51:37.296618404 -0700
     1942*** src/src/libscotch/vgraph_separate_vw.c      2010-07-19 12:08:20.592685021 -0700
    19011943--- old/src/libscotch/vgraph_separate_vw.c      2008-05-22 06:44:43.000000000 -0700
    19021944***************
     
    19201962--- 102,106 ----
    19211963diff -rc src/src/Makefile old/src/Makefile
    1922 *** src/src/Makefile    2010-07-19 11:51:37.298618418 -0700
     1964*** src/src/Makefile    2010-07-19 12:08:20.594685035 -0700
    19231965--- old/src/Makefile    2008-09-15 05:50:51.000000000 -0700
    19241966***************
     
    19371979Only in src/src: Makefile.inc
    19381980diff -rc src/src/scotch/gmap.h old/src/scotch/gmap.h
    1939 *** src/src/scotch/gmap.h       2010-07-19 11:52:16.821897100 -0700
     1981*** src/src/scotch/gmap.h       2010-07-19 12:08:20.597685056 -0700
    19401982--- old/src/scotch/gmap.h       2008-06-18 11:05:17.000000000 -0700
    19411983***************
     
    19582000Only in src/src/scotch: gmapx.c
    19592001diff -rc src/src/scotch/Makefile old/src/scotch/Makefile
    1960 *** src/src/scotch/Makefile     2010-07-19 11:51:37.303618454 -0700
     2002*** src/src/scotch/Makefile     2010-07-19 12:08:20.599685070 -0700
    19612003--- old/src/scotch/Makefile     2009-04-27 02:19:43.000000000 -0700
    19622004***************
Note: See TracChangeset for help on using the changeset viewer.