source: issm/oecreview/Archive/21724-22754/ISSM-21904-21905.diff@ 22755

../trunk-jpl/etc/environment.sh

@@ -96 +96 @@
         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"
 

../trunk-jpl/m4/issm_options.m4

@@ -713 +713 @@
         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])

../trunk-jpl/externalpackages/scotch/scotch.patch

@@ -2226 +2226 @@
 --- 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;

../trunk-jpl/src/m/partition/partitioner.m

@@ -40 +40 @@
         md.mesh.numberofelements=md.mesh.numberofelements2d;
         md.qmu.vertex_weight=[];
         md.mesh.vertexconnectivity=[];
+        recomputeadjacency='on';
 end
 
 %adjacency matrix if needed:
@@ -79 +80 @@
         %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'),