Index: /issm/trunk/src/mex/Scotch/Scotch.cpp
===================================================================
--- /issm/trunk/src/mex/Scotch/Scotch.cpp	(revision 4710)
+++ /issm/trunk/src/mex/Scotch/Scotch.cpp	(revision 4711)
@@ -61,5 +61,5 @@
 		strcpy(argvm[isi],"gmap");
 		mexPrintf("%s -- Using \"%s\" entry point.\n",
-				  THISFUNCTION,argvm[isi]);
+				  __FUNCT__,argvm[isi]);
 		isi++;
 	}
@@ -68,5 +68,5 @@
 		strcpy(argvm[isi],"gpart");
 		mexPrintf("%s -- Using \"%s\" entry point.\n",
-				  THISFUNCTION,argvm[isi]);
+				  __FUNCT__,argvm[isi]);
 		isi++;
 
@@ -74,5 +74,5 @@
 		sprintf(argvm[isi],"%d",(int)mxGetScalar(prhs[imi]));
 		mexPrintf("%s -- Number of parts is %s.\n",
-				  THISFUNCTION,argvm[isi]);
+				  __FUNCT__,argvm[isi]);
 		isi++;
 		imi++;
@@ -80,5 +80,5 @@
 
 	if (!mxIsNumeric(prhs[imi]) || (!mxIsEmpty(prhs[imi]) && !mxIsSparse(prhs[imi]))) {
-		mexPrintf("%s -- Adjacency matrix must be numeric and sparse.\n",THISFUNCTION);
+		mexPrintf("%s -- Adjacency matrix must be numeric and sparse.\n",__FUNCT__);
 		mexErrMsgTxt(" ");
 	}
@@ -99,10 +99,10 @@
 		}
 		mexPrintf("%s -- Adjacency matrix is of size %d by %d with %d non-zeroes.\n",
-				  THISFUNCTION,mxGetM(prhs[imi]),mxGetN(prhs[imi]),mxGetNzmax(prhs[imi]));
+				  __FUNCT__,mxGetM(prhs[imi]),mxGetN(prhs[imi]),mxGetNzmax(prhs[imi]));
 	}
 	imi++;
 
 	if (!mxIsNumeric(prhs[imi])) {
-		mexPrintf("%s -- Vertex label vector must be numeric.\n",THISFUNCTION);
+		mexPrintf("%s -- Vertex label vector must be numeric.\n",__FUNCT__);
 		mexErrMsgTxt(" ");
 	}
@@ -115,10 +115,10 @@
 		}
 		mexPrintf("%s -- Vertex label vector is of size %d by %d.\n",
-				  THISFUNCTION,mxGetM(prhs[imi]),mxGetN(prhs[imi]));
+				  __FUNCT__,mxGetM(prhs[imi]),mxGetN(prhs[imi]));
 	}
 	imi++;
 
 	if (!mxIsNumeric(prhs[imi])) {
-		mexPrintf("%s -- Vertex weight vector must be numeric.\n",THISFUNCTION);
+		mexPrintf("%s -- Vertex weight vector must be numeric.\n",__FUNCT__);
 		mexErrMsgTxt(" ");
 	}
@@ -131,10 +131,10 @@
 		}
 		mexPrintf("%s -- Vertex weight vector is of size %d by %d.\n",
-				  THISFUNCTION,mxGetM(prhs[imi]),mxGetN(prhs[imi]));
+				  __FUNCT__,mxGetM(prhs[imi]),mxGetN(prhs[imi]));
 	}
 	imi++;
 
 	if (!mxIsNumeric(prhs[imi]) || (!mxIsEmpty(prhs[imi]) && !mxIsSparse(prhs[imi]))) {
-		mexPrintf("%s -- Edge weight matrix must be numeric and sparse.\n",THISFUNCTION);
+		mexPrintf("%s -- Edge weight matrix must be numeric and sparse.\n",__FUNCT__);
 		mexErrMsgTxt(" ");
 	}
@@ -147,5 +147,5 @@
 		}
 		mexPrintf("%s -- Edge weight matrix is of size %d by %d with %d non-zeroes.\n",
-				  THISFUNCTION,mxGetM(prhs[imi]),mxGetN(prhs[imi]),mxGetNzmax(prhs[imi]));
+				  __FUNCT__,mxGetM(prhs[imi]),mxGetN(prhs[imi]),mxGetNzmax(prhs[imi]));
 	}
 	imi++;
@@ -154,5 +154,5 @@
 		  (strncmp (argvm[0] + strlen (argvm[0]) - 5, "gpart", 5) == 0))) {
 		if (!mxIsChar(prhs[imi])) {
-			mexPrintf("%s -- Architecture type must be character.\n",THISFUNCTION);
+			mexPrintf("%s -- Architecture type must be character.\n",__FUNCT__);
 			mexErrMsgTxt(" ");
 		}
@@ -163,10 +163,10 @@
 			}
 			mexPrintf("%s -- Architecture type is \"%s\".\n",
-					  THISFUNCTION,archtyp);
+					  __FUNCT__,archtyp);
 		}
 		imi++;
 
 		if (!mxIsNumeric(prhs[imi])) {
-			mexPrintf("%s -- Architecture parameter vector must be numeric.\n",THISFUNCTION);
+			mexPrintf("%s -- Architecture parameter vector must be numeric.\n",__FUNCT__);
 			mexErrMsgTxt(" ");
 		}
@@ -180,5 +180,5 @@
 			}
 			mexPrintf("%s -- Architecture parameter vector is of size %d by %d.\n",
-					  THISFUNCTION,mxGetM(prhs[imi]),mxGetN(prhs[imi]));
+					  __FUNCT__,mxGetM(prhs[imi]),mxGetN(prhs[imi]));
 		}
 		imi++;
@@ -187,5 +187,5 @@
 	while (imi < nrhs) {
 		if (!mxIsChar(prhs[imi])) {
-			mexPrintf("%s -- prhs[%d] must be character.\n",THISFUNCTION,imi);
+			mexPrintf("%s -- prhs[%d] must be character.\n",__FUNCT__,imi);
 			mexErrMsgTxt(" ");
 		}
@@ -218,5 +218,5 @@
 			   napar,
 			   api);
-	mexPrintf("%s -- Error %d from Gmapx.\n",THISFUNCTION,ierr);
+	mexPrintf("%s -- Error %d from Gmapx.\n",__FUNCT__,ierr);
 
 /*  for (i=0; i<nvert; i++)
@@ -233,5 +233,5 @@
 			for (i=0; i<nvert; i++)
 				maptabd[k++]=(double)maptabi[i][j];
-		free(maptabi);
+		//free(maptabi);
 	}
 	else {
@@ -240,5 +240,5 @@
 	imo++;
 
-	if (argvm)
+	/*if (argvm)
 		for (i=argcm-1; i>=0; i--)
 			free(argvm[i]);
@@ -249,5 +249,5 @@
 	if (vli)     free(vli);
 	if (adjjc)   free(adjjc);
-	if (adjir)   free(adjir);
+	if (adjir)   free(adjir);*/
 
 	return;