Index: /issm/trunk/externalpackages/scotch/Makefile.inc =================================================================== --- /issm/trunk/externalpackages/scotch/Makefile.inc (revision 3059) +++ /issm/trunk/externalpackages/scotch/Makefile.inc (revision 3060) @@ -11,11 +11,11 @@ CCP = mpicc CCD = mpicc -CCM = mex -#CFLAGS = -m64 -O3 -std=c99 -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DMATLAB -fPIC -I/usr/local/pkgs/matlab-7.6/extern/include +CCM = ${MATLAB_DIR}/bin/mex +#CFLAGS = -m64 -O3 -std=c99 -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DMATLAB -fPIC -I${MATLAB_DIR}/extern/include CFLAGS = -m64 -O3 -std=c99 -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -fPIC -#LDFLAGS = -lz -lm -lrt -L/usr/local/pkgs/matlab-7.6/bin/glnxa64 -lmex -lmat -#LDFLAGS = -lz -lm -lrt -Wl,-rpath-link,/usr/local/pkgs/matlab-7.6/bin/glnxa64 -L/usr/local/pkgs/matlab-7.6/bin/glnxa64 -lmex -lmat +#LDFLAGS = -lz -lm -lrt -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat +#LDFLAGS = -lz -lm -lrt -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat LDFLAGS = -lz -lm -lrt -MFLAGS = -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DMATLAB -I/usr/local/pkgs/matlab-7.6/extern/include -largeArrayDims +MFLAGS = -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DMATLAB -I${MATLAB_DIR}/extern/include -largeArrayDims CP = cp LEX = flex Index: /issm/trunk/externalpackages/scotch/scotch.patch =================================================================== --- /issm/trunk/externalpackages/scotch/scotch.patch (revision 3059) +++ /issm/trunk/externalpackages/scotch/scotch.patch (revision 3060) @@ -1,35 +1,8 @@ -Only in /home/jschierm/Libs/scotch_5.1: 3elt.log -Only in /home/jschierm/Libs/scotch_5.1: 3elt.map -Only in /home/jschierm/Libs/scotch_5.1: bin -Only in /home/jschierm/Libs/scotch_5.1: diary -Only in /home/jschierm/Libs/scotch_5.1: gmap.log -Only in /home/jschierm/Libs/scotch_5.1: gmap.m -Only in /home/jschierm/Libs/scotch_5.1: gmap.map -Only in /home/jschierm/Libs/scotch_5.1/grf: 3elt.grf -Only in src/grf: 3elt.grf.gz -Only in /home/jschierm/Libs/scotch_5.1/grf: 3elt.xyz -Only in src/grf: 3elt.xyz.gz -Only in /home/jschierm/Libs/scotch_5.1/grf: 4elt2.grf -Only in src/grf: 4elt2.grf.gz -Only in /home/jschierm/Libs/scotch_5.1/grf: 4elt2.xyz -Only in src/grf: 4elt2.xyz.gz -Only in /home/jschierm/Libs/scotch_5.1/grf: 4elt.grf -Only in src/grf: 4elt.grf.gz -Only in /home/jschierm/Libs/scotch_5.1/grf: 4elt.xyz -Only in src/grf: 4elt.xyz.gz -Only in /home/jschierm/Libs/scotch_5.1/grf: bump.grf -Only in src/grf: bump.grf.gz -Only in /home/jschierm/Libs/scotch_5.1/grf: bump.xyz -Only in src/grf: bump.xyz.gz -Only in /home/jschierm/Libs/scotch_5.1: include -Only in /home/jschierm/Libs/scotch_5.1: lib -Only in /home/jschierm/Libs/scotch_5.1: ScotchGraphWrite.m -Only in /home/jschierm/Libs/scotch_5.1: ScotchMapRead.m -Only in /home/jschierm/Libs/scotch_5.1: ScotchRun.m -Only in /home/jschierm/Libs/scotch_5.1: scotch_save.tar -Only in /home/jschierm/Libs/scotch_5.1: ScotchTargetWrite.m -diff -rc src/src/libscotch/arch.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch.c +Only in new: bin +Only in new: include +Only in new: lib +diff -rc src/src/libscotch/arch.c new/src/libscotch/arch.c *** src/src/libscotch/arch.c 2008-09-27 07:48:01.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch.c 2010-02-10 11:08:45.873926805 -0800 +--- new/src/libscotch/arch.c 2010-02-10 11:23:26.442951850 -0800 *************** *** 173,187 **** @@ -95,7 +68,7 @@ memset (archptr, 0, sizeof (Arch)); /* Initialize architecture body */ return (1); -diff -rc src/src/libscotch/arch_cmplt.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmplt.c +diff -rc src/src/libscotch/arch_cmplt.c new/src/libscotch/arch_cmplt.c *** src/src/libscotch/arch_cmplt.c 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmplt.c 2010-02-08 15:42:01.878691914 -0800 +--- new/src/libscotch/arch_cmplt.c 2010-02-10 11:23:26.449951858 -0800 *************** *** 90,99 **** @@ -147,7 +120,7 @@ return (1); } -diff -rc src/src/libscotch/arch_cmplt.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmplt.h +diff -rc src/src/libscotch/arch_cmplt.h new/src/libscotch/arch_cmplt.h *** src/src/libscotch/arch_cmplt.h 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmplt.h 2010-02-08 15:24:01.543386538 -0800 +--- new/src/libscotch/arch_cmplt.h 2010-02-10 11:23:26.455951865 -0800 *************** *** 87,93 **** @@ -164,9 +137,7 @@ #define archCmpltArchFree NULL ArchDomNum archCmpltDomNum (const ArchCmplt * const, const ArchCmpltDom * const); -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_cmplt_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_cmplt_old.h -diff -rc src/src/libscotch/arch_cmpltw.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmpltw.c +diff -rc src/src/libscotch/arch_cmpltw.c new/src/libscotch/arch_cmpltw.c *** src/src/libscotch/arch_cmpltw.c 2008-08-27 14:22:22.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmpltw.c 2010-02-08 15:44:15.206851120 -0800 +--- new/src/libscotch/arch_cmpltw.c 2010-02-10 11:23:26.462951873 -0800 *************** *** 200,211 **** @@ -238,7 +209,7 @@ return (1); } -diff -rc src/src/libscotch/arch_cmpltw.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmpltw.h +diff -rc src/src/libscotch/arch_cmpltw.h new/src/libscotch/arch_cmpltw.h *** src/src/libscotch/arch_cmpltw.h 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmpltw.h 2010-02-09 11:44:11.147224781 -0800 +--- new/src/libscotch/arch_cmpltw.h 2010-02-10 11:23:26.469951882 -0800 *************** *** 86,92 **** @@ -255,9 +226,7 @@ int archCmpltwArchFree (ArchCmpltw * restrict const); ArchDomNum archCmpltwDomNum (const ArchCmpltw * const, const ArchCmpltwDom * const); -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_cmpltw_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_cmpltw_old.h -diff -rc src/src/libscotch/arch_deco.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_deco.c +diff -rc src/src/libscotch/arch_deco.c new/src/libscotch/arch_deco.c *** src/src/libscotch/arch_deco.c 2008-09-28 06:35:27.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_deco.c 2010-02-08 15:46:23.549004027 -0800 +--- new/src/libscotch/arch_deco.c 2010-02-10 11:23:26.476951890 -0800 *************** *** 211,217 **** @@ -298,7 +267,7 @@ if ((sizeof (ArchDeco) > sizeof (ArchDummy)) || (sizeof (ArchDecoDom) > sizeof (ArchDomDummy))) { -diff -rc src/src/libscotch/arch_deco.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_deco.h +diff -rc src/src/libscotch/arch_deco.h new/src/libscotch/arch_deco.h *** src/src/libscotch/arch_deco.h 2008-09-27 07:49:46.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_deco.h 2010-02-08 15:25:21.216483840 -0800 +--- new/src/libscotch/arch_deco.h 2010-02-10 11:23:26.482951897 -0800 *************** *** 113,119 **** @@ -315,9 +284,7 @@ int archDecoArchFree (ArchDeco * const); Anum archDecoArchSize (ArchDeco * const, const Anum); -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_deco_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_deco_old.h -diff -rc src/src/libscotch/arch.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch.h +diff -rc src/src/libscotch/arch.h new/src/libscotch/arch.h *** src/src/libscotch/arch.h 2009-04-28 08:11:27.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch.h 2010-02-08 15:14:06.397653868 -0800 +--- new/src/libscotch/arch.h 2010-02-10 11:23:26.488951904 -0800 *************** *** 175,181 **** @@ -334,7 +301,7 @@ char * archName (const Arch * const); const ArchClass * archClass (const char * const); -diff -rc src/src/libscotch/arch_hcub.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_hcub.c +diff -rc src/src/libscotch/arch_hcub.c new/src/libscotch/arch_hcub.c *** src/src/libscotch/arch_hcub.c 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_hcub.c 2010-02-08 15:48:09.189129642 -0800 +--- new/src/libscotch/arch_hcub.c 2010-02-10 11:23:26.495951912 -0800 *************** *** 88,95 **** @@ -382,7 +349,7 @@ errorPrint ("archHcubArchLoad: bad input"); return (1); -diff -rc src/src/libscotch/arch_hcub.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_hcub.h +diff -rc src/src/libscotch/arch_hcub.h new/src/libscotch/arch_hcub.h *** src/src/libscotch/arch_hcub.h 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_hcub.h 2010-02-08 15:26:06.864539511 -0800 +--- new/src/libscotch/arch_hcub.h 2010-02-10 11:23:26.501951919 -0800 *************** *** 85,91 **** @@ -399,9 +366,7 @@ #define archHcubArchFree NULL ArchDomNum archHcubDomNum (const ArchHcub * const, const ArchHcubDom * const); -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_hcub_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_hcub_old.h -diff -rc src/src/libscotch/arch_mesh.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_mesh.c +diff -rc src/src/libscotch/arch_mesh.c new/src/libscotch/arch_mesh.c *** src/src/libscotch/arch_mesh.c 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_mesh.c 2010-02-08 15:52:01.266404851 -0800 +--- new/src/libscotch/arch_mesh.c 2010-02-10 11:23:26.508951927 -0800 *************** *** 96,103 **** @@ -500,7 +465,7 @@ return (1); } -diff -rc src/src/libscotch/arch_mesh.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_mesh.h +diff -rc src/src/libscotch/arch_mesh.h new/src/libscotch/arch_mesh.h *** src/src/libscotch/arch_mesh.h 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_mesh.h 2010-02-08 15:27:29.654640338 -0800 +--- new/src/libscotch/arch_mesh.h 2010-02-10 11:23:26.514951934 -0800 *************** *** 96,102 **** @@ -531,11 +496,7 @@ #define archMesh3ArchFree NULL ArchDomNum archMesh3DomNum (const ArchMesh3 * const, const ArchMesh3Dom * const); -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_mesh_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_mesh_old.h -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_old.h -diff -rc src/src/libscotch/arch_tleaf.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_tleaf.c +diff -rc src/src/libscotch/arch_tleaf.c new/src/libscotch/arch_tleaf.c *** src/src/libscotch/arch_tleaf.c 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_tleaf.c 2010-02-08 15:53:28.701508248 -0800 +--- new/src/libscotch/arch_tleaf.c 2010-02-10 11:23:26.520951941 -0800 *************** *** 92,99 **** @@ -593,7 +554,7 @@ return (1); } -diff -rc src/src/libscotch/arch_tleaf.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_tleaf.h +diff -rc src/src/libscotch/arch_tleaf.h new/src/libscotch/arch_tleaf.h *** src/src/libscotch/arch_tleaf.h 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_tleaf.h 2010-02-08 15:28:10.269689735 -0800 +--- new/src/libscotch/arch_tleaf.h 2010-02-10 11:23:26.526951948 -0800 *************** *** 89,95 **** @@ -610,9 +571,7 @@ #define archTleafArchFree NULL ArchDomNum archTleafDomNum (const ArchTleaf * const, const ArchTleafDom * const); -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_tleaf_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_tleaf_old.h -diff -rc src/src/libscotch/arch_torus.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_torus.c +diff -rc src/src/libscotch/arch_torus.c new/src/libscotch/arch_torus.c *** src/src/libscotch/arch_torus.c 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_torus.c 2010-02-10 09:58:44.790706850 -0800 +--- new/src/libscotch/arch_torus.c 2010-02-10 11:23:26.533951956 -0800 *************** *** 90,97 **** @@ -711,7 +670,7 @@ return (1); } -diff -rc src/src/libscotch/arch_torus.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_torus.h +diff -rc src/src/libscotch/arch_torus.h new/src/libscotch/arch_torus.h *** src/src/libscotch/arch_torus.h 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_torus.h 2010-02-08 15:29:22.742777748 -0800 +--- new/src/libscotch/arch_torus.h 2010-02-10 11:23:26.540951964 -0800 *************** *** 96,102 **** @@ -742,9 +701,7 @@ #define archTorus3ArchFree NULL ArchDomNum archTorus3DomNum (const ArchTorus3 * const, const ArchTorus3Dom * const); -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_torus_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_torus_old.h -diff -rc src/src/libscotch/common.c /home/jschierm/Libs/scotch_5.1/src/libscotch/common.c +diff -rc src/src/libscotch/common.c new/src/libscotch/common.c *** src/src/libscotch/common.c 2008-05-22 06:44:41.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/common.c 2009-08-20 11:26:05.906946884 -0700 +--- new/src/libscotch/common.c 2010-02-10 11:23:26.546951971 -0800 *************** *** 100,106 **** @@ -763,7 +720,7 @@ + #endif /* MATLAB */ } -diff -rc src/src/libscotch/common.h /home/jschierm/Libs/scotch_5.1/src/libscotch/common.h +diff -rc src/src/libscotch/common.h new/src/libscotch/common.h *** src/src/libscotch/common.h 2009-02-06 14:20:55.000000000 -0800 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/common.h 2009-08-25 10:12:42.449687289 -0700 +--- new/src/libscotch/common.h 2010-02-10 11:23:26.552951978 -0800 *************** *** 66,71 **** @@ -799,9 +756,7 @@ ** Working definitions. */ -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: common_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: common_old.h -diff -rc src/src/libscotch/dummysizes.c /home/jschierm/Libs/scotch_5.1/src/libscotch/dummysizes.c +diff -rc src/src/libscotch/dummysizes.c new/src/libscotch/dummysizes.c *** src/src/libscotch/dummysizes.c 2009-05-09 16:08:02.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/dummysizes.c 2009-08-20 10:23:00.204162919 -0700 +--- new/src/libscotch/dummysizes.c 2010-02-10 11:23:26.558951985 -0800 *************** *** 267,271 **** @@ -814,8 +769,7 @@ + #endif /* MATLAB */ } -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: dummysizes_old.c -diff -rc src/src/libscotch/graph.c /home/jschierm/Libs/scotch_5.1/src/libscotch/graph.c +diff -rc src/src/libscotch/graph.c new/src/libscotch/graph.c *** src/src/libscotch/graph.c 2008-05-22 06:44:42.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/graph.c 2009-12-11 11:17:23.319268242 -0800 +--- new/src/libscotch/graph.c 2010-02-10 11:23:26.564951992 -0800 *************** *** 135,141 **** @@ -838,7 +792,7 @@ if ((grafptr->edlotax != NULL) && ((grafptr->flagval & GRAPHEDGEGROUP) == 0)) -diff -rc src/src/libscotch/graph.h /home/jschierm/Libs/scotch_5.1/src/libscotch/graph.h +diff -rc src/src/libscotch/graph.h new/src/libscotch/graph.h *** src/src/libscotch/graph.h 2008-06-01 02:49:11.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/graph.h 2010-02-08 14:21:35.655766453 -0800 +--- new/src/libscotch/graph.h 2010-02-10 11:23:26.570951999 -0800 *************** *** 159,165 **** @@ -855,7 +809,7 @@ int graphSave (const Graph * const, FILE * const); Gnum graphBase (Graph * const, const Gnum); -diff -rc src/src/libscotch/graph_io.c /home/jschierm/Libs/scotch_5.1/src/libscotch/graph_io.c +diff -rc src/src/libscotch/graph_io.c new/src/libscotch/graph_io.c *** src/src/libscotch/graph_io.c 2008-05-22 06:44:42.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/graph_io.c 2010-02-09 09:33:53.440543871 -0800 +--- new/src/libscotch/graph_io.c 2010-02-10 11:23:26.577952008 -0800 *************** *** 86,92 **** @@ -1093,9 +1047,7 @@ } -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_io_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_io_save.c -diff -rc src/src/libscotch/graph_io_scot.c /home/jschierm/Libs/scotch_5.1/src/libscotch/graph_io_scot.c +diff -rc src/src/libscotch/graph_io_scot.c new/src/libscotch/graph_io_scot.c *** src/src/libscotch/graph_io_scot.c 2008-05-22 06:44:42.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/graph_io_scot.c 2010-02-08 14:40:05.279143819 -0800 +--- new/src/libscotch/graph_io_scot.c 2010-02-10 11:23:26.584952016 -0800 *************** *** 89,95 **** @@ -1112,10 +1064,7 @@ } -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_io_scot_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_old.h -diff -rc src/src/libscotch/library_arch.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_arch.c +diff -rc src/src/libscotch/library_arch.c new/src/libscotch/library_arch.c *** src/src/libscotch/library_arch.c 2008-05-22 06:44:42.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_arch.c 2010-02-08 15:41:48.114675458 -0800 +--- new/src/libscotch/library_arch.c 2010-02-10 11:23:26.605952040 -0800 *************** *** 120,128 **** @@ -1150,7 +1099,7 @@ /*+ This routine saves the given opaque -diff -rc src/src/libscotch/library_arch_f.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_arch_f.c +diff -rc src/src/libscotch/library_arch_f.c new/src/libscotch/library_arch_f.c *** src/src/libscotch/library_arch_f.c 2008-05-22 06:44:42.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_arch_f.c 2010-02-08 15:57:30.991794029 -0800 +--- new/src/libscotch/library_arch_f.c 2010-02-10 11:23:26.611952047 -0800 *************** *** 121,127 **** @@ -1167,9 +1116,7 @@ fclose (stream); /* This closes filenum too */ -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_arch_f_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_arch_old.c -diff -rc src/src/libscotch/library_error_exit.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_error_exit.c +diff -rc src/src/libscotch/library_error_exit.c new/src/libscotch/library_error_exit.c *** src/src/libscotch/library_error_exit.c 2009-01-20 00:36:33.000000000 -0800 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_error_exit.c 2009-08-20 10:35:56.268159643 -0700 +--- new/src/libscotch/library_error_exit.c 2010-02-10 11:23:26.617952054 -0800 *************** *** 114,119 **** @@ -1244,8 +1191,7 @@ + #endif /* MATLAB */ } -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_error_exit_old.c -diff -rc src/src/libscotch/library_graph.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph.c +diff -rc src/src/libscotch/library_graph.c new/src/libscotch/library_graph.c *** src/src/libscotch/library_graph.c 2008-05-22 07:28:12.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph.c 2010-02-08 15:40:32.323584768 -0800 +--- new/src/libscotch/library_graph.c 2010-02-10 11:23:26.623952061 -0800 *************** *** 137,143 **** @@ -1290,7 +1236,7 @@ /*+ This routine saves the contents of the given -diff -rc src/src/libscotch/library_graph_f.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_f.c +diff -rc src/src/libscotch/library_graph_f.c new/src/libscotch/library_graph_f.c *** src/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_f.c 2010-02-08 14:42:47.845342853 -0800 +--- new/src/libscotch/library_graph_f.c 2010-02-10 11:23:26.630952069 -0800 *************** *** 136,142 **** @@ -1307,8 +1253,7 @@ fclose (stream); /* This closes filenum too */ -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_graph_f_old.c -diff -rc src/src/libscotch/library_graph_map.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_map.c +diff -rc src/src/libscotch/library_graph_map.c new/src/libscotch/library_graph_map.c *** src/src/libscotch/library_graph_map.c 2008-09-28 04:04:05.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_map.c 2010-02-08 14:48:10.401735571 -0800 +--- new/src/libscotch/library_graph_map.c 2010-02-10 11:23:26.635952075 -0800 *************** *** 182,192 **** @@ -1333,7 +1278,7 @@ /*+ This routine computes a mapping -diff -rc src/src/libscotch/library_graph_map_f.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_map_f.c +diff -rc src/src/libscotch/library_graph_map_f.c new/src/libscotch/library_graph_map_f.c *** src/src/libscotch/library_graph_map_f.c 2008-06-28 03:44:26.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_map_f.c 2010-02-08 15:01:51.742742812 -0800 +--- new/src/libscotch/library_graph_map_f.c 2010-02-10 11:23:26.642952083 -0800 *************** *** 183,189 **** @@ -1350,10 +1295,7 @@ fclose (stream); /* This closes filenum too */ -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_graph_map_f_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_graph_map_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_graph_old.c -diff -rc src/src/libscotch/library.h /home/jschierm/Libs/scotch_5.1/src/libscotch/library.h +diff -rc src/src/libscotch/library.h new/src/libscotch/library.h *** src/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/library.h 2010-02-08 15:08:39.121250004 -0800 +--- new/src/libscotch/library.h 2010-02-10 11:23:26.648952090 -0800 *************** *** 134,140 **** @@ -1398,8 +1340,7 @@ int SCOTCH_graphMapCompute (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Strat * const); int SCOTCH_graphMap (const SCOTCH_Graph * const, const SCOTCH_Arch * const, const SCOTCH_Strat * const, SCOTCH_Num * const); -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_old.h -diff -rc src/src/libscotch/Makefile /home/jschierm/Libs/scotch_5.1/src/libscotch/Makefile +diff -rc src/src/libscotch/Makefile new/src/libscotch/Makefile *** src/src/libscotch/Makefile 2009-05-09 16:08:04.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/Makefile 2010-02-10 10:20:55.219532741 -0800 +--- new/src/libscotch/Makefile 2010-02-19 15:46:06.253243103 -0800 *************** *** 49,55 **** @@ -1426,5 +1367,5 @@ + mexscotch : clean -+ $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I/usr/local/pkgs/matlab-7.6/extern/include" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,/usr/local/pkgs/matlab-7.6/bin/glnxa64 -L/usr/local/pkgs/matlab-7.6/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch \ ++ $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch \ + scotch.h \ + scotchf.h \ @@ -1436,8 +1377,7 @@ -$(CP) scotch.h scotchf.h $(includedir) -$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir) -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: Makefile_old -diff -rc src/src/libscotch/mapping.h /home/jschierm/Libs/scotch_5.1/src/libscotch/mapping.h +diff -rc src/src/libscotch/mapping.h new/src/libscotch/mapping.h *** src/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/mapping.h 2010-02-08 14:49:15.141814037 -0800 +--- new/src/libscotch/mapping.h 2010-02-10 11:23:26.662952107 -0800 *************** *** 106,112 **** @@ -1454,7 +1394,7 @@ #undef static -diff -rc src/src/libscotch/mapping_io.c /home/jschierm/Libs/scotch_5.1/src/libscotch/mapping_io.c +diff -rc src/src/libscotch/mapping_io.c new/src/libscotch/mapping_io.c *** src/src/libscotch/mapping_io.c 2008-05-22 06:44:43.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/mapping_io.c 2010-02-08 14:59:13.768544543 -0800 +--- new/src/libscotch/mapping_io.c 2010-02-10 11:23:26.667952113 -0800 *************** *** 199,204 **** @@ -1543,9 +1483,7 @@ return (0); } -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: mapping_io_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: mapping_old.h -diff -rc src/src/libscotch/mesh_io_scot.c /home/jschierm/Libs/scotch_5.1/src/libscotch/mesh_io_scot.c +diff -rc src/src/libscotch/mesh_io_scot.c new/src/libscotch/mesh_io_scot.c *** src/src/libscotch/mesh_io_scot.c 2008-05-22 06:44:43.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/libscotch/mesh_io_scot.c 2010-02-08 14:41:47.841269476 -0800 +--- new/src/libscotch/mesh_io_scot.c 2010-02-10 11:23:26.673952120 -0800 *************** *** 85,91 **** @@ -1562,9 +1500,7 @@ } -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: mesh_io_scot_old.c -Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: scotch_old.h -diff -rc src/src/Makefile /home/jschierm/Libs/scotch_5.1/src/Makefile +diff -rc src/src/Makefile new/src/Makefile *** src/src/Makefile 2008-09-15 05:50:51.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/Makefile 2010-02-10 09:41:16.791255216 -0800 +--- new/src/Makefile 2010-02-10 11:23:26.678952125 -0800 *************** *** 97,102 **** @@ -1580,25 +1516,9 @@ -$(CP) -f ../bin/[agm]*$(EXE) $(bindir) -$(CP) -f ../include/*scotch*.h $(includedir) -Only in /home/jschierm/Libs/scotch_5.1/src: Makefile.inc -Only in /home/jschierm/Libs/scotch_5.1/src: Makefile_old -Only in /home/jschierm/Libs/scotch_5.1/src: Makefile_old2.inc -Only in /home/jschierm/Libs/scotch_5.1/src: Makefile_old3.inc -Only in /home/jschierm/Libs/scotch_5.1/src: Makefile_old.inc -Only in /home/jschierm/Libs/scotch_5.1/src: make.out -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: acpl.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_ccc.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_fft2.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_grf.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_hy.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_m2.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_p2.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: atst.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: gbase.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: gcv.mexa64 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: gmap_mex.c -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: gmap_mex_old.c -diff -rc src/src/scotch/Makefile /home/jschierm/Libs/scotch_5.1/src/scotch/Makefile +Only in new/src: Makefile.inc +Only in new/src/scotch: gmap_mex.c +diff -rc src/src/scotch/Makefile new/src/scotch/Makefile *** src/src/scotch/Makefile 2009-04-27 02:19:43.000000000 -0700 ---- /home/jschierm/Libs/scotch_5.1/src/scotch/Makefile 2010-02-10 10:17:04.854221946 -0800 +--- new/src/scotch/Makefile 2010-02-19 15:47:58.973374370 -0800 *************** *** 49,59 **** @@ -1636,5 +1556,5 @@ + mexscotch : clean -+ $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I/usr/local/pkgs/matlab-7.6/extern/include" CC="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,/usr/local/pkgs/matlab-7.6/bin/glnxa64 -L/usr/local/pkgs/matlab-7.6/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch \ ++ $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch \ + gmap_mex$(MEX) + @@ -1671,7 +1591,2 @@ + $(libdir)/libscotcherrexit$(LIB) \ + gmap.h -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: Makefile_old -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: Makefile_old2 -Only in /home/jschierm/Libs/scotch_5.1/src/scotch: Makefile_old3 -Only in /home/jschierm/Libs/scotch_5.1/src: scotch_jes_notes.txt -Only in /home/jschierm/Libs/scotch_5.1/src: scotch_README.txt