Index: ../trunk-jpl/etc/environment.sh =================================================================== --- ../trunk-jpl/etc/environment.sh (revision 21904) +++ ../trunk-jpl/etc/environment.sh (revision 21905) @@ -96,6 +96,9 @@ libpathappend "$PETSC_DIR/lib" fi +SCOTCH_DIR="$ISSM_DIR/externalpackages/scotch/install" +libpathappend "$SCOTCH_DIR/lib" + SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install" libpathappend "$SLEPC_DIR/lib" Index: ../trunk-jpl/m4/issm_options.m4 =================================================================== --- ../trunk-jpl/m4/issm_options.m4 (revision 21904) +++ ../trunk-jpl/m4/issm_options.m4 (revision 21905) @@ -713,7 +713,7 @@ dnl scotch libraries if test "x$HAVE_SCOTCH" = "xyes"; then SCOTCHINCL="-DNOFILEIO -I$SCOTCH_ROOT/include -DSCOTCH_VERSION=\\\"UNKNOWN\\\"" - SCOTCHLIB="-L$SCOTCH_ROOT/lib -lnfioscotch -lnfioscotcherr -lnfioscotcherrexit -lscotchmetis" + SCOTCHLIB="-L$SCOTCH_ROOT/lib -lnfioscotch -lnfioscotcherr -lnfioscotcherrexit " AC_DEFINE([_HAVE_SCOTCH_],[1],[with Scotch in ISSM src]) AC_SUBST([SCOTCHINCL]) AC_SUBST([SCOTCHLIB]) Index: ../trunk-jpl/externalpackages/scotch/scotch.patch =================================================================== --- ../trunk-jpl/externalpackages/scotch/scotch.patch (revision 21904) +++ ../trunk-jpl/externalpackages/scotch/scotch.patch (revision 21905) @@ -2226,12 +2226,11 @@ --- src/src/libscotch/parser_ll.l 2013-05-06 14:14:21.000000000 -0700 *************** *** 192,197 **** ---- 192,214 ---- +--- 192,213 ---- stratParserInit ( const char * const string) /*+ Strategy string to parse +*/ { + /* reset static variables from previous runs (jes, 4/29/10) */ -+ yy_current_buffer = 0; + yy_hold_char = (char) 0; + yy_n_chars=0; /* number of characters read into yy_ch_buf */ + yy_c_buf_p = (char *) 0; Index: ../trunk-jpl/src/m/partition/partitioner.m =================================================================== --- ../trunk-jpl/src/m/partition/partitioner.m (revision 21904) +++ ../trunk-jpl/src/m/partition/partitioner.m (revision 21905) @@ -40,6 +40,7 @@ md.mesh.numberofelements=md.mesh.numberofelements2d; md.qmu.vertex_weight=[]; md.mesh.vertexconnectivity=[]; + recomputeadjacency='on'; end %adjacency matrix if needed: @@ -79,10 +80,12 @@ %are we using weights? if strcmpi(getfieldvalue(options,'weighting'),'on'), weights=floor(md.qmu.vertex_weight/min(md.qmu.vertex_weight)); + else + weights=[]; end maptab=Scotch(md.qmu.adjacency,[],weights,[],'cmplt',[npart]); - part=maptab(:,2);%index partitions from 1 up. like metis. + part=maptab(:,2)+1;%index partitions from 1 up. like metis. elseif strcmpi(package,'linear'),