Changeset 3648

Timestamp:

04/30/10 14:49:35 (15 years ago)

Author:

jschierm

Message:

Scotch: removed status output and instead emptied maptab output to avoid matlab missing output warning.

Location:

issm/trunk/externalpackages/scotch

Files:

• gmap.m (modified) (4 diffs)
• gmap_mex.c (modified) (5 diffs)

issm/trunk/externalpackages/scotch/gmap.m

@@ -2 +2 @@
 %  function to call the gmap module of the scotch partitioner.
 %
-%  [status,maptab]=gmap(adj_mat,vlist,vwgt,ewgt,atype,apar,...
-%                       options)
+%  [maptab]=gmap(adj_mat,vlist,vwgt,ewgt,atype,apar,...
+%                options)
 %
 %  where the required input is:
@@ -30 +30 @@
 %
 %  the required output is:
-%    status     (double, return code from gmap)
 %    maptab     (double [nv x 2], vertex labels and partitions)
 %
@@ -48 +47 @@
 %               "See default strategy with option '-vs'"
 %
-function [status,maptab]=gmap(adj_mat,vlist,vwgt,ewgt,atype,apars,...
-                              varargin)
+function [maptab]=gmap(adj_mat,vlist,vwgt,ewgt,atype,apars,...
+                       varargin)
 
 if ~nargin
@@ -59 +58 @@
 clear gmap_mex
 
-[status,maptab]=gmap_mex(adj_mat,vlist,vwgt,ewgt,atype,apars,...
-                         varargin{:});
+[maptab]=gmap_mex(adj_mat,vlist,vwgt,ewgt,atype,apars,...
+                  varargin{:});
 
+%  doesn't hurt to clear out after every run, too
 clear gmap_mex
 

issm/trunk/externalpackages/scotch/gmap_mex.c

@@ -33 +33 @@
 /* Output Arguments */
 
-#define RETURN_OUT plhs[0]
-#define MAPTAB_OUT plhs[1]
+#define MAPTAB_OUT plhs[0]
 
 
@@ -82 +81 @@
                 return;
         }
-        else if (nrhs <  6 || nlhs >  2) {
+        else if (nrhs <  6 || nlhs >  1) {
                 GmapUsage();
                 mexErrMsgTxt(" ");
@@ -237 +236 @@
                 free(maptabi);
         }
+        else {
+                MAPTAB_OUT=mxCreateDoubleMatrix(0, 2, mxREAL);
+        }
 
         if (argvm)
@@ -249 +251 @@
         if (adjir)   free(adjir);
 
-        RETURN_OUT=mxCreateDoubleMatrix(1, 1, mxREAL);
-        *mxGetPr(RETURN_OUT)=ierr;
-
         return;
 }
@@ -259 +258 @@
 
     mexPrintf("\n");
-    mexPrintf("Usage: [return,maptab]=Gmap_mex(adjmat,vertlb,vertwt,edgewt,archtyp,archpar,\n");
-    mexPrintf("                                Scotch-specific parameters);\n");
+    mexPrintf("Usage: [maptab]=Gmap_mex(adjmat,vertlb,vertwt,edgewt,archtyp,archpar,\n");
+    mexPrintf("                         Scotch-specific parameters);\n");
     mexPrintf("\n");