Index: /issm/trunk/externalpackages/meshpart/install.sh =================================================================== --- /issm/trunk/externalpackages/meshpart/install.sh (revision 3058) +++ /issm/trunk/externalpackages/meshpart/install.sh (revision 3059) @@ -14,5 +14,5 @@ tar -xvzf metismex-4.0.tar.gz -C meshpart/metis #proto.h in metis library is not patched, at least for metismex, so create a local version -cp ../metis/install/Lib/proto.h meshpart/metis +cp ${METIS_DIR}/Lib/proto.h meshpart/metis # Move meshpart to src directory @@ -30,5 +30,6 @@ #proto.h in metis library is not patched, at least for metismex, so link with local version #mex -I../../../metis/install/Lib -L../../../metis/install -lmetis -largeArrayDims metismex.c -mex -I. -I../../../metis/install/Lib -L../../../metis/install -lmetis -largeArrayDims metismex.c +#mex -I. -I../../../metis/install/Lib -L../../../metis/install -lmetis -largeArrayDims metismex.c +${MATLAB_DIR}/bin/mex -I. -I${METIS_DIR}/Lib -L${METIS_DIR} -lmetis -largeArrayDims metismex.c mv metismex.mex* .. cd ../.. Index: /issm/trunk/externalpackages/meshpart/meshpart.patch =================================================================== --- /issm/trunk/externalpackages/meshpart/meshpart.patch (revision 3058) +++ /issm/trunk/externalpackages/meshpart/meshpart.patch (revision 3059) @@ -1,6 +1,5 @@ -Only in /home/jschierm/Libs/meshpart: adjacency_matrix.m -diff -rc src/chaco/Makefile /home/jschierm/Libs/meshpart/chaco/Makefile +diff -rc src/chaco/Makefile new/chaco/Makefile *** src/chaco/Makefile 1998-07-06 13:08:26.000000000 -0700 ---- /home/jschierm/Libs/meshpart/chaco/Makefile 2010-02-10 15:20:30.140413675 -0800 +--- new/chaco/Makefile 2010-02-19 15:09:04.165652259 -0800 *************** *** 24,51 **** @@ -33,10 +32,11 @@ CHFILES.c= ${CHACO}/main/interface.c \ ${CHACO}/main/main.c \ ---- 24,58 ---- +--- 24,59 ---- # See file ../copyright.m for complete copyright and licensing notice. #MATLAB = /import/matlab ! #MATLAB = /usr/local/libexec/matlab -! MATLAB = /usr/local/pkgs/matlab-7.6 +! #MATLAB = /usr/local/pkgs/matlab-7.6 +! MATLAB = ${MATLAB_DIR} #CHACO = /project/sparse/chaco/version2/code @@ -71,5 +71,5 @@ *************** *** 53,64 **** ---- 60,73 ---- +--- 61,74 ---- ${CHACO}/submain/divide.c \ ${CHACO}/submain/submain.c \ @@ -111,5 +111,5 @@ ${CHACO}/connect/connected.c \ ${CHACO}/connect/find_edges.c \ ---- 98,123 ---- +--- 99,124 ---- ${CHACO}/klvspiff/coarsen_klv.c \ ${CHACO}/klvspiff/countup_vtx_sep.c \ @@ -140,5 +140,5 @@ *************** *** 232,237 **** ---- 244,250 ---- +--- 245,251 ---- ${CHACO}/util/normalize.c \ ${CHACO}/util/mergesort.c \ @@ -150,5 +150,5 @@ *************** *** 243,248 **** ---- 256,263 ---- +--- 257,264 ---- ${CHACO}/util/vecout.c \ ${CHACO}/util/vecran.c \ @@ -169,5 +169,5 @@ chaco.a: ${CHFILES.o} ---- 267,278 ---- +--- 268,279 ---- # ${MATLAB}/bin/cmex CC='gcc -G' -lm ${OFLAGS} ${MLFILES.o} chaco.a; \ # mv mlchaco.mex* ${DEST_DIR} @@ -178,13 +178,11 @@ + mlchaco: ${MLFILES.c} chaco.a Makefile -! mex -output mlchaco -largeArrayDims -DMATLAB ${MLFILES.c} chaco.a -I${CHACO}/main +! ${MATLAB}/bin/mex -output mlchaco -largeArrayDims -DMATLAB ${MLFILES.c} chaco.a -I${CHACO}/main mv mlchaco.mex* ${DEST_DIR} chaco.a: ${CHFILES.o} -Only in /home/jschierm/Libs/meshpart/chaco: Makefile_old -Only in /home/jschierm/Libs/meshpart/chaco: Makefile_old2 -diff -rc src/chaco/mlchaco.c /home/jschierm/Libs/meshpart/chaco/mlchaco.c +diff -rc src/chaco/mlchaco.c new/chaco/mlchaco.c *** src/chaco/mlchaco.c 1999-07-23 12:19:09.000000000 -0700 ---- /home/jschierm/Libs/meshpart/chaco/mlchaco.c 2009-07-29 15:22:23.507525662 -0700 +--- new/chaco/mlchaco.c 2010-02-10 15:31:43.903181816 -0800 *************** *** 32,37 **** @@ -335,10 +333,7 @@ if (ewgts != NULL) mxFree((char *) ewgts); if (x != NULL) mxFree((char *) x); -Only in /home/jschierm/Libs/meshpart/chaco: mlchaco_jes_notes.txt -Only in /home/jschierm/Libs/meshpart/chaco: mlchaco_old.c -Only in /home/jschierm/Libs/meshpart/chaco: mlchaco_README.txt -diff -rc src/chaco.m /home/jschierm/Libs/meshpart/chaco.m +diff -rc src/chaco.m new/chaco.m *** src/chaco.m 1999-07-23 12:13:26.000000000 -0700 ---- /home/jschierm/Libs/meshpart/chaco.m 2009-07-29 14:58:33.872207593 -0700 +--- new/chaco.m 2010-02-10 15:31:43.909181823 -0800 *************** *** 142,148 **** @@ -359,8 +354,7 @@ else vwgts = []; -Only in /home/jschierm/Libs/meshpart: chaco_old.m -diff -rc src/fiedler.m /home/jschierm/Libs/meshpart/fiedler.m +diff -rc src/fiedler.m new/fiedler.m *** src/fiedler.m 1996-02-23 10:03:20.000000000 -0800 ---- /home/jschierm/Libs/meshpart/fiedler.m 2009-07-13 14:25:59.000000000 -0700 +--- new/fiedler.m 2010-02-10 15:31:43.914181829 -0800 *************** *** 58,64 **** @@ -384,8 +378,7 @@ R = chol(L-shift*I); Rt = R'; -Only in /home/jschierm/Libs/meshpart: fiedler_old.m -diff -rc src/meshdemo.m /home/jschierm/Libs/meshpart/meshdemo.m +diff -rc src/meshdemo.m new/meshdemo.m *** src/meshdemo.m 2002-02-08 07:38:21.000000000 -0800 ---- /home/jschierm/Libs/meshpart/meshdemo.m 2009-07-15 15:43:09.303210082 -0700 +--- new/meshdemo.m 2010-02-10 15:31:43.920181835 -0800 *************** *** 97,103 **** @@ -405,10 +398,7 @@ disp(' '); disp(' Next is multilevel Kernighan-Lin partitioning, which first partitions'); -Only in /home/jschierm/Libs/meshpart: meshdemo_old.m -Only in /home/jschierm/Libs/meshpart: meshpart_notes_jes.txt -Only in /home/jschierm/Libs/meshpart: meshpart_README.txt -diff -rc src/metis/metismex.c /home/jschierm/Libs/meshpart/metis/metismex.c +diff -rc src/metis/metismex.c new/metis/metismex.c *** src/metis/metismex.c 2009-07-13 14:37:08.000000000 -0700 ---- /home/jschierm/Libs/meshpart/metis/metismex.c 2009-07-14 15:07:30.187491787 -0700 +--- new/metis/metismex.c 2010-02-10 15:31:43.926181842 -0800 *************** *** 92,98 **** @@ -430,7 +420,8 @@ /* Find MATLAB's matrix structure */ -diff -rc src/metis/proto.h /home/jschierm/Libs/meshpart/metis/proto.h +Only in new/metis: metismex.mexa64 +diff -rc src/metis/proto.h new/metis/proto.h *** src/metis/proto.h 2009-09-22 17:24:29.402085000 -0700 ---- /home/jschierm/Libs/meshpart/metis/proto.h 2010-02-10 14:28:26.558752000 -0800 +--- new/metis/proto.h 2010-02-10 15:31:43.932181849 -0800 *************** *** 230,237 **** @@ -472,11 +463,4 @@ -Only in src: metismex.dll -Only in src: metismex.m -Only in /home/jschierm/Libs/meshpart: metismex.mexa64 -Only in src: metismex.mexsol -Only in /home/jschierm/Libs/meshpart: metismex_notes_jes.txt -Only in /home/jschierm/Libs/meshpart: metismex_old.c -Only in /home/jschierm/Libs/meshpart: metismex_README.txt -Only in /home/jschierm/Libs/meshpart: mlchaco.mexa64 -Only in /home/jschierm/Libs/meshpart: User_Params +Only in new: metismex.mexa64 +Only in new: mlchaco.mexa64