Index: /issm/trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp	(revision 13224)
+++ /issm/trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp	(revision 13225)
@@ -5,23 +5,21 @@
 #include "./TriMeshProcessRifts.h"
 
-void mexFunction(	int nlhs, mxArray* plhs[],
-					int nrhs, const mxArray* prhs[] ) {
-
+void mexFunction(	int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[] ){
 
 	/*Matlab arrays: */
-	mxArray* pmxa_array=NULL;
-	mxArray* pmxa_array2=NULL;
-	mxArray* pmxa_array3=NULL;
+	mxArray *pmxa_array  = NULL;
+	mxArray *pmxa_array2 = NULL;
+	mxArray *pmxa_array3 = NULL;
 	int i,j,k,counter;
 	
 	/* returned quantities: */
 	int      out_numrifts;
-	int*     out_riftsnumsegments=NULL;
-	double** out_riftssegments=NULL; 
-	int*     out_riftsnumpairs=NULL;
-	double** out_riftspairs=NULL;
-	double*  out_riftstips=NULL;
-	double** out_riftspenaltypairs=NULL;
-	int*     out_riftsnumpenaltypairs=NULL;
+	int     *out_riftsnumsegments     = NULL;
+	double **out_riftssegments        = NULL;
+	int     *out_riftsnumpairs        = NULL;
+	double **out_riftspairs           = NULL;
+	double  *out_riftstips            = NULL;
+	double **out_riftspenaltypairs    = NULL;
+	int     *out_riftsnumpenaltypairs = NULL;
 
 	/*empty rifts structure: */
@@ -34,20 +32,19 @@
 	
 	/* input: */
-	double* tindex_in=NULL;
-	double* index_in=NULL;
+	double *tindex_in = NULL;
+	double *index_in  = NULL;
 	int     nel;
-	double* x_inm=NULL; //matlab vector
-	double* x_in=NULL; //copy of matlab vector
+	double *x_inm = NULL; //matlab vector
+	double *x_in  = NULL; //copy of matlab vector
 	int     nods;
-	double* y_inm=NULL;//matlab vector
-	double* y_in=NULL;//copy of matlab vector
-	double* tsegments_in=NULL;
-	double* segments_in=NULL;
-	double* tsegmentmarkers_in=NULL;
-	double* segmentmarkers_in=NULL;
+	double *y_inm              = NULL; //matlab vector
+	double *y_in               = NULL; //copy of matlab vector
+	double *tsegments_in       = NULL;
+	double *segments_in        = NULL;
+	double *tsegmentmarkers_in = NULL;
+	double *segmentmarkers_in  = NULL;
 
 	/* state: */
-	double* state=NULL;
-
+	double *state = NULL;
 	int     num_seg;
 
@@ -57,5 +54,5 @@
 
 	/* verify correct usage: */
-	if (nlhs==0 && nrhs==0) {
+	if (nlhs==0 && nrhs==0){
 		/* special case: */
 		TriMeshProcessRiftsUsage();
@@ -169,41 +166,11 @@
 	/*Output : */
 	WriteData(&plhs[0],index_in,nel,3);
-	//pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
-	//mxSetM(pmxa_array,3);
-	//mxSetN(pmxa_array,nel);
-	//mxSetPr(pmxa_array,index_in);
-	//mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, "transpose");
-
 	WriteData(&plhs[1],x_in,nods,1);
-	//pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
-	//mxSetM(pmxa_array,1);
-	//mxSetN(pmxa_array,nods);
-	//mxSetPr(pmxa_array,x_in);
-	//mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, "transpose");
-
 	WriteData(&plhs[2],y_in,nods,1);
-	//pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
-	//mxSetM(pmxa_array,1);
-	//mxSetN(pmxa_array,nods);
-	//mxSetPr(pmxa_array,y_in);
-	//mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, "transpose");
-
 	WriteData(&plhs[3],segments_in,num_seg,3);
-//pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
-//mxSetM(pmxa_array,3);
-//mxSetN(pmxa_array,num_seg);
-//mxSetPr(pmxa_array,segments_in);
-//mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, "transpose");
-
 	WriteData(&plhs[4],segmentmarkers_in,num_seg,1);
-	//pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
-	//mxSetM(pmxa_array,1);
-	//mxSetN(pmxa_array,num_seg);
-	//mxSetPr(pmxa_array,segmentmarkers_in);
-	//mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, "transpose");
 
 	if(riftflag){
 		/*Create a structure rifts where if i is a rift number, we have the following fields rifts(i).segments and rifts(i).numsegs: */
-
 		fnames[0] = "numsegs";
 		fnames[1] = "segments";
@@ -225,9 +192,4 @@
 			/*Segments: */
 			WriteData(&pmxa_array3,out_riftssegments[i],out_riftsnumsegments[i],3);
-			//pmxa_array2= mxCreateDoubleMatrix(0,0,mxREAL);
-			//mxSetM(pmxa_array2,3);
-			//mxSetN(pmxa_array2,out_riftsnumsegments[i]);
-			//mxSetPr(pmxa_array2,out_riftssegments[i]);
-			//mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, "transpose");
 			mxSetField(pmxa_array,i,"segments",pmxa_array3);
 			mxSetField(pmxa_array,i,"numsegs",mxCreateDoubleScalar((double)out_riftsnumsegments[i]));
@@ -235,9 +197,4 @@
 			/*Element pairs: */
 			WriteData(&pmxa_array3,out_riftspairs[i],out_riftsnumpairs[i],2);
-			//pmxa_array2= mxCreateDoubleMatrix(0,0,mxREAL);
-			//mxSetM(pmxa_array2,2);
-			//mxSetN(pmxa_array2,out_riftsnumpairs[i]);
-			//mxSetPr(pmxa_array2,out_riftspairs[i]);
-			//mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, "transpose");
 			mxSetField(pmxa_array,i,"pairs",pmxa_array3);
 
@@ -254,9 +211,4 @@
 			/*Penalty pairs: */
 			WriteData(&pmxa_array3,out_riftspenaltypairs[i],out_riftsnumpenaltypairs[i],7);
-			//pmxa_array2= mxCreateDoubleMatrix(0,0,mxREAL);
-			//mxSetM(pmxa_array2,7);
-			//mxSetN(pmxa_array2,out_riftsnumpenaltypairs[i]);
-			//mxSetPr(pmxa_array2,out_riftspenaltypairs[i]);
-			//mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, "transpose");
 			mxSetField(pmxa_array,i,"penaltypairs",pmxa_array3);
 
@@ -294,7 +246,5 @@
 }
 
-
-void TriMeshProcessRiftsUsage(void)
-{
+void TriMeshProcessRiftsUsage(void){
 	_printLine_("");
 	_printLine_("   usage: [index2,x2,y2,segments2,segmentmarkers2,rifts2]=TriMeshProcessrifts(index1,x1,y1,segments1,segmentmarkers1) ");