Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h	(revision 12507)
@@ -49,12 +49,12 @@
 /* _printLine_ {{{*/
 /* macro to print a line, adds std::endl */
 #define _printLine_(StreamArgs)\
-   {std::cout << StreamArgs << std::endl;}
+   do{std::cout << StreamArgs << std::endl;}while(0)
 /*}}}*/
 /* _printString_ {{{*/
 /* macro to print some string, adds std::ends */
 #define _printString_(StreamArgs)\
-   {std::cout << StreamArgs;}
+   do{std::cout << StreamArgs;}while(0)
 /*}}}*/
 /* _assert_ {{{*/
 /*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp	(revision 12507)
@@ -14,6 +14,7 @@
 #include "../../io/io.h"
 #include "../../shared/shared.h"
 #include <float.h>
+#include <iomanip>
 
 void BrentSearch(IssmDouble* psearch_scalar,IssmDouble* pJ,OptPars* optpars,IssmDouble (*f)(IssmDouble,OptArgs*), OptArgs* optargs){
 
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/elements.h
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/elements.h	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/elements.h	(revision 12507)
@@ -29,31 +29,30 @@
 #endif
 
 inline void printarray(IssmDouble* array,int lines,int cols=1){
-	printf("\n");
+	_printLine_("");
 	for(int i=0;i<lines;i++){  
-		printf("   [ ");
-		for(int j=0;j<cols;j++) printf(" %12.7g ",array[i*cols+j]);
-		printf(" ]\n");
+		_printString_("   [ ");
+		for(int j=0;j<cols;j++) _printString_( " " << setw(11) << setprecision (5) << array[i*cols+j]);
+		_printLine_(" ]");
 	}  
-	printf("\n");
+	_printLine_("");
 }
 inline void printarray(int* array,int lines,int cols=1){
-	printf("\n");
+	_printLine_("");
 	for(int i=0;i<lines;i++){  
-		printf("   [ ");
-		for(int j=0;j<cols;j++) printf(" %6i",array[i*cols+j]);
-		printf(" ]\n");
+		_printString_("   [ ");
+		for(int j=0;j<cols;j++) _printString_( " " << setw(11) << setprecision (5) << array[i*cols+j]);
+		_printLine_(" ]");
 	}  
-	printf("\n");
+	_printLine_("");
 }
 inline void printbinary(int n) {
 	unsigned int i=1L<<(sizeof(n)*8-1);
-
 	while (i>0) {
 		if (n&i)
-		 printf("1");
+		 _printString_("1");
 		else
-		 printf("0");
+		 _printString_("0");
 		i>>=1;
 	}
 }
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp	(revision 12507)
@@ -16,19 +16,19 @@
 	int interpolation_type;
 	bool debug;
 	int  nels_data;
-	double* index_data=NULL;
-	double* x_data=NULL;
-	double* y_data=NULL;
-	double* data=NULL;
-	double xmin,xmax;
-	double ymin,ymax;
-	int    nods_prime;
-	Vector*    data_prime=NULL;
-	double* x_prime=NULL;
-	double* y_prime=NULL;
-	double* default_values=NULL;
+	double *index_data         = NULL;
+	double *x_data             = NULL;
+	double *y_data             = NULL;
+	double *data               = NULL;
+	double  xmin                 ,xmax;
+	double  ymin                 ,ymax;
+	int     nods_prime;
+	Vector *data_prime         = NULL;
+	double *x_prime            = NULL;
+	double *y_prime            = NULL;
+	double *default_values     = NULL;
 	int     num_default_values;
-	double*    incontour=NULL;
+	double *incontour          = NULL;
 
 	/*intermediary: */
 	int     i0;
@@ -45,35 +45,34 @@
 	num_threads=handle->num;
 	
 	/*recover parameters :*/
-	interpolation_type=gate->interpolation_type;
-	debug=gate->debug;
-	nels_data=gate->nels_data;
-	index_data=gate->index_data;
-	x_data=gate->x_data;
-	y_data=gate->y_data;
-	data=gate->data;
-	xmin=gate->xmin;
-	xmax=gate->xmax;
-	ymin=gate->ymin;
-	ymax=gate->ymax;
-	nods_prime=gate->nods_prime;
-	data_prime=gate->data_prime;
-	x_prime=gate->x_prime;
-	y_prime=gate->y_prime;
-	default_values=gate->default_values;
-	num_default_values=gate->num_default_values;
-	incontour=gate->incontour;
+	interpolation_type = gate->interpolation_type;
+	debug              = gate->debug;
+	nels_data          = gate->nels_data;
+	index_data         = gate->index_data;
+	x_data             = gate->x_data;
+	y_data             = gate->y_data;
+	data               = gate->data;
+	xmin               = gate->xmin;
+	xmax               = gate->xmax;
+	ymin               = gate->ymin;
+	ymax               = gate->ymax;
+	nods_prime         = gate->nods_prime;
+	data_prime         = gate->data_prime;
+	x_prime            = gate->x_prime;
+	y_prime            = gate->y_prime;
+	default_values     = gate->default_values;
+	num_default_values = gate->num_default_values;
+	incontour          = gate->incontour;
 
 	/*partition loop across threads: */
 	PartitionRange(&i0,&i1,nels_data,num_threads,my_thread);
 
 	/*Loop over the elements*/
-	if (debug && my_thread==0) printf("      interpolation progress:   %5.2lf %%",0.0);
-
 	for (i=i0;i<i1;i++){
 
 		/*display current iteration*/
-		if (debug && my_thread==0 && fmod((double)i,(double)100)==0) printf("\b\b\b\b\b\b\b%5.2lf %%",(double)i/nels_data*100*num_threads);
+		if (debug && my_thread==0 && fmod((double)i,(double)100)==0)
+		 _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(i-i0)/double(i1-i0)*100<<"%");
 
 		/*if there is no point inside the domain, go to next iteration*/
 		if ( (x_data[(int)index_data[3*i+0]-1]<xmin) && (x_data[(int)index_data[3*i+1]-1]<xmin) && (x_data[(int)index_data[3*i+2]-1]<xmin)) continue;
@@ -124,8 +123,7 @@
 			}
 		}
 	}
-	if (debug && my_thread==0) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
-	
+	if(debug && my_thread==0)
+	 _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 	return NULL;
-
 }
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp	(revision 12507)
@@ -84,11 +84,11 @@
 	}
 
 	/*Loop over the elements*/
-	if (debug) printf("      interpolation progress:   %5.2lf %%",0.0);
 	for (n=0;n<nels;n++){
 
 		/*display current iteration*/
-		if (debug && fmod((double)n,(double)100)==0) printf("\b\b\b\b\b\b\b%5.2lf %%",(double)n/nels*100);
+		if (debug && fmod((double)n,(double)100)==0)
+		 _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(n)/double(nels)*100<<"%");
 
 		/*Get extrema coordinates of current elements*/
 		x_tria_min=x_mesh[(int)index_mesh[3*n+0]-1]; x_tria_max=x_tria_min;
@@ -167,7 +167,8 @@
 			}
 		}
 	}
-	if (debug) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
+	if (debug)
+	 _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 
 	/*Assign output pointers:*/
 	*pgriddata=griddata;
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp	(revision 12507)
@@ -76,7 +76,7 @@
 			}
 		}
 		printf( "\n" );
-		printf("Number of zeroes remaining: %10ld",lines*samps-counter);
+		printf("Number of zeroes remaining: %d",lines*samps-counter);
 		fflush( stdout );
 	#endif
 
@@ -95,7 +95,7 @@
 		}
 		//        n u m b e r   o f   z e r o e s   r e m a i n i n g :   1 2 3 4 5 6 7 8 9 10        
 		printf( "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b" );
-		printf("Number of zeroes remaining: %10ld",lines*samps-counter);
+		printf("Number of zeroes remaining: %d",lines*samps-counter);
 		fflush( stdout );
 	#endif
 	
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp	(revision 12507)
@@ -95,7 +95,7 @@
 
 		/*launch the thread manager with Krigingxt as a core: */
 		LaunchThread(NearestNeighbort,(void*)&gate,num);
-		printf("\r      interpolation progress:  100.00%%\n");
+		_printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 		xDelete<double>(gate.percent);
 	}
 	else if(strcmp(output,"idw")==0){ //Inverse distance weighting
@@ -114,7 +114,7 @@
 
 		/*launch the thread manager with Krigingxt as a core: */
 		LaunchThread(idwt,(void*)&gate,num);
-		printf("\r      interpolation progress:  100.00%%\n");
+		_printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 		xDelete<double>(gate.percent);
 	}
 	else if(strcmp(output,"prediction")==0){
@@ -134,7 +134,7 @@
 
 		/*launch the thread manager with Krigingxt as a core: */
 		LaunchThread(Krigingxt,(void*)&gate,num);
-		printf("\r      interpolation progress:  100.00%%\n");
+		_printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 		xDelete<double>(gate.percent);
 	}
 	else{
@@ -189,7 +189,7 @@
 		percent[my_thread]=double(idx-i0)/double(i1-i0)*100.;
 		localpercent=percent[0];
 		for(int i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]);
-		printf("\r      interpolation progress: %5.2lf%%",localpercent);
+		_printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");
 
 		/*Kriging interpolation*/
 		observations->InterpolationKriging(&predictions[idx],&error[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,variogram);
@@ -238,7 +238,7 @@
 		percent[my_thread]=double(idx-i0)/double(i1-i0)*100.;
 		localpercent=percent[0];
 		for(i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]);
-		printf("\r      interpolation progress: %5.2lf%%",localpercent);
+		_printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");
 
 		observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius);
 	}
@@ -286,7 +286,7 @@
 		percent[my_thread]=double(idx-i0)/double(i1-i0)*100.;
 		localpercent=percent[0];
 		for(int i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]);
-		printf("\r      interpolation progress: %5.2lf%%",localpercent);
+		_printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");
 
 		observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power);
 	}
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp	(revision 12507)
@@ -57,11 +57,11 @@
 	for (i=0;i<nods_prime;i++) data_prime->SetValue(i,default_value,INS_VAL);
 
 	/*Loop over the elements*/
-	if (debug) printf("      interpolation progress:   %5.2lf %%",0.0);
 	for (i=0;i<nels_data;i++){
 
 		/*display current iteration*/
-		if (debug && fmod((double)i,(double)100)==0) printf("\b\b\b\b\b\b\b%5.2lf %%",(double)i/nels_data*100);
+		if (debug && fmod((double)i,(double)100)==0)
+		 _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(i)/double(nels_data)*100<<"%");
 
 		/*Get extrema coordinates of current elements*/
 		x_tria_min=x_data[(int)index_data[6*i+0]-1]; x_tria_max=x_tria_min;
@@ -131,7 +131,8 @@
 			}
 		}
 	}
-	if (debug) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
+	if (debug)
+	 _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 
 	/*Assign output pointers:*/
 	*pdata_prime=data_prime;
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp	(revision 12507)
@@ -123,17 +123,22 @@
 	double *x             = gate->x;
 	double *y             = gate->y;
 	int     nods          = gate->nods;
-	Vector*     data_mesh     = gate->data_mesh;
+	Vector *data_mesh     = gate->data_mesh;
 	double *data          = gate->data;
 	double  default_value = gate->default_value;
 	int     interpenum    = gate->interp;
 	int     M             = gate->M;
 	int     N             = gate->N;
 
+	bool debug = M*N>1? true:false;
+	debug = true;
+
 	/*partition loop across threads: */
 	PartitionRange(&i0,&i1,nods,num_threads,my_thread);
 	for (i=i0;i<i1;i++) {
 
+		if(debug && my_thread==0)
+		 _printLine_("\r      interpolation progress: "<<setw(5)<<setprecision(2)<<double(i-i0)/double(i1-i0)*100<<"%%");
 		x_grid=*(x_mesh+i);
 		y_grid=*(y_mesh+i);
 
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp	(revision 12507)
@@ -44,12 +44,11 @@
 	PartitionRange(&i0,&i1,nods,num_threads,my_thread);
 
 	/*Loop over the nodes*/
-	if (my_thread==0) printf("      loop progress:   %5.2lf %%",0.0);
-
 	for (i=i0;i<i1;i++){
 
 		/*display current iteration*/
-		if (my_thread==0 && fmod((double)i,(double)100)==0) printf("\b\b\b\b\b\b\b%5.2lf %%",(double)i/nods*100*num_threads);
+		if (my_thread==0 && fmod((double)i,(double)100)==0)
+		 _printString_("\r      loop progress: "<<setw(6)<<setprecision(2)<<double(i-i0)/double(i1-i0)*100<<"%");
 
 		distance=mindistance+100; //make sure initialization respects min distance criterion.
 		for (j=0;j<nods;j++){
@@ -69,7 +68,8 @@
 			}
 		}
 	}
-	if (my_thread==0) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
+	if (my_thread==0)
+	 _printLine_("\r      loop progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 
 	/*Free ressources:*/
 	xDelete<bool>(already);
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp	(revision 12507)
@@ -376,45 +376,45 @@
 void ElementMatrix::Echo(void){
 
 	int i,j;
-	printf("Element Matrix echo: \n");
-	printf("   nrows: %i\n",nrows);
-	printf("   ncols: %i\n",ncols);
-	printf("   dofsymmetrical: %s\n",dofsymmetrical?"true":"false");
+	_printLine_("Element Matrix echo:");
+	_printLine_("   nrows: " << nrows);
+	_printLine_("   ncols: " << nrows);
+	_printLine_("   dofsymmetrical: " << (dofsymmetrical?"true":"false"));
 
-	printf("   values: \n");
+	_printLine_("   values:");
 	for(i=0;i<nrows;i++){
-		printf("      %i: ",i);
-		for(j=0;j<ncols;j++) printf("%10g ",*(values+ncols*i+j));
-		printf("\n");
+		_printString_(setw(4) << right << i << ": ");
+		for(j=0;j<ncols;j++) _printString_( " " << setw(11) << setprecision (5) << right << values[i*ncols+j]);
+		_printLine_("");
 	}
 
-	printf("   gglobaldoflist (%p): ",gglobaldoflist);
-	if(gglobaldoflist) for(i=0;i<nrows;i++)printf("%i ",gglobaldoflist[i]); printf("\n");
+	_printString_("   gglobaldoflist (" << gglobaldoflist << "): ");
+	if(gglobaldoflist) for(i=0;i<nrows;i++) _printString_(" " << gglobaldoflist[i]); _printLine_("");
 
-	printf("   row_fsize: %i\n",row_fsize);
-	printf("   row_flocaldoflist (%p): ",row_flocaldoflist);
-	if(row_flocaldoflist) for(i=0;i<row_fsize;i++)printf("%i ",row_flocaldoflist[i]); printf("\n");
-	printf("   row_fglobaldoflist (%p): ",row_fglobaldoflist);
-	if(row_fglobaldoflist)for(i=0;i<row_fsize;i++)printf("%i ",row_fglobaldoflist[i]); printf("\n");
+	_printLine_("   row_fsize: " << row_fsize);
+	_printString_("   row_flocaldoflist  (" << row_flocaldoflist << "): ");
+	if(row_flocaldoflist) for(i=0;i<row_fsize;i++) _printString_(" " << row_flocaldoflist[i]); _printLine_(" ");
+	_printString_("   row_fglobaldoflist  (" << row_fglobaldoflist << "): ");
+	if(row_fglobaldoflist) for(i=0;i<row_fsize;i++) _printString_(" " << row_fglobaldoflist[i]); _printLine_(" ");
 
-	printf("   row_ssize: %i\n",row_ssize);
-	printf("   row_slocaldoflist (%p): ",row_slocaldoflist);
-	if(row_slocaldoflist)for(i=0;i<row_ssize;i++)printf("%i ",row_slocaldoflist[i]); printf("\n");
-	printf("   row_sglobaldoflist (%p): ",row_sglobaldoflist);
-	if(row_sglobaldoflist)for(i=0;i<row_ssize;i++)printf("%i ",row_sglobaldoflist[i]); printf("\n");
+	_printLine_("   row_ssize: " << row_ssize);
+	_printString_("   row_slocaldoflist  (" << row_slocaldoflist << "): ");
+	if(row_slocaldoflist) for(i=0;i<row_ssize;i++) _printString_(" " << row_slocaldoflist[i]); _printLine_(" ");
+	_printString_("   row_sglobaldoflist  (" << row_sglobaldoflist << "): ");
+	if(row_sglobaldoflist) for(i=0;i<row_ssize;i++) _printString_(" " << row_sglobaldoflist[i]); _printLine_(" ");
 
 	if(!dofsymmetrical){
-		printf("   col_fsize: %i\n",col_fsize);
-		printf("   col_flocaldoflist (%p): ",col_flocaldoflist);
-		if(col_flocaldoflist)for(i=0;i<col_fsize;i++)printf("%i ",col_flocaldoflist[i]); printf("\n");
-		printf("   col_fglobaldoflist (%p): ",col_fglobaldoflist);
-		if(col_fglobaldoflist)for(i=0;i<col_fsize;i++)printf("%i ",col_fglobaldoflist[i]); printf("\n");
+		_printLine_("   col_fsize: " << col_fsize);
+		_printString_("   col_flocaldoflist  (" << col_flocaldoflist << "): ");
+		if(col_flocaldoflist) for(i=0;i<col_fsize;i++) _printString_(" " << col_flocaldoflist[i]); _printLine_(" ");
+		_printString_("   col_fglobaldoflist  (" << col_fglobaldoflist << "): ");
+		if(col_fglobaldoflist) for(i=0;i<col_fsize;i++) _printString_(" " << col_fglobaldoflist[i]); _printLine_(" ");
 
-		printf("   col_ssize: %i\n",col_ssize);
-		printf("   col_slocaldoflist (%p): ",col_slocaldoflist);
-		if(col_slocaldoflist)for(i=0;i<col_ssize;i++)printf("%i ",col_slocaldoflist[i]); printf("\n");
-		printf("   col_sglobaldoflist (%p): ",col_sglobaldoflist);
-		if(col_sglobaldoflist)for(i=0;i<col_ssize;i++)printf("%i ",col_sglobaldoflist[i]); printf("\n");
+		_printLine_("   col_ssize: " << col_ssize);
+		_printString_("   col_slocaldoflist  (" << col_slocaldoflist << "): ");
+		if(col_slocaldoflist) for(i=0;i<col_ssize;i++) _printString_(" " << col_slocaldoflist[i]); _printLine_(" ");
+		_printString_("   col_sglobaldoflist  (" << col_sglobaldoflist << "): ");
+		if(col_sglobaldoflist) for(i=0;i<col_ssize;i++) _printString_(" " << col_sglobaldoflist[i]); _printLine_(" ");
 	}
 }
 /*}}}*/
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/ElementVector.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/ElementVector.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/ElementVector.cpp	(revision 12507)
@@ -221,11 +221,6 @@
 	int i,j;
 	_printLine_("Element Vector echo:");
 	_printLine_("   nrows: " << nrows);
-
-	_printLine_("   test:");
-	for(i=0;i<nrows;i++) _printString_(" " << i);
-	_printLine_("HERE");
-
 	_printLine_("   values:");
 	for(i=0;i<nrows;i++){
 		_printLine_(setw(4) << right << i << ": " << setw(10) << values[i]);
@@ -236,10 +231,12 @@
 	_printLine_(" ");
 
 	_printLine_("   fsize: " << fsize);
-	printf("   flocaldoflist (%p): ",flocaldoflist);
-	if(flocaldoflist) for(i=0;i<fsize;i++)printf("%i ",flocaldoflist[i]); printf("\n");
-	printf("   fglobaldoflist (%p): ",fglobaldoflist);
-	if(fglobaldoflist)for(i=0;i<fsize;i++)printf("%i ",fglobaldoflist[i]); printf("\n");
+	_printString_("   flocaldoflist  (" << flocaldoflist << "): ");
+	if(flocaldoflist) for(i=0;i<fsize;i++) _printString_(" " << flocaldoflist[i] );
+	_printLine_(" ");
+	_printString_("   fglobaldoflist (" << fglobaldoflist << "): ");
+	if(fglobaldoflist) for(i=0;i<fsize;i++) _printString_(" " << fglobaldoflist[i] );
+	_printLine_(" ");
 }
 /*}}}*/
 /*FUNCTION ElementVector::Init{{{*/
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp	(revision 12507)
@@ -76,13 +76,12 @@
 	printf("   time: %g\n",this->time);
 	printf("   matrix size: %i-%i\n",this->M,this->N);
 	for (i=0;i<this->M;i++){  
-		printf("   [ ");
+		_printString_("   [ ");
 		for (j=0;j<this->N;j++){
-			printf(" %12.6g ",this->values[i*this->N+j]);
+			_printString_( " " << setw(11) << setprecision (5) << this->values[i*this->N+j]);
 		}  
-		printf(" ]\n");
+		_printLine_(" ]");
 	}  
-	printf("\n");
 
 }
 /*}}}*/
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Bamg/Mesh.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Bamg/Mesh.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Bamg/Mesh.cpp	(revision 12507)
@@ -2404,14 +2404,14 @@
 		printf("   nbq = %i\n",nbq);
 		printf("   index:\n");
 		for (i=0;i<nbt;i++){
-			printf("   %4i: [%4i %4i %4i]\n",i+1,
-						((BamgVertex *)triangles[i](0))?GetId(triangles[i][0])+1:0,
-						((BamgVertex *)triangles[i](1))?GetId(triangles[i][1])+1:0,
-						((BamgVertex *)triangles[i](2))?GetId(triangles[i][2])+1:0);
+			_printLine_("   " << setw(4) << i+1 << ": [" 
+						<< setw(4) << (((BamgVertex *)triangles[i](0))?GetId(triangles[i][0])+1:0) << " " 
+						<< setw(4) << (((BamgVertex *)triangles[i](0))?GetId(triangles[i][1])+1:0) << " " 
+						<< setw(4) << (((BamgVertex *)triangles[i](0))?GetId(triangles[i][2])+1:0) << "]");
 		}
 		printf("   coordinates:\n");
 		for (i=0;i<nbv;i++){
-			printf("   %4i: [%g %g]\n",i+1,vertices[i].r.x,vertices[i].r.y);
+			_printLine_("   " << setw(4) << i+1 << ": [" << vertices[i].r.x << " " << vertices[i].r.y << "]");
 		}
 
 	}
@@ -4066,11 +4066,11 @@
 	printf("      length of edge in   | %% of edge  | Nb of edges \n"); 
 	printf("      --------------------+-------------+-------------\n"); 
 	for   (i=0;i<=kmax;i++){ 
-		if (i==0) printf("      %10i",0);
-		else      printf("      %10g",exp(lmin+i/delta));
+		if (i==0) _printString_( "      " << setw(10) << 0.);
+		else      _printString_( "      " << setw(10) << exp(lmin+i/delta));
 		if (i==kmax) printf("          +inf   ");
-		else printf("      %10g",exp(lmin+(i+1)/delta));
-		printf("|  %10g |\n",((long)  ((10000.0 * histo[i])/ nbedges))/100.0);
+		else      _printString_( "      " << setw(10) << exp(lmin+(i+1)/delta));
+		_printLine_("|  " << setw(10) << (long((10000. * histo[i])/ nbedges)/100.) << " |");
 		printf("  %i\n",histo[i]);
 	}
 	printf("      --------------------+-------------+-------------\n"); 
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp	(revision 12506)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp	(revision 12507)
@@ -65,8 +65,7 @@
 	if (!(  (nlhs==6) || (nrhs==5))){
 		mexPrintf("   %s format error.\n", __FUNCT__);
 		TriMeshProcessRiftsUsage();
-		printf("   ");
-		mexErrMsgTxt(" ");
+		_error_("bad usage");
 	}
 
 	/*Fetch index_in: */
@@ -81,8 +80,7 @@
 		}
 	}
 	else{
-		printf("%s%s\n",__FUNCT__," error message: first argument should be the element list!");
-		mexErrMsgTxt(" ");
+		_error_("first argument should be the element list");
 	}
 
 	/*Fetch x_in: */
@@ -95,8 +93,7 @@
 		}
 	}
 	else{
-		printf("%s%s\n",__FUNCT__," error message: second argument should be the x corrdinate list!");
-		mexErrMsgTxt(" ");
+		_error_("second argument should be the x corrdinate list");
 	}
 
 	/*Fetch y_in: */
@@ -108,8 +105,7 @@
 		}
 	}
 	else{
-		printf("%s%s\n",__FUNCT__," error message: third argument should be the y corrdinate list!");
-		mexErrMsgTxt(" ");
+		_error_("third argument should be the y corrdinate list");
 	}	
 
 	/*Fetch segments_in: */
@@ -124,8 +120,7 @@
 		}
 	}
 	else{
-		printf("%s%s\n",__FUNCT__," error message: fourth argument should be the segments list!");
-		mexErrMsgTxt(" ");
+		_error_("fourth argument should be the segments list");
 	}
 
 	/*Fetch segment markers: */
@@ -137,32 +132,9 @@
 		}
 	}
 	else{
-		printf("%s%s\n",__FUNCT__," error message: fourth argument should be the segmentmarkers list!");
-		mexErrMsgTxt(" ");
+		_error_("fourth argument should be the segmentmarkers list");
 	}
 
-	/*
-	printf("Index: \n");
-	for (i=0;i<nel;i++){
-		for(j=0;j<3;j++){
-			printf("%lf ",*(index_in+3*i+j));
-		}
-		printf("\n");
-	}
-	printf("x,y: \n");
-	for (i=0;i<nods;i++){
-		printf("%16.16lf %16.16lf\n",x_in[i],y_in[i]);
-	}
-	printf("segments:\n");
-	for (i=0;i<num_seg;i++){
-		for(j=0;j<3;j++){
-			printf("%lf ",*(segments_in+3*i+j));
-		}
-		printf("%lf ",segmentmarkers_in[i]);
-		printf("\n");
-	}
-	*/
-
 	/*First, do some fixing on the existing mesh: we do not want any element belonging entirely to the segment list (ie: 
 	 *all the nodes of this element belong to the segments (tends to happen when there are corners: */
 	RemoveCornersFromRifts(&index_in,&nel,&x_in,&y_in,&nods,segments_in,segmentmarkers_in,num_seg);