Changeset 4705
- Timestamp:
- 07/21/10 17:16:38 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/externalpackages/scotch/scotch.patch
r4700 r4705 4 4 diff -rc src/src/libscotch/arch.c new5/src/libscotch/arch.c 5 5 *** src/src/libscotch/arch.c 2008-09-27 07:48:01.000000000 -0700 6 --- new5/src/libscotch/arch.c 2010-07-2 0 10:07:11.591403732-07006 --- new5/src/libscotch/arch.c 2010-07-21 17:13:15.583257119 -0700 7 7 *************** 8 8 *** 173,187 **** … … 70 70 diff -rc src/src/libscotch/arch_cmplt.c new5/src/libscotch/arch_cmplt.c 71 71 *** src/src/libscotch/arch_cmplt.c 2008-05-22 06:44:41.000000000 -0700 72 --- new5/src/libscotch/arch_cmplt.c 2010-07-2 0 10:08:51.983495478-070072 --- new5/src/libscotch/arch_cmplt.c 2010-07-21 17:13:15.585257133 -0700 73 73 *************** 74 74 *** 90,99 **** … … 122 122 diff -rc src/src/libscotch/arch_cmplt.h new5/src/libscotch/arch_cmplt.h 123 123 *** src/src/libscotch/arch_cmplt.h 2008-05-22 06:44:41.000000000 -0700 124 --- new5/src/libscotch/arch_cmplt.h 2010-07- 19 14:57:40.109618053-0700124 --- new5/src/libscotch/arch_cmplt.h 2010-07-21 17:13:15.588257154 -0700 125 125 *************** 126 126 *** 87,93 **** … … 139 139 diff -rc src/src/libscotch/arch_cmpltw.c new5/src/libscotch/arch_cmpltw.c 140 140 *** src/src/libscotch/arch_cmpltw.c 2008-08-27 14:22:22.000000000 -0700 141 --- new5/src/libscotch/arch_cmpltw.c 2010-07-2 0 10:09:00.028502844-0700141 --- new5/src/libscotch/arch_cmpltw.c 2010-07-21 17:13:15.590257168 -0700 142 142 *************** 143 143 *** 200,211 **** … … 211 211 diff -rc src/src/libscotch/arch_cmpltw.h new5/src/libscotch/arch_cmpltw.h 212 212 *** src/src/libscotch/arch_cmpltw.h 2008-05-22 06:44:41.000000000 -0700 213 --- new5/src/libscotch/arch_cmpltw.h 2010-07- 19 14:57:58.393634859-0700213 --- new5/src/libscotch/arch_cmpltw.h 2010-07-21 17:13:15.592257181 -0700 214 214 *************** 215 215 *** 86,92 **** … … 228 228 diff -rc src/src/libscotch/arch_deco.c new5/src/libscotch/arch_deco.c 229 229 *** src/src/libscotch/arch_deco.c 2008-09-28 06:35:27.000000000 -0700 230 --- new5/src/libscotch/arch_deco.c 2010-07-2 0 10:09:13.608515282 -0700230 --- new5/src/libscotch/arch_deco.c 2010-07-21 17:13:15.595257202 -0700 231 231 *************** 232 232 *** 211,217 **** … … 269 269 diff -rc src/src/libscotch/arch_deco.h new5/src/libscotch/arch_deco.h 270 270 *** src/src/libscotch/arch_deco.h 2008-09-27 07:49:46.000000000 -0700 271 --- new5/src/libscotch/arch_deco.h 2010-07- 19 14:58:09.531645102-0700271 --- new5/src/libscotch/arch_deco.h 2010-07-21 17:13:15.597257216 -0700 272 272 *************** 273 273 *** 113,119 **** … … 286 286 diff -rc src/src/libscotch/arch.h new5/src/libscotch/arch.h 287 287 *** src/src/libscotch/arch.h 2009-04-28 08:11:27.000000000 -0700 288 --- new5/src/libscotch/arch.h 2010-07- 19 14:58:14.368649552-0700288 --- new5/src/libscotch/arch.h 2010-07-21 17:13:15.600257237 -0700 289 289 *************** 290 290 *** 175,181 **** … … 303 303 diff -rc src/src/libscotch/arch_hcub.c new5/src/libscotch/arch_hcub.c 304 304 *** src/src/libscotch/arch_hcub.c 2008-05-22 06:44:41.000000000 -0700 305 --- new5/src/libscotch/arch_hcub.c 2010-07-2 0 10:09:19.956521099-0700305 --- new5/src/libscotch/arch_hcub.c 2010-07-21 17:13:15.602257251 -0700 306 306 *************** 307 307 *** 88,95 **** … … 351 351 diff -rc src/src/libscotch/arch_hcub.h new5/src/libscotch/arch_hcub.h 352 352 *** src/src/libscotch/arch_hcub.h 2008-05-22 06:44:41.000000000 -0700 353 --- new5/src/libscotch/arch_hcub.h 2010-07- 19 14:58:27.010661184-0700353 --- new5/src/libscotch/arch_hcub.h 2010-07-21 17:13:15.604257265 -0700 354 354 *************** 355 355 *** 85,91 **** … … 368 368 diff -rc src/src/libscotch/arch_mesh.c new5/src/libscotch/arch_mesh.c 369 369 *** src/src/libscotch/arch_mesh.c 2008-05-22 06:44:41.000000000 -0700 370 --- new5/src/libscotch/arch_mesh.c 2010-07-2 0 10:09:26.031526666 -0700370 --- new5/src/libscotch/arch_mesh.c 2010-07-21 17:13:15.607257286 -0700 371 371 *************** 372 372 *** 96,103 **** … … 467 467 diff -rc src/src/libscotch/arch_mesh.h new5/src/libscotch/arch_mesh.h 468 468 *** src/src/libscotch/arch_mesh.h 2008-05-22 06:44:41.000000000 -0700 469 --- new5/src/libscotch/arch_mesh.h 2010-07- 19 14:58:58.560698969-0700469 --- new5/src/libscotch/arch_mesh.h 2010-07-21 17:13:15.610257307 -0700 470 470 *************** 471 471 *** 96,102 **** … … 498 498 diff -rc src/src/libscotch/arch_tleaf.c new5/src/libscotch/arch_tleaf.c 499 499 *** src/src/libscotch/arch_tleaf.c 2008-05-22 06:44:41.000000000 -0700 500 --- new5/src/libscotch/arch_tleaf.c 2010-07-2 0 10:09:30.666530915-0700500 --- new5/src/libscotch/arch_tleaf.c 2010-07-21 17:13:15.612257320 -0700 501 501 *************** 502 502 *** 92,99 **** … … 556 556 diff -rc src/src/libscotch/arch_tleaf.h new5/src/libscotch/arch_tleaf.h 557 557 *** src/src/libscotch/arch_tleaf.h 2008-05-22 06:44:41.000000000 -0700 558 --- new5/src/libscotch/arch_tleaf.h 2010-07- 19 14:59:12.907720214-0700558 --- new5/src/libscotch/arch_tleaf.h 2010-07-21 17:13:15.615257341 -0700 559 559 *************** 560 560 *** 89,95 **** … … 573 573 diff -rc src/src/libscotch/arch_torus.c new5/src/libscotch/arch_torus.c 574 574 *** src/src/libscotch/arch_torus.c 2008-05-22 06:44:41.000000000 -0700 575 --- new5/src/libscotch/arch_torus.c 2010-07-2 0 10:09:36.887536618-0700575 --- new5/src/libscotch/arch_torus.c 2010-07-21 17:13:15.618257362 -0700 576 576 *************** 577 577 *** 90,97 **** … … 672 672 diff -rc src/src/libscotch/arch_torus.h new5/src/libscotch/arch_torus.h 673 673 *** src/src/libscotch/arch_torus.h 2008-05-22 06:44:41.000000000 -0700 674 --- new5/src/libscotch/arch_torus.h 2010-07- 19 14:59:34.966752838-0700674 --- new5/src/libscotch/arch_torus.h 2010-07-21 17:13:15.620257376 -0700 675 675 *************** 676 676 *** 96,102 **** … … 703 703 diff -rc src/src/libscotch/common.c new5/src/libscotch/common.c 704 704 *** src/src/libscotch/common.c 2008-05-22 06:44:41.000000000 -0700 705 --- new5/src/libscotch/common.c 2010-07- 15 15:09:01.721095620 -0700705 --- new5/src/libscotch/common.c 2010-07-21 17:13:15.622257390 -0700 706 706 *************** 707 707 *** 100,106 **** … … 722 722 diff -rc src/src/libscotch/common.h new5/src/libscotch/common.h 723 723 *** src/src/libscotch/common.h 2009-02-06 14:20:55.000000000 -0800 724 --- new5/src/libscotch/common.h 2010-07-21 1 4:16:02.178336967-0700724 --- new5/src/libscotch/common.h 2010-07-21 17:15:06.061025001 -0700 725 725 *************** 726 726 *** 1,3 **** … … 753 753 --- 109,114 ---- 754 754 *************** 755 *** 201,214 **** 756 --- 202,224 ---- 755 *** 190,216 **** 756 size_t memMax (); 757 #endif /* COMMON_MEMORY_TRACE */ 758 759 - void usagePrint (FILE * const, const char (* [])); 760 761 - int fileBlockOpen (File * const, const int); 762 int fileBlockOpenDist (File * const, const int, const int, const int, const int); 763 - void fileBlockClose (File * const, const int); 764 FILE * fileCompress (FILE * const, const int); 765 int fileCompressType (const char * const); 766 FILE * fileUncompress (FILE * const, const int); 757 767 int fileUncompressType (const char * const); 758 768 int fileNameDistExpand (char ** const, const int, const int, const int); 759 769 760 + #ifdef __cplusplus761 + extern "C" {762 + #endif /* __cplusplus */763 +764 770 void errorProg (const char * const); 765 771 void errorPrint (const char * const, ...); 766 772 void errorPrintW (const char * const, ...); 767 773 768 + #ifdef __cplusplus769 + }770 + #endif /* __cplusplus */771 +772 774 int intLoad (FILE * const, INT * const); 773 775 int intSave (FILE * const, const INT); 774 776 void intAscn (INT * const, const INT, const INT); 775 777 void intPerm (INT * const, const INT); 778 void intRandReset (void); 779 - void intRandInit (void); 780 INT intRandVal (INT); 781 void intSort1asc1 (void * const, const INT); 782 void intSort2asc1 (void * const, const INT); 783 --- 191,227 ---- 784 size_t memMax (); 785 #endif /* COMMON_MEMORY_TRACE */ 786 787 788 int fileBlockOpenDist (File * const, const int, const int, const int, const int); 789 FILE * fileCompress (FILE * const, const int); 790 int fileCompressType (const char * const); 791 FILE * fileUncompress (FILE * const, const int); 792 int fileUncompressType (const char * const); 793 int fileNameDistExpand (char ** const, const int, const int, const int); 794 795 + #ifdef __cplusplus 796 + extern "C" { 797 + #endif /* __cplusplus */ 798 + 799 void errorProg (const char * const); 800 void errorPrint (const char * const, ...); 801 void errorPrintW (const char * const, ...); 802 + double clockGet (void); 803 + void usagePrint (FILE * const, const char (* [])); 804 + void intRandInit (void); 805 + int fileBlockOpen (File * const, const int); 806 + void fileBlockClose (File * const, const int); 776 807 + void intRandResetStatic (void); 808 + 809 + #ifdef __cplusplus 810 + } 811 + #endif /* __cplusplus */ 812 813 int intLoad (FILE * const, INT * const); 814 int intSave (FILE * const, const INT); 815 void intAscn (INT * const, const INT, const INT); 816 void intPerm (INT * const, const INT); 777 817 void intRandReset (void); 778 void intRandInit (void);779 818 INT intRandVal (INT); 819 void intSort1asc1 (void * const, const INT); 820 void intSort2asc1 (void * const, const INT); 821 *************** 822 *** 221,227 **** 823 void clockStart (Clock * const); 824 void clockStop (Clock * const); 825 double clockVal (Clock * const); 826 - double clockGet (void); 827 828 /* 829 ** Macro definitions. 830 --- 232,237 ---- 780 831 *************** 781 832 *** 249,251 **** … … 788 839 diff -rc src/src/libscotch/common_integer.c new5/src/libscotch/common_integer.c 789 840 *** src/src/libscotch/common_integer.c 2009-01-21 01:32:32.000000000 -0800 790 --- new5/src/libscotch/common_integer.c 2010-07-2 0 10:11:29.029639629-0700841 --- new5/src/libscotch/common_integer.c 2010-07-21 17:13:15.628257432 -0700 791 842 *************** 792 843 *** 191,196 **** … … 861 912 diff -rc src/src/libscotch/common_memory.c new5/src/libscotch/common_memory.c 862 913 *** src/src/libscotch/common_memory.c 2009-01-03 02:16:11.000000000 -0800 863 --- new5/src/libscotch/common_memory.c 2010-07- 15 15:09:01.740095640-0700914 --- new5/src/libscotch/common_memory.c 2010-07-21 17:13:15.630257445 -0700 864 915 *************** 865 916 *** 87,93 **** … … 969 1020 diff -rc src/src/libscotch/dummysizes.c new5/src/libscotch/dummysizes.c 970 1021 *** src/src/libscotch/dummysizes.c 2009-05-09 16:08:02.000000000 -0700 971 --- new5/src/libscotch/dummysizes.c 2010-07- 15 15:09:01.746095647-07001022 --- new5/src/libscotch/dummysizes.c 2010-07-21 17:13:15.633257466 -0700 972 1023 *************** 973 1024 *** 267,271 **** … … 982 1033 diff -rc src/src/libscotch/graph.c new5/src/libscotch/graph.c 983 1034 *** src/src/libscotch/graph.c 2008-05-22 06:44:42.000000000 -0700 984 --- new5/src/libscotch/graph.c 2010-07- 15 15:09:01.752095654-07001035 --- new5/src/libscotch/graph.c 2010-07-21 17:13:15.635257480 -0700 985 1036 *************** 986 1037 *** 135,141 **** … … 1005 1056 diff -rc src/src/libscotch/graph.h new5/src/libscotch/graph.h 1006 1057 *** src/src/libscotch/graph.h 2008-06-01 02:49:11.000000000 -0700 1007 --- new5/src/libscotch/graph.h 2010-07- 19 15:00:58.693876214 -07001058 --- new5/src/libscotch/graph.h 2010-07-21 17:13:15.637257494 -0700 1008 1059 *************** 1009 1060 *** 159,165 **** … … 1022 1073 diff -rc src/src/libscotch/graph_io.c new5/src/libscotch/graph_io.c 1023 1074 *** src/src/libscotch/graph_io.c 2008-05-22 06:44:42.000000000 -0700 1024 --- new5/src/libscotch/graph_io.c 2010-07-2 0 10:06:59.951393115-07001075 --- new5/src/libscotch/graph_io.c 2010-07-21 17:13:15.639257508 -0700 1025 1076 *************** 1026 1077 *** 86,92 **** … … 1260 1311 diff -rc src/src/libscotch/graph_io_scot.c new5/src/libscotch/graph_io_scot.c 1261 1312 *** src/src/libscotch/graph_io_scot.c 2008-05-22 06:44:42.000000000 -0700 1262 --- new5/src/libscotch/graph_io_scot.c 2010-07- 19 15:02:03.105970631-07001313 --- new5/src/libscotch/graph_io_scot.c 2010-07-21 17:13:15.641257522 -0700 1263 1314 *************** 1264 1315 *** 89,95 **** … … 1277 1328 diff -rc src/src/libscotch/library_arch.c new5/src/libscotch/library_arch.c 1278 1329 *** src/src/libscotch/library_arch.c 2008-05-22 06:44:42.000000000 -0700 1279 --- new5/src/libscotch/library_arch.c 2010-07- 19 15:02:10.011980730-07001330 --- new5/src/libscotch/library_arch.c 2010-07-21 17:13:15.643257536 -0700 1280 1331 *************** 1281 1332 *** 120,128 **** … … 1312 1363 diff -rc src/src/libscotch/library_arch_f.c new5/src/libscotch/library_arch_f.c 1313 1364 *** src/src/libscotch/library_arch_f.c 2008-05-22 06:44:42.000000000 -0700 1314 --- new5/src/libscotch/library_arch_f.c 2010-07- 19 15:02:16.632990408-07001365 --- new5/src/libscotch/library_arch_f.c 2010-07-21 17:13:15.645257550 -0700 1315 1366 *************** 1316 1367 *** 121,127 **** … … 1329 1380 diff -rc src/src/libscotch/library_error_exit.c new5/src/libscotch/library_error_exit.c 1330 1381 *** src/src/libscotch/library_error_exit.c 2009-01-20 00:36:33.000000000 -0800 1331 --- new5/src/libscotch/library_error_exit.c 2010-07- 15 15:09:01.789095694-07001382 --- new5/src/libscotch/library_error_exit.c 2010-07-21 17:13:15.648257570 -0700 1332 1383 *************** 1333 1384 *** 114,119 **** … … 1404 1455 diff -rc src/src/libscotch/library_graph.c new5/src/libscotch/library_graph.c 1405 1456 *** src/src/libscotch/library_graph.c 2008-05-22 07:28:12.000000000 -0700 1406 --- new5/src/libscotch/library_graph.c 2010-07- 19 15:03:08.833066562-07001457 --- new5/src/libscotch/library_graph.c 2010-07-21 17:13:15.650257584 -0700 1407 1458 *************** 1408 1459 *** 137,143 **** … … 1449 1500 diff -rc src/src/libscotch/library_graph_f.c new5/src/libscotch/library_graph_f.c 1450 1501 *** src/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700 1451 --- new5/src/libscotch/library_graph_f.c 2010-07- 19 15:03:14.148074301-07001502 --- new5/src/libscotch/library_graph_f.c 2010-07-21 17:13:15.652257598 -0700 1452 1503 *************** 1453 1504 *** 136,142 **** … … 1466 1517 diff -rc src/src/libscotch/library_graph_map.c new5/src/libscotch/library_graph_map.c 1467 1518 *** src/src/libscotch/library_graph_map.c 2008-09-28 04:04:05.000000000 -0700 1468 --- new5/src/libscotch/library_graph_map.c 2010-07- 19 15:03:29.338096404-07001519 --- new5/src/libscotch/library_graph_map.c 2010-07-21 17:13:15.654257612 -0700 1469 1520 *************** 1470 1521 *** 182,192 **** … … 1491 1542 diff -rc src/src/libscotch/library_graph_map_f.c new5/src/libscotch/library_graph_map_f.c 1492 1543 *** src/src/libscotch/library_graph_map_f.c 2008-06-28 03:44:26.000000000 -0700 1493 --- new5/src/libscotch/library_graph_map_f.c 2010-07- 19 15:03:34.344103682-07001544 --- new5/src/libscotch/library_graph_map_f.c 2010-07-21 17:13:15.656257626 -0700 1494 1545 *************** 1495 1546 *** 183,189 **** … … 1508 1559 diff -rc src/src/libscotch/library.h new5/src/libscotch/library.h 1509 1560 *** src/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700 1510 --- new5/src/libscotch/library.h 2010-07-21 1 1:55:39.022504459-07001561 --- new5/src/libscotch/library.h 2010-07-21 17:13:15.660257654 -0700 1511 1562 *************** 1512 1563 *** 1,3 **** … … 1569 1620 diff -rc src/src/libscotch/Makefile new5/src/libscotch/Makefile 1570 1621 *** src/src/libscotch/Makefile 2009-05-09 16:08:04.000000000 -0700 1571 --- new5/src/libscotch/Makefile 2010-07- 19 16:00:02.225745769 -07001622 --- new5/src/libscotch/Makefile 2010-07-21 17:13:15.665257689 -0700 1572 1623 *************** 1573 1624 *** 49,55 **** … … 1988 2039 diff -rc src/src/libscotch/mapping.h new5/src/libscotch/mapping.h 1989 2040 *** src/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700 1990 --- new5/src/libscotch/mapping.h 2010-07- 19 15:03:48.720124571-07002041 --- new5/src/libscotch/mapping.h 2010-07-21 17:13:15.667257702 -0700 1991 2042 *************** 1992 2043 *** 106,112 **** … … 2005 2056 diff -rc src/src/libscotch/mapping_io.c new5/src/libscotch/mapping_io.c 2006 2057 *** src/src/libscotch/mapping_io.c 2008-05-22 06:44:43.000000000 -0700 2007 --- new5/src/libscotch/mapping_io.c 2010-07-2 0 10:07:35.070425160-07002058 --- new5/src/libscotch/mapping_io.c 2010-07-21 17:13:15.670257723 -0700 2008 2059 *************** 2009 2060 *** 199,204 **** … … 2094 2145 diff -rc src/src/libscotch/mesh_io_scot.c new5/src/libscotch/mesh_io_scot.c 2095 2146 *** src/src/libscotch/mesh_io_scot.c 2008-05-22 06:44:43.000000000 -0700 2096 --- new5/src/libscotch/mesh_io_scot.c 2010-07- 19 15:04:11.402157488-07002147 --- new5/src/libscotch/mesh_io_scot.c 2010-07-21 17:13:15.672257737 -0700 2097 2148 *************** 2098 2149 *** 85,91 **** … … 2111 2162 diff -rc src/src/libscotch/module.h new5/src/libscotch/module.h 2112 2163 *** src/src/libscotch/module.h 2009-04-26 23:07:14.000000000 -0700 2113 --- new5/src/libscotch/module.h 2010-07-21 1 2:00:44.312746389-07002164 --- new5/src/libscotch/module.h 2010-07-21 17:13:15.675257758 -0700 2114 2165 *************** 2115 2166 *** 1,3 **** … … 2152 2203 diff -rc src/src/libscotch/parser_ll.l new5/src/libscotch/parser_ll.l 2153 2204 *** src/src/libscotch/parser_ll.l 2008-05-22 06:44:43.000000000 -0700 2154 --- new5/src/libscotch/parser_ll.l 2010-07- 15 15:09:01.866095777-07002205 --- new5/src/libscotch/parser_ll.l 2010-07-21 17:13:15.677257772 -0700 2155 2206 *************** 2156 2207 *** 192,197 **** … … 2181 2232 diff -rc src/src/libscotch/parser_yy.y new5/src/libscotch/parser_yy.y 2182 2233 *** src/src/libscotch/parser_yy.y 2008-10-22 15:12:48.000000000 -0700 2183 --- new5/src/libscotch/parser_yy.y 2010-07- 15 15:09:01.874095786 -07002234 --- new5/src/libscotch/parser_yy.y 2010-07-21 17:13:15.679257786 -0700 2184 2235 *************** 2185 2236 *** 774,779 **** … … 2194 2245 diff -rc src/src/libscotch/vgraph_separate_vw.c new5/src/libscotch/vgraph_separate_vw.c 2195 2246 *** src/src/libscotch/vgraph_separate_vw.c 2008-05-22 06:44:43.000000000 -0700 2196 --- new5/src/libscotch/vgraph_separate_vw.c 2010-07- 15 15:09:01.882095795-07002247 --- new5/src/libscotch/vgraph_separate_vw.c 2010-07-21 17:13:15.682257807 -0700 2197 2248 *************** 2198 2249 *** 83,88 **** … … 2216 2267 diff -rc src/src/Makefile new5/src/Makefile 2217 2268 *** src/src/Makefile 2008-09-15 05:50:51.000000000 -0700 2218 --- new5/src/Makefile 2010-07- 19 15:29:59.056369854-07002269 --- new5/src/Makefile 2010-07-21 17:13:15.684257821 -0700 2219 2270 *************** 2220 2271 *** 97,102 **** … … 2236 2287 diff -rc src/src/scotch/gmap.h new5/src/scotch/gmap.h 2237 2288 *** src/src/scotch/gmap.h 2008-06-18 11:05:17.000000000 -0700 2238 --- new5/src/scotch/gmap.h 2010-07-21 1 1:29:31.069238000-07002289 --- new5/src/scotch/gmap.h 2010-07-21 17:13:15.686257834 -0700 2239 2290 *************** 2240 2291 *** 1,3 **** … … 2257 2308 diff -rc src/src/scotch/Makefile new5/src/scotch/Makefile 2258 2309 *** src/src/scotch/Makefile 2009-04-27 02:19:43.000000000 -0700 2259 --- new5/src/scotch/Makefile 2010-07-2 0 10:38:13.641149208-07002310 --- new5/src/scotch/Makefile 2010-07-21 17:13:15.689257855 -0700 2260 2311 *************** 2261 2312 *** 49,59 ****
Note:
See TracChangeset
for help on using the changeset viewer.