Changeset 21905

Timestamp:

08/01/17 15:54:00 (8 years ago)

Author:

schlegel

Message:

CHG: minor updates for scotch package

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/scotch/scotch.patch (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)
• src/m/partition/partitioner.m (modified) (2 diffs)

issm/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"

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

@@ -2227 +2227 @@
 ***************
 *** 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 */

issm/trunk-jpl/m4/issm_options.m4 ¶

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

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

@@ -41 +41 @@
         md.qmu.vertex_weight=[];
         md.mesh.vertexconnectivity=[];
+        recomputeadjacency='on';
 end
 
@@ -80 +81 @@
         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'),