source: issm/oecreview/Archive/12321-12677/ISSM-12510-12511.diff@ 12679

Last change on this file since 12679 was 12679, checked in by Mathieu Morlighem, 13 years ago

Added 12321-12677
File size: 106.8 KB
RevLine 
[12679]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 12510)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 12511)
5@@ -35,7 +35,7 @@
6 }
7 else{
8 if(!mxIsClass(dataref,"double") && !mxIsClass(dataref,"single")){
9- printf("Warning: converting matlab data from '%s' to 'double'\n",mxGetClassName(dataref));
10+ _printLine_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'");
11 }
12 /*Convert matlab matrix to double* matrix: */
13 MatlabMatrixToDoubleMatrix(&outmatrix,&outmatrix_rows,&outmatrix_cols,dataref);
14Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/PrintfFunction.cpp
15===================================================================
16--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/PrintfFunction.cpp (revision 12510)
17+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/PrintfFunction.cpp (revision 12511)
18@@ -50,7 +50,7 @@
19 }
20
21 /*Ok, if we are running in parallel, get node 0 to print*/
22- if(my_rank==0)printf(buffer);
23+ if(my_rank==0)_printString_(buffer);
24
25 /*Clean up and return*/
26 xDelete<char>(buffer);
27Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp
28===================================================================
29--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp (revision 12510)
30+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp (revision 12511)
31@@ -43,16 +43,16 @@
32 extern int num_procs;
33
34 if (function_name=="" || file_line==0){ //WINDOWS
35- printf("%s%s","Error message: ",what());
36+ _printString_("" << "Error message: " << what());
37 }
38 else{
39 if(num_procs==1){
40- printf("\n??? Error using ==> %s:%i\n",file_name.c_str(),file_line);
41- printf("%s error message: %s\n\n",function_name.c_str(),what());
42+ _printLine_("\n??? Error using ==> " << file_name.c_str() << ":" << file_line);
43+ _printLine_("" << function_name.c_str() << " error message: " << what() << "\n");
44 }
45 else{
46- printf("\n[%i] ??? Error using ==> %s:%i\n",my_rank,file_name.c_str(),file_line);
47- printf("[%i] %s error message: %s\n\n",my_rank,function_name.c_str(),what());
48+ _printLine_("\n[" << my_rank << "] ??? Error using ==> " << file_name.c_str() << ":" << file_line);
49+ _printLine_("[" << my_rank << "] " << function_name.c_str() << " error message: " << what() << "\n");
50 }
51 }
52 return;
53Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/io/PrintfFunction.cpp
54===================================================================
55--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/io/PrintfFunction.cpp (revision 12510)
56+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/io/PrintfFunction.cpp (revision 12511)
57@@ -48,7 +48,7 @@
58 }
59
60 /*Ok, if we are running in parallel, get node 0 to print*/
61- if(my_rank==0)printf(buffer);
62+ if(my_rank==0)_printString_(buffer);
63
64 /*Clean up and return*/
65 xDelete<char>(buffer);
66Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp
67===================================================================
68--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 12510)
69+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 12511)
70@@ -53,16 +53,16 @@
71 }
72
73 /*Initialize output*/
74- if (verbose) printf("Initializing output vector\n");
75+ if (verbose) _printLine_("Initializing output vector");
76 data_interp=xNew<double>(nods_interp*data_cols);
77
78 // read background mesh
79- if (verbose) printf("Reading mesh\n");
80+ if (verbose) _printLine_("Reading mesh");
81 Mesh Th(index_data,x_data,y_data,nods_data,nels_data);
82 Th.CreateSingleVertexToTriangleConnectivity();
83
84 //Loop over output nodes
85- if (verbose) printf("Loop over the nodes\n");
86+ if (verbose) _printLine_("Loop over the nodes");
87 for(i=0;i<nods_interp;i++){
88
89 /*reset skip_bamg: */
90@@ -137,7 +137,7 @@
91 }
92
93 /*Assign output pointers:*/
94- if (verbose) printf("Assigning output\n");
95+ if (verbose) _printLine_("Assigning output");
96 *pdata_interp=data_interp;
97
98 /*No error return*/
99Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/BamgConvertMeshx/BamgConvertMeshx.cpp
100===================================================================
101--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/BamgConvertMeshx/BamgConvertMeshx.cpp (revision 12510)
102+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/BamgConvertMeshx/BamgConvertMeshx.cpp (revision 12511)
103@@ -23,13 +23,13 @@
104 bamgopts=new BamgOpts();
105
106 // read mesh
107- if(verbose) printf("Reading mesh\n");
108+ if(verbose) _printLine_("Reading mesh");
109 Mesh Th(index,x,y,nods,nels);
110
111 //write mesh and geometry
112- if (verbose) printf("Write Geometry\n");
113+ if (verbose) _printLine_("Write Geometry");
114 Th.Gh.WriteGeometry(bamggeom,bamgopts);
115- if (verbose) printf("Write Mesh\n");
116+ if (verbose) _printLine_("Write Mesh");
117 Th.WriteMesh(bamgmesh,bamgopts);
118
119 //clean up
120Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp
121===================================================================
122--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 12510)
123+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 12511)
124@@ -56,7 +56,7 @@
125 itm = (int)(2*siglim/DT + 1.5);
126
127 if (itm >= NPDMAX){
128- printf("increase NPDMAX in massBalance.cpp\n");
129+ _printLine_("increase NPDMAX in massBalance.cpp");
130 exit (1);
131 }
132 for (it = 0; it < itm; it++){
133@@ -82,7 +82,7 @@
134 siglimc = 2.5*signormc ;
135 itm = (int)((PDCUT+2.*siglimc)/DT + 1.5);
136 if (itm >= NPDCMAX){
137- printf("'increase NPDCMAX in p35com'\n");
138+ _printLine_("'increase NPDCMAX in p35com'");
139 exit (1);
140 }
141 for (it = 0; it < itm; it++ ){
142Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/Chacox.cpp
143===================================================================
144--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/Chacox.cpp (revision 12510)
145+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/Chacox.cpp (revision 12511)
146@@ -65,12 +65,12 @@
147
148
149 if (DEBUG_TRACE > 0) {
150- printf("<Entering main>\n");
151+ _printLine_("<Entering main>");
152 }
153
154 if (PRINT_HEADERS) {
155- printf("\n Chaco 2.0\n");
156- printf(" Sandia National Laboratories\n\n");
157+ _printLine_("\n Chaco 2.0");
158+ _printLine_(" Sandia National Laboratories\n");
159 }
160
161 Using_Main = TRUE;
162@@ -176,7 +176,7 @@
163 for (i=0; i<start[nvtxs]; adjacency[i++]--);
164
165 if (DEBUG_MEMORY > 0) {
166- printf("\n");
167+ _printLine_("");
168 smalloc_stats();
169 }
170
171@@ -184,7 +184,7 @@
172 fclose(params_file);
173
174 if (DEBUG_TRACE > 1) {
175- printf("<Leaving main>\n");
176+ _printLine_("<Leaving main>");
177 }
178
179 return(0);
180Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/input_parse.cpp
181===================================================================
182--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/input_parse.cpp (revision 12510)
183+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/input_parse.cpp (revision 12511)
184@@ -37,15 +37,15 @@
185 int eigensolver; /* which kind of eigensolver to use */
186
187 if (DEBUG_TRACE > 0) {
188- printf("<Entering input_parse>\n");
189+ _printLine_("<Entering input_parse>");
190 }
191
192 if (PROMPT) {
193- printf("Parallel machine architecture:\n");
194- printf(" (0) Hypercube\n");
195- printf(" (1) One-dimensional mesh\n");
196- printf(" (2) Two-dimensional mesh\n");
197- printf(" (3) Three-dimensional mesh\n");
198+ _printLine_("Parallel machine architecture:");
199+ _printLine_(" (0) Hypercube");
200+ _printLine_(" (1) One-dimensional mesh");
201+ _printLine_(" (2) Two-dimensional mesh");
202+ _printLine_(" (3) Three-dimensional mesh");
203 }
204 *architecture = (int)options[OPT_ARCH];
205 if (*architecture < 0 || *architecture > 3) {
206@@ -56,12 +56,12 @@
207
208 /* Name output assignment file. */
209 if (PROMPT)
210- printf("Assignment output file: ");
211+ _printString_("Assignment output file: ");
212 outassignname = NULL;
213
214 /* Name output results file. */
215 if (PROMPT)
216- printf("File name for saving run results: ");
217+ _printString_("File name for saving run results: ");
218 outfilename = NULL;
219
220 /* Initialize the method flags */
221@@ -74,14 +74,14 @@
222 }
223 else {
224 if (PROMPT) {
225- printf("Global partitioning method:\n");
226- printf(" (1) Multilevel-KL\n");
227- printf(" (2) Spectral\n");
228- printf(" (3) Inertial\n");
229- printf(" (4) Linear\n");
230- printf(" (5) Random\n");
231- printf(" (6) Scattered\n");
232- printf(" (7) Read-from-file\n");
233+ _printLine_("Global partitioning method:");
234+ _printLine_(" (1) Multilevel-KL");
235+ _printLine_(" (2) Spectral");
236+ _printLine_(" (3) Inertial");
237+ _printLine_(" (4) Linear");
238+ _printLine_(" (5) Random");
239+ _printLine_(" (6) Scattered");
240+ _printLine_(" (7) Read-from-file");
241 }
242 *global_method = (int)options[OPT_GLOBAL];
243 if (*global_method < 1 || *global_method > 7) {
244@@ -93,19 +93,19 @@
245
246 if (*global_method == 7) { /* Name and open input assignment file. */
247 if (PROMPT)
248- printf("Assignment input file: ");
249+ _printString_("Assignment input file: ");
250 }
251
252 else if (*global_method == 3) {
253 if (PROMPT)
254- printf("Geometry input file name: ");
255+ _printString_("Geometry input file name: ");
256 }
257
258 else if (*global_method == 2) {
259 if (PROMPT) {
260- printf("Eigensolver:\n");
261- printf(" (1) Multilevel RQI/Symmlq\n");
262- printf(" (2) Lanczos\n");
263+ _printLine_("Eigensolver:");
264+ _printLine_(" (1) Multilevel RQI/Symmlq");
265+ _printLine_(" (2) Lanczos");
266 }
267 eigensolver = (int)options[OPT_RQI];
268 if (eigensolver < 0 || eigensolver > 2) {
269@@ -116,11 +116,11 @@
270 if (eigensolver == 1) {
271 if (MATCH_TYPE == 5) { /* geometric matching */
272 if (PROMPT)
273- printf("Geometry input file name: ");
274+ _printString_("Geometry input file name: ");
275 }
276 *rqi_flag = 1;
277 if (PROMPT)
278- printf("Number of vertices to coarsen down to: ");
279+ _printString_("Number of vertices to coarsen down to: ");
280 *vmax = (int)options[OPT_VMAX];
281 if (*vmax <= 0) {
282 printf("%s -- Vmax %d must be greater then 0.\n",
283@@ -136,10 +136,10 @@
284 else if (*global_method == 1) {
285 if (MATCH_TYPE == 5) { /* geometric matching */
286 if (PROMPT)
287- printf("Geometry input file name: ");
288+ _printString_("Geometry input file name: ");
289 }
290 if (PROMPT)
291- printf("Number of vertices to coarsen down to: ");
292+ _printString_("Number of vertices to coarsen down to: ");
293 *vmax = (int)options[OPT_VMAX];
294 if (*vmax <= 0) {
295 printf("%s -- Vmax %d must be greater then 0.\n",
296@@ -167,9 +167,9 @@
297 *local_method = 1;
298 else {
299 if (PROMPT) {
300- printf("Local refinement method:\n");
301- printf(" (1) Kernighan-Lin\n");
302- printf(" (2) None\n");
303+ _printLine_("Local refinement method:");
304+ _printLine_(" (1) Kernighan-Lin");
305+ _printLine_(" (2) None");
306 }
307 *local_method = (int)options[OPT_LOCAL];
308 if (*local_method < 1 || *local_method > 2) {
309@@ -184,10 +184,10 @@
310 /* Get total number of hypercube dimensions in which to partition. */
311 *ndims_tot = 0;
312 if (PROMPT)
313- printf("Total number of target hypercube dimensions: ");
314+ _printString_("Total number of target hypercube dimensions: ");
315 *ndims_tot = nparts[0];
316 if (*ndims_tot < 1) {
317- printf(" Number of divisions must be at least 1\n");
318+ _printLine_(" Number of divisions must be at least 1");
319 printf("%s -- Number of divisions %d must be at least 1.\n",
320 __FUNCT__,nparts[0]);
321 return(-1);
322@@ -199,20 +199,20 @@
323 mesh_dims[1] = mesh_dims[2] = 1;
324 if (*architecture == 2) {
325 if (PROMPT)
326- printf("X and Y extent of of 2-D mesh: ");
327+ _printString_("X and Y extent of of 2-D mesh: ");
328 mesh_dims[0] = nparts[0];
329 mesh_dims[1] = nparts[1];
330 }
331 else if (*architecture == 3) {
332 if (PROMPT)
333- printf("X, Y and Z extent of 3-D mesh: ");
334+ _printString_("X, Y and Z extent of 3-D mesh: ");
335 mesh_dims[0] = nparts[0];
336 mesh_dims[1] = nparts[1];
337 mesh_dims[2] = nparts[2];
338 }
339 else { /* Anything else => 1-D mesh */
340 if (PROMPT)
341- printf("Size of 1-D mesh: ");
342+ _printString_("Size of 1-D mesh: ");
343 mesh_dims[0] = nparts[0];
344 *architecture = 1;
345 }
346@@ -226,9 +226,9 @@
347 }
348 else if (*nprocs <= 7) {
349 if (PROMPT) {
350- printf("Partitioning dimension: \n");
351- printf(" (1) Bisection\n");
352- printf(" (2) Quadrisection\n");
353+ _printLine_("Partitioning dimension: ");
354+ _printLine_(" (1) Bisection");
355+ _printLine_(" (2) Quadrisection");
356 }
357 *ndims = (int)options[OPT_NDIMS];
358 if (*ndims < 1 || *ndims > 2) {
359@@ -239,10 +239,10 @@
360 }
361 else {
362 if (PROMPT) {
363- printf("Partitioning dimension: \n");
364- printf(" (1) Bisection\n");
365- printf(" (2) Quadrisection\n");
366- printf(" (3) Octasection\n");
367+ _printLine_("Partitioning dimension: ");
368+ _printLine_(" (1) Bisection");
369+ _printLine_(" (2) Quadrisection");
370+ _printLine_(" (3) Octasection");
371 }
372 *ndims = (int)options[OPT_NDIMS];
373 if (*ndims < 1 || *ndims > 3) {
374Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp
375===================================================================
376--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 12510)
377+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 12511)
378@@ -57,7 +57,7 @@
379 _error2_("Error reading exp file.");
380 _printf_(true,"Exp2Kmlx -- Reading %d exp profiles from file \"%s\".\n",nprof,filexp);
381 // for (i=0; i<nprof; i++)
382-// printf("i=%d; nvert=%d, closed=%d\n",i,pnvert[i],closed[i]);
383+// _printLine_("i=" << i << "; nvert=" << pnvert[i] << ", closed=" << closed[i]);
384
385 /* construct kml file */
386
387Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp
388===================================================================
389--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 12510)
390+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 12511)
391@@ -75,8 +75,8 @@
392 }
393 }
394 }
395- printf( "\n" );
396- printf("Number of zeroes remaining: %d",lines*samps-counter);
397+ _printLine_( "" );
398+ _printString_("Number of zeroes remaining: " << lines*samps-counter);
399 fflush( stdout );
400 #endif
401
402@@ -94,8 +94,8 @@
403 }
404 }
405 // 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
406- 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" );
407- printf("Number of zeroes remaining: %d",lines*samps-counter);
408+ _printString_( "\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" );
409+ _printString_("Number of zeroes remaining: " << lines*samps-counter);
410 fflush( stdout );
411 #endif
412
413@@ -103,7 +103,7 @@
414
415 /***************** FIRST RUN *********************/
416 /*
417-fprintf ( stdout, "First Application: " ); time(&t2); printf( ctime(&t2) );
418+fprintf ( stdout, "First Application: " ); time(&t2); _printString_( ctime(&t2) );
419 */
420 for ( i = 0; i < lines; i++ ){
421 for ( j = 0; j < samps; j++ ){
422@@ -276,7 +276,7 @@
423 //if ( temp < 0 ) temp = 0;
424
425 #ifdef _DEBUG2_
426- //printf("%g %g %g \n",temp,elev,range);
427+ //_printLine_("" << temp << " " << elev << " " << range << " ");
428 #endif
429
430 *(image3+samps*i+j) = temp ;
431@@ -353,8 +353,8 @@
432 time(&t2);
433
434 #ifdef _DEBUG2_
435- 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" );
436- printf("Number of zeroes remaining: 0\n\n");
437+ _printString_( "\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" );
438+ _printLine_("Number of zeroes remaining: 0\n");
439 printf ( "\n");
440 #endif
441
442Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp
443===================================================================
444--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp (revision 12510)
445+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp (revision 12511)
446@@ -65,13 +65,13 @@
447
448 observations->ObservationList(&x,&y,&data,&nobs);
449
450- printf("Generation Delaunay Triangulation\n");
451+ _printLine_("Generation Delaunay Triangulation");
452 BamgTriangulatex(&index,&nel,x,y,nobs);
453 indexd =xNewZeroInit<double>(nel*3);
454 for(int i=0;i<nel*3;i++) indexd[i]=(double)index[i];
455 xDelete<int>(index);
456
457- printf("Interpolating\n");
458+ _printLine_("Interpolating");
459 xDelete<double>(predictions);
460 InterpFromMeshToMesh2dx(&predictions,indexd,x,y,nobs,nel,data,nobs,1,x_interp,y_interp,n_interp,NULL,0,new DataSet());
461 xDelete<double>(x);
462Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp
463===================================================================
464--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 12510)
465+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 12511)
466@@ -174,7 +174,7 @@
467 data_value=nearestinterp(x1,x2,y1,y2, Q11,Q12,Q21,Q22,x_grid,y_grid);
468 break;
469 default:
470- printf("Interpolation %s not supported yet\n",EnumToStringx(interpenum));
471+ _printLine_("Interpolation " << EnumToStringx(interpenum) << " not supported yet");
472 return NULL; /*WARNING: no error because it would blow up the multithreading!*/
473 }
474 if(isnan(data_value)) data_value=default_value;
475Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp
476===================================================================
477--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 12510)
478+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 12511)
479@@ -109,10 +109,10 @@
480
481 /*Synthesize echo: {{{*/
482 if(my_rank==0){
483- printf(" responses: %i: ",d_numresponses);
484- for(i=0;i<d_numresponses-1;i++)printf("%g|",d_responses[i]);
485- printf("%g",d_responses[d_numresponses-1]);
486- printf("\n");
487+ _printString_(" responses: " << d_numresponses << ": ");
488+ for(i=0;i<d_numresponses-1;i++)_printString_("" << d_responses[i] << "|");
489+ _printString_("" << d_responses[d_numresponses-1]);
490+ _printLine_("");
491 }
492 /*}}}*/
493
494Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp
495===================================================================
496--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp (revision 12510)
497+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp (revision 12511)
498@@ -40,8 +40,8 @@
499 /*Mesh generation {{{*/
500
501 //Step1: generate geometry Gh
502- if (verbosity>0) printf("Construction of a mesh from a given geometry\n");
503- if (verbosity>1) printf(" Processing geometry...\n");
504+ if (verbosity>0) _printLine_("Construction of a mesh from a given geometry");
505+ if (verbosity>1) _printLine_(" Processing geometry...");
506 Geometry Gh(bamggeom_in,bamgopts);
507
508 //get hmin and hmax from geometry to generate the metric
509@@ -49,7 +49,7 @@
510 bamgopts->hmax = Min(bamgopts->hmax,Gh.MaximalHmax());
511
512 //build metric using geometry
513- if (verbosity>1) printf(" Generating Metric...\n");
514+ if (verbosity>1) _printLine_(" Generating Metric...");
515 for(i=0;i<Gh.nbv;i++){
516 Metric M=Gh[i];
517 EigenMetric Vp(M/coef);
518@@ -59,7 +59,7 @@
519 }
520
521 //generate mesh
522- if (verbosity>1) printf(" Generating Mesh...\n");
523+ if (verbosity>1) _printLine_(" Generating Mesh...");
524 Mesh Th(maxnbv,Gh,bamgopts);
525
526 //Split corners if requested
527@@ -72,9 +72,9 @@
528 if(bamgopts->Crack) Th.CrackMesh(bamgopts);
529
530 //Build output
531- if (verbosity>1) printf(" Write Mesh...\n");
532+ if (verbosity>1) _printLine_(" Write Mesh...");
533 Th.WriteMesh(bamgmesh_out,bamgopts);
534- if (verbosity>1) printf(" Write Geometry...\n");
535+ if (verbosity>1) _printLine_(" Write Geometry...");
536 Gh.WriteGeometry(bamggeom_out,bamgopts);
537
538 //clean up
539@@ -86,8 +86,8 @@
540 /*Anisotropic mesh adaptation {{{*/
541
542 // read background mesh
543- if (verbosity>0) printf("Anisotropic mesh adaptation\n");
544- if (verbosity>1) printf(" Processing initial mesh and geometry...\n");
545+ if (verbosity>0) _printLine_("Anisotropic mesh adaptation");
546+ if (verbosity>1) _printLine_(" Processing initial mesh and geometry...");
547 Mesh BTh(bamggeom_in,bamgmesh_in,bamgopts);
548
549 //Make Quadtree from background mesh
550@@ -99,24 +99,24 @@
551
552 //Generate initial metric
553 if (bamgopts->metric){
554- if (verbosity>1) printf(" Processing Metric...\n");
555+ if (verbosity>1) _printLine_(" Processing Metric...");
556 BTh.ReadMetric(bamgopts);
557 }
558 else {
559- if (verbosity>1) printf(" Generating initial Metric...\n");
560+ if (verbosity>1) _printLine_(" Generating initial Metric...");
561 Metric Mhmax(bamgopts->hmax);
562 for (int iv=0;iv<BTh.nbv;iv++) BTh[iv].m = Mhmax;
563 }
564
565 //use present fields to generate metric if present
566 if (bamgopts->field){
567- if (verbosity>1) printf(" Merge metric with field provided...\n");
568+ if (verbosity>1) _printLine_(" Merge metric with field provided...");
569 BTh.AddMetric(bamgopts);
570 }
571
572 // change using hVertices if provided
573 if(bamgopts->hVertices && bamgopts->hVerticesSize[0]==BTh.nbv){
574- if (verbosity>1) printf(" Merging Metric with hVertices...\n");
575+ if (verbosity>1) _printLine_(" Merging Metric with hVertices...");
576 for (i=0;i<BTh.nbv;i++){
577 if (!isnan(bamgopts->hVertices[i])){
578 BTh[i].m=Metric((float)bamgopts->hVertices[i]);
579@@ -126,7 +126,7 @@
580
581 // change using hminVertices if provided
582 if (bamgopts->hminVertices){
583- if (verbosity>1) printf(" Merging Metric with hminVertices...\n");
584+ if (verbosity>1) _printLine_(" Merging Metric with hminVertices...");
585 for (i=0;i<BTh.nbv;i++){
586 if (!isnan(bamgopts->hminVertices[i])){
587 Metric M=BTh.vertices[i].m;
588@@ -139,7 +139,7 @@
589
590 // change using hmaxVertices if provided
591 if (bamgopts->hmaxVertices){
592- if (verbosity>1) printf(" Merging Metric with hmaxVertices...\n");
593+ if (verbosity>1) _printLine_(" Merging Metric with hmaxVertices...");
594 for (i=0;i<BTh.nbv;i++){
595 if (!isnan(bamgopts->hmaxVertices[i])){
596 Metric M=BTh.vertices[i].m;
597@@ -163,7 +163,7 @@
598 BTh.BoundAnisotropy(bamgopts->anisomax,hminaniso);
599
600 //Build new mesh
601- if (verbosity>1) printf(" Generating Mesh...\n");
602+ if (verbosity>1) _printLine_(" Generating Mesh...");
603 Thr=&BTh,Thb=0;
604 Mesh & Th( *(0 ? new Mesh(*Thr,&Thr->Gh,Thb,maxnbv) : new Mesh(maxnbv,BTh,bamgopts,bamgopts->KeepVertices)));
605 if (Thr != &BTh) delete Thr;
606@@ -184,19 +184,19 @@
607 //display info
608 if(verbosity>0) {
609 if (Th.nbt-Th.nbtout-Th.nbq*2){
610- printf(" new number of triangles = %i\n",(Th.nbt-Th.nbtout-Th.nbq*2));
611+ _printLine_(" new number of triangles = " << (Th.nbt-Th.nbtout-Th.nbq*2));
612 }
613 if (Th.nbq ){
614- printf(" new number of quads = %i\n",Th.nbq);
615+ _printLine_(" new number of quads = " << Th.nbq);
616 }
617 }
618
619 //Build output
620- if (verbosity>1) printf(" Write Mesh...\n");
621+ if (verbosity>1) _printLine_(" Write Mesh...");
622 Th.WriteMesh(bamgmesh_out,bamgopts);
623- if (verbosity>1) printf(" Write Geometry...\n");
624+ if (verbosity>1) _printLine_(" Write Geometry...");
625 Th.Gh.WriteGeometry(bamggeom_out,bamgopts);
626- if (verbosity>1) printf(" Write Metric...\n");
627+ if (verbosity>1) _printLine_(" Write Metric...");
628 BTh.WriteMetric(bamgopts);
629
630 /*clean up*/
631@@ -206,7 +206,7 @@
632 }
633
634 /*No error return*/
635- if (verbosity>1) printf(" Exiting Bamg.\n");
636+ if (verbosity>1) _printLine_(" Exiting Bamg.");
637 return noerr;
638
639 }
640Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp
641===================================================================
642--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 12510)
643+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 12511)
644@@ -58,9 +58,9 @@
645 void SeqVec::Echo(void){
646
647 int i;
648- printf("SeqVec size %i\n",this->M);
649+ _printLine_("SeqVec size " << this->M);
650 for(i=0;i<M;i++){
651- printf("%g\n ",vector[i]);
652+ _printString_("" << vector[i] << "\n ");
653 }
654 }
655 /*}}}*/
656Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.cpp
657===================================================================
658--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 12510)
659+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 12511)
660@@ -82,12 +82,12 @@
661 void SeqMat::Echo(void){
662
663 int i,j;
664- printf("SeqMat size %i-%i\n",this->M,this->N);
665+ _printLine_("SeqMat size " << this->M << "-" << this->N);
666 for(i=0;i<M;i++){
667 for(j=0;j<N;j++){
668- printf("%g ",this->matrix[N*i+j]);
669+ _printString_("" << this->matrix[N*i+j] << " ");
670 }
671- printf("\n");
672+ _printLine_("");
673 }
674 }
675 /*}}}*/
676Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.cpp
677===================================================================
678--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12510)
679+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12511)
680@@ -152,9 +152,9 @@
681
682 int i;
683
684- printf("DofIndexing:\n");
685- printf(" gsize: %i\n",gsize);
686- printf(" clone: %i\n",clone);
687+ _printLine_("DofIndexing:");
688+ _printLine_(" gsize: " << gsize);
689+ _printLine_(" clone: " << clone);
690 }
691 /*}}}*/
692 /*FUNCTION DofIndexing::DeepEcho{{{*/
693@@ -162,49 +162,49 @@
694
695 int i;
696
697- printf("DofIndexing:\n");
698- printf(" gsize: %i\n",gsize);
699- printf(" fsize: %i\n",fsize);
700- printf(" ssize: %i\n",ssize);
701- printf(" clone: %i\n",clone);
702+ _printLine_("DofIndexing:");
703+ _printLine_(" gsize: " << gsize);
704+ _printLine_(" fsize: " << fsize);
705+ _printLine_(" ssize: " << ssize);
706+ _printLine_(" clone: " << clone);
707
708- printf(" set membership: f,s sets \n");
709+ _printLine_(" set membership: f,s sets ");
710 for(i=0;i<gsize;i++){
711- printf(" dof %i: %s %s\n",i,f_set[i]?"true":"false",s_set[i]?"true":"false");
712+ _printLine_(" dof " << i << ": " <<(f_set[i]?"true":"false")<< " " <<(s_set[i]?"true":"false"));
713 }
714
715- printf(" svalues (%i): |",this->ssize);
716+ _printString_(" svalues (" << this->ssize << "): |");
717 for(i=0;i<this->gsize;i++){
718- if(this->s_set[i])printf(" %g |",svalues[i]);
719+ if(this->s_set[i])_printString_(" " << svalues[i] << " |");
720 }
721- printf("\n");
722+ _printLine_("");
723
724 if(doftype){
725- printf(" doftype: |");
726+ _printString_(" doftype: |");
727 for(i=0;i<gsize;i++){
728- printf(" %i |",doftype[i]);
729+ _printString_(" " << doftype[i] << " |");
730 }
731- printf("\n");
732+ _printLine_("");
733 }
734- else printf(" doftype: NULL\n");
735+ else _printLine_(" doftype: NULL");
736
737- printf(" g_doflist (%i): |",this->gsize);
738+ _printString_(" g_doflist (" << this->gsize << "): |");
739 for(i=0;i<this->gsize;i++){
740- printf(" %i |",gdoflist[i]);
741+ _printString_(" " << gdoflist[i] << " |");
742 }
743- printf("\n");
744+ _printLine_("");
745
746- printf(" f_doflist (%i): |",this->fsize);
747+ _printString_(" f_doflist (" << this->fsize << "): |");
748 for(i=0;i<this->fsize;i++){
749- printf(" %i |",fdoflist[i]);
750+ _printString_(" " << fdoflist[i] << " |");
751 }
752- printf("\n");
753+ _printLine_("");
754
755- printf(" s_doflist (%i): |",this->ssize);
756+ _printString_(" s_doflist (" << this->ssize << "): |");
757 for(i=0;i<this->ssize;i++){
758- printf(" %i |",sdoflist[i]);
759+ _printString_(" " << sdoflist[i] << " |");
760 }
761- printf("\n");
762+ _printLine_("");
763 }
764 /*}}}*/
765
766Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matice.cpp
767===================================================================
768--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12510)
769+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12511)
770@@ -59,22 +59,22 @@
771 /*FUNCTION Matice::Echo {{{*/
772 void Matice::Echo(void){
773
774- printf("Matice:\n");
775- printf(" mid: %i\n",mid);
776- printf(" inputs:\n");
777+ _printLine_("Matice:");
778+ _printLine_(" mid: " << mid);
779+ _printLine_(" inputs:");
780 inputs->Echo();
781- printf(" element:\n");
782+ _printLine_(" element:");
783 helement->Echo();
784 }
785 /*}}}*/
786 /*FUNCTION Matice::DeepEcho {{{*/
787 void Matice::DeepEcho(void){
788
789- printf("Matice:\n");
790- printf(" mid: %i\n",mid);
791- printf(" inputs:\n");
792+ _printLine_("Matice:");
793+ _printLine_(" mid: " << mid);
794+ _printLine_(" inputs:");
795 inputs->DeepEcho();
796- printf(" element:\n");
797+ _printLine_(" element:");
798 helement->Echo();
799 }
800 /*}}}*/
801Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matpar.cpp
802===================================================================
803--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12510)
804+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12511)
805@@ -56,21 +56,21 @@
806 /*FUNCTION Matpar::Echo {{{*/
807 void Matpar::Echo(void){
808
809- printf("Matpar:\n");
810- printf(" mid: %i\n",mid);
811- printf(" rho_ice: %g\n",rho_ice);
812- printf(" rho_water: %g\n",rho_water);
813- printf(" rho_freshwater: %g\n",rho_freshwater);
814- printf(" mu_water: %g\n",mu_water);
815- printf(" heatcapacity: %g\n",heatcapacity);
816- printf(" thermalconductivity: %g\n",thermalconductivity);
817- printf(" latentheat: %g\n",latentheat);
818- printf(" beta: %g\n",beta);
819- printf(" meltingpoint: %g\n",meltingpoint);
820- printf(" referencetemperature: %g\n",referencetemperature);
821- printf(" mixed_layer_capacity: %g\n",mixed_layer_capacity);
822- printf(" thermal_exchange_velocity: %g\n",thermal_exchange_velocity);
823- printf(" g: %g\n",g);
824+ _printLine_("Matpar:");
825+ _printLine_(" mid: " << mid);
826+ _printLine_(" rho_ice: " << rho_ice);
827+ _printLine_(" rho_water: " << rho_water);
828+ _printLine_(" rho_freshwater: " << rho_freshwater);
829+ _printLine_(" mu_water: " << mu_water);
830+ _printLine_(" heatcapacity: " << heatcapacity);
831+ _printLine_(" thermalconductivity: " << thermalconductivity);
832+ _printLine_(" latentheat: " << latentheat);
833+ _printLine_(" beta: " << beta);
834+ _printLine_(" meltingpoint: " << meltingpoint);
835+ _printLine_(" referencetemperature: " << referencetemperature);
836+ _printLine_(" mixed_layer_capacity: " << mixed_layer_capacity);
837+ _printLine_(" thermal_exchange_velocity: " << thermal_exchange_velocity);
838+ _printLine_(" g: " << g);
839 return;
840 }
841 /*}}}*/
842Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Gauss/GaussTria.cpp
843===================================================================
844--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Gauss/GaussTria.cpp (revision 12510)
845+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Gauss/GaussTria.cpp (revision 12511)
846@@ -107,38 +107,38 @@
847 /*FUNCTION GaussTria::Echo{{{*/
848 void GaussTria::Echo(void){
849
850- printf("GaussTria:\n");
851- printf(" numgauss: %i\n",numgauss);
852+ _printLine_("GaussTria:");
853+ _printLine_(" numgauss: " << numgauss);
854
855 if (weights){
856- printf(" weights = [");
857- for(int i=0;i<numgauss;i++) printf(" %g\n",weights[i]);
858- printf("]\n");
859+ _printString_(" weights = [");
860+ for(int i=0;i<numgauss;i++) _printLine_(" " << weights[i]);
861+ _printLine_("]");
862 }
863- else printf("weights = NULL\n");
864+ else _printLine_("weights = NULL");
865 if (coords1){
866- printf(" coords1 = [");
867- for(int i=0;i<numgauss;i++) printf(" %g\n",coords1[i]);
868- printf("]\n");
869+ _printString_(" coords1 = [");
870+ for(int i=0;i<numgauss;i++) _printLine_(" " << coords1[i]);
871+ _printLine_("]");
872 }
873- else printf("coords1 = NULL\n");
874+ else _printLine_("coords1 = NULL");
875 if (coords2){
876- printf(" coords2 = [");
877- for(int i=0;i<numgauss;i++) printf(" %g\n",coords2[i]);
878- printf("]\n");
879+ _printString_(" coords2 = [");
880+ for(int i=0;i<numgauss;i++) _printLine_(" " << coords2[i]);
881+ _printLine_("]");
882 }
883- else printf("coords2 = NULL\n");
884+ else _printLine_("coords2 = NULL");
885 if (coords3){
886- printf(" coords3 = [");
887- for(int i=0;i<numgauss;i++) printf(" %g\n",coords3[i]);
888- printf("]\n");
889+ _printString_(" coords3 = [");
890+ for(int i=0;i<numgauss;i++) _printLine_(" " << coords3[i]);
891+ _printLine_("]");
892 }
893- else printf("coords3 = NULL\n");
894+ else _printLine_("coords3 = NULL");
895
896- printf(" weight = %g\n",weight);
897- printf(" coord1 = %g\n",coord1);
898- printf(" coord2 = %g\n",coord2);
899- printf(" coord3 = %g\n",coord3);
900+ _printLine_(" weight = " << weight);
901+ _printLine_(" coord1 = " << coord1);
902+ _printLine_(" coord2 = " << coord2);
903+ _printLine_(" coord3 = " << coord3);
904
905 }
906 /*}}}*/
907Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Gauss/GaussPenta.cpp
908===================================================================
909--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Gauss/GaussPenta.cpp (revision 12510)
910+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Gauss/GaussPenta.cpp (revision 12511)
911@@ -246,45 +246,45 @@
912 /*FUNCTION GaussPenta::Echo{{{*/
913 void GaussPenta::Echo(void){
914
915- printf("GaussPenta:\n");
916- printf(" numgauss: %i\n",numgauss);
917+ _printLine_("GaussPenta:");
918+ _printLine_(" numgauss: " << numgauss);
919
920 if (weights){
921- printf(" weights = [");
922- for(int i=0;i<numgauss;i++) printf(" %g\n",weights[i]);
923- printf("]\n");
924+ _printString_(" weights = [");
925+ for(int i=0;i<numgauss;i++) _printLine_(" " << weights[i]);
926+ _printLine_("]");
927 }
928- else printf("weights = NULL\n");
929+ else _printLine_("weights = NULL");
930 if (coords1){
931- printf(" coords1 = [");
932- for(int i=0;i<numgauss;i++) printf(" %g\n",coords1[i]);
933- printf("]\n");
934+ _printString_(" coords1 = [");
935+ for(int i=0;i<numgauss;i++) _printLine_(" " << coords1[i]);
936+ _printLine_("]");
937 }
938- else printf("coords1 = NULL\n");
939+ else _printLine_("coords1 = NULL");
940 if (coords2){
941- printf(" coords2 = [");
942- for(int i=0;i<numgauss;i++) printf(" %g\n",coords2[i]);
943- printf("]\n");
944+ _printString_(" coords2 = [");
945+ for(int i=0;i<numgauss;i++) _printLine_(" " << coords2[i]);
946+ _printLine_("]");
947 }
948- else printf("coords2 = NULL\n");
949+ else _printLine_("coords2 = NULL");
950 if (coords3){
951- printf(" coords3 = [");
952- for(int i=0;i<numgauss;i++) printf(" %g\n",coords3[i]);
953- printf("]\n");
954+ _printString_(" coords3 = [");
955+ for(int i=0;i<numgauss;i++) _printLine_(" " << coords3[i]);
956+ _printLine_("]");
957 }
958- else printf("coords3 = NULL\n");
959+ else _printLine_("coords3 = NULL");
960 if (coords4){
961- printf(" coords4 = [");
962- for(int i=0;i<numgauss;i++) printf(" %g\n",coords4[i]);
963- printf("]\n");
964+ _printString_(" coords4 = [");
965+ for(int i=0;i<numgauss;i++) _printLine_(" " << coords4[i]);
966+ _printLine_("]");
967 }
968- else printf("coords4 = NULL\n");
969+ else _printLine_("coords4 = NULL");
970
971- printf(" weight = %g\n",weight);
972- printf(" coord1 = %g\n",coord1);
973- printf(" coord2 = %g\n",coord2);
974- printf(" coord3 = %g\n",coord3);
975- printf(" coord4 = %g\n",coord4);
976+ _printLine_(" weight = " << weight);
977+ _printLine_(" coord1 = " << coord1);
978+ _printLine_(" coord2 = " << coord2);
979+ _printLine_(" coord3 = " << coord3);
980+ _printLine_(" coord4 = " << coord4);
981
982 }
983 /*}}}*/
984Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.cpp
985===================================================================
986--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.cpp (revision 12510)
987+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.cpp (revision 12511)
988@@ -47,9 +47,9 @@
989 /*FUNCTION FileParam::DeepEcho{{{*/
990 void FileParam::DeepEcho(void){
991
992- printf("FileParam:\n");
993- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
994- printf(" value: %p\n",this->value);
995+ _printLine_("FileParam:");
996+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
997+ _printLine_(" value: " << this->value);
998 }
999 /*}}}*/
1000 /*FUNCTION FileParam::Id{{{*/
1001Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.cpp
1002===================================================================
1003--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12510)
1004+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12511)
1005@@ -62,9 +62,9 @@
1006 /*FUNCTION IntVecParam::Echo {{{*/
1007 void IntVecParam::Echo(void){
1008
1009- printf("IntVecParam:\n");
1010- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1011- printf(" vector size: %i\n",this->M);
1012+ _printLine_("IntVecParam:");
1013+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1014+ _printLine_(" vector size: " << this->M);
1015
1016 }
1017 /*}}}*/
1018@@ -73,11 +73,11 @@
1019
1020 int i;
1021
1022- printf("IntVecParam:\n");
1023- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1024- printf(" vector size: %i\n",this->M);
1025+ _printLine_("IntVecParam:");
1026+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1027+ _printLine_(" vector size: " << this->M);
1028 for(i=0;i<this->M;i++){
1029- printf("%i %i\n",i,this->values[i]);
1030+ _printLine_("" << i << " " << this->values[i]);
1031 }
1032 }
1033 /*}}}*/
1034Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.cpp
1035===================================================================
1036--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12510)
1037+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12511)
1038@@ -47,9 +47,9 @@
1039 /*FUNCTION IntParam::DeepEcho{{{*/
1040 void IntParam::DeepEcho(void){
1041
1042- printf("IntParam:\n");
1043- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1044- printf(" value: %i\n",this->value);
1045+ _printLine_("IntParam:");
1046+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1047+ _printLine_(" value: " << this->value);
1048 }
1049 /*}}}*/
1050 /*FUNCTION IntParam::Id{{{*/
1051Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.cpp
1052===================================================================
1053--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12510)
1054+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12511)
1055@@ -47,9 +47,9 @@
1056 /*FUNCTION BoolParam::DeepEcho{{{*/
1057 void BoolParam::DeepEcho(void){
1058
1059- printf("BoolParam:\n");
1060- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1061- printf(" value: %s\n",this->value?"true":"false");
1062+ _printLine_("BoolParam:");
1063+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1064+ _printLine_(" value: " <<(this->value?"true":"false"));
1065 }
1066 /*}}}*/
1067 /*FUNCTION BoolParam::Id{{{*/
1068Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.cpp
1069===================================================================
1070--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12510)
1071+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12511)
1072@@ -47,9 +47,9 @@
1073 /*FUNCTION IntMatParam::Echo {{{*/
1074 void IntMatParam::Echo(void){
1075
1076- printf("IntMatParam:\n");
1077- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1078- printf(" matrix size: %ix%i\n",this->M,this->N);
1079+ _printLine_("IntMatParam:");
1080+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1081+ _printLine_(" matrix size: " << this->M << "x" << this->N);
1082
1083 }
1084 /*}}}*/
1085@@ -58,12 +58,12 @@
1086
1087 int i,j;
1088
1089- printf("IntMatParam:\n");
1090- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1091- printf(" matrix size: %ix%i\n",this->M,this->N);
1092+ _printLine_("IntMatParam:");
1093+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1094+ _printLine_(" matrix size: " << this->M << "x" << this->N);
1095 for(i=0;i<this->M;i++){
1096 for(i=0;i<this->N;i++){
1097- printf("(%i,%i) %i\n",i,j,*(this->value+N*i+j));
1098+ _printLine_("(" << i << "," << j << ") " << *(this->value+N*i+j));
1099 }
1100 }
1101 }
1102Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.cpp
1103===================================================================
1104--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12510)
1105+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12511)
1106@@ -48,8 +48,8 @@
1107 /*FUNCTION VectorParam::Echo {{{*/
1108 void VectorParam::Echo(void){
1109
1110- printf("VectorParam:\n");
1111- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1112+ _printLine_("VectorParam:");
1113+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1114
1115 }
1116 /*}}}*/
1117@@ -57,8 +57,8 @@
1118 void VectorParam::DeepEcho(void){
1119
1120 int i;
1121- printf("VectorParam:\n");
1122- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1123+ _printLine_("VectorParam:");
1124+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1125 value->Echo();
1126 }
1127 /*}}}*/
1128Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.cpp
1129===================================================================
1130--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12510)
1131+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12511)
1132@@ -46,8 +46,8 @@
1133 /*FUNCTION MatrixParam::Echo {{{*/
1134 void MatrixParam::Echo(void){
1135
1136- printf("MatrixParam:\n");
1137- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1138+ _printLine_("MatrixParam:");
1139+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1140
1141 }
1142 /*}}}*/
1143@@ -55,8 +55,8 @@
1144 void MatrixParam::DeepEcho(void){
1145
1146 int i;
1147- printf("MatrixParam:\n");
1148- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1149+ _printLine_("MatrixParam:");
1150+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1151 this->value->Echo();
1152 }
1153 /*}}}*/
1154Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.cpp
1155===================================================================
1156--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12510)
1157+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12511)
1158@@ -74,11 +74,11 @@
1159 int i;
1160 char* string=NULL;
1161
1162- printf("StringArrayParam:\n");
1163- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1164+ _printLine_("StringArrayParam:");
1165+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1166 for(i=0;i<this->numstrings;i++){
1167 string=this->value[i];
1168- printf(" %i: %s\n",i,string);
1169+ _printLine_(" " << i << ": " << string);
1170 }
1171 }
1172 /*}}}*/
1173Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.cpp
1174===================================================================
1175--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12510)
1176+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12511)
1177@@ -49,9 +49,9 @@
1178 /*}}}*/
1179 /*FUNCTION StringParam::DeepEcho{{{*/
1180 void StringParam::DeepEcho(void){
1181- printf("StringParam:\n");
1182- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1183- printf(" value: %s\n",this->value);
1184+ _printLine_("StringParam:");
1185+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1186+ _printLine_(" value: " << this->value);
1187 }
1188 /*}}}*/
1189 /*FUNCTION StringParam::Id{{{*/
1190Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp
1191===================================================================
1192--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12510)
1193+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12511)
1194@@ -46,9 +46,9 @@
1195 /*FUNCTION DoubleVecParam::Echo {{{*/
1196 void DoubleVecParam::Echo(void){
1197
1198- printf("DoubleVecParam:\n");
1199- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1200- printf(" vector size: %i\n",this->M);
1201+ _printLine_("DoubleVecParam:");
1202+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1203+ _printLine_(" vector size: " << this->M);
1204
1205 }
1206 /*}}}*/
1207@@ -57,11 +57,11 @@
1208
1209 int i;
1210
1211- printf("DoubleVecParam:\n");
1212- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1213- printf(" vector size: %i\n",this->M);
1214+ _printLine_("DoubleVecParam:");
1215+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1216+ _printLine_(" vector size: " << this->M);
1217 for(i=0;i<this->M;i++){
1218- printf("%i %g\n",i,this->values[i]);
1219+ _printLine_("" << i << " " << this->values[i]);
1220 }
1221 }
1222 /*}}}*/
1223Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.cpp
1224===================================================================
1225--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12510)
1226+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12511)
1227@@ -44,9 +44,9 @@
1228 /*FUNCTION DoubleParam::DeepEcho{{{*/
1229 void DoubleParam::DeepEcho(void){
1230
1231- printf("DoubleParam:\n");
1232- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1233- printf(" value: %g\n",this->value);
1234+ _printLine_("DoubleParam:");
1235+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1236+ _printLine_(" value: " << this->value);
1237 }
1238 /*}}}*/
1239 /*FUNCTION DoubleParam::Id{{{*/
1240Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp
1241===================================================================
1242--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12510)
1243+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12511)
1244@@ -86,10 +86,10 @@
1245 /*FUNCTION DoubleMatArrayParam::Echo {{{*/
1246 void DoubleMatArrayParam::Echo(void){
1247
1248- printf("DoubleMatArrayParam:\n");
1249- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1250- printf(" array size: %i\n",this->M);
1251- printf(" array pointer: %p\n",this->array);
1252+ _printLine_("DoubleMatArrayParam:");
1253+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1254+ _printLine_(" array size: " << this->M);
1255+ _printLine_(" array pointer: " << this->array);
1256
1257 }
1258 /*}}}*/
1259@@ -100,19 +100,19 @@
1260 int m,n;
1261 IssmDouble* matrix=NULL;
1262
1263- printf("DoubleMatArrayParam:\n");
1264- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1265- printf(" array size: %i\n",this->M);
1266+ _printLine_("DoubleMatArrayParam:");
1267+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1268+ _printLine_(" array size: " << this->M);
1269 for(i=0;i<M;i++){
1270- printf(" array %i (%ix%i):\n",i,mdim_array[i],ndim_array[i]);
1271+ _printLine_(" array " << i << " (" << mdim_array[i] << "x" << ndim_array[i] << "):");
1272 matrix=array[i];
1273 m=mdim_array[i];
1274 n=ndim_array[i];
1275
1276 for(j=0;j<m;j++){
1277- printf(" ");
1278- for(k=0;k<n;k++)printf("%g ",*(matrix+n*j+k));
1279- printf("\n");
1280+ _printString_(" ");
1281+ for(k=0;k<n;k++)_printString_("" << *(matrix+n*j+k) << " ");
1282+ _printLine_("");
1283 }
1284 }
1285 }
1286Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp
1287===================================================================
1288--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp (revision 12510)
1289+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp (revision 12511)
1290@@ -47,9 +47,9 @@
1291 /*FUNCTION DoubleMatParam::Echo {{{*/
1292 void DoubleMatParam::Echo(void){
1293
1294- printf("DoubleMatParam:\n");
1295- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1296- printf(" matrix size: %ix%i\n",this->M,this->N);
1297+ _printLine_("DoubleMatParam:");
1298+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1299+ _printLine_(" matrix size: " << this->M << "x" << this->N);
1300
1301 }
1302 /*}}}*/
1303@@ -58,12 +58,12 @@
1304
1305 int i,j;
1306
1307- printf("DoubleMatParam:\n");
1308- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1309- printf(" matrix size: %ix%i\n",this->M,this->N);
1310+ _printLine_("DoubleMatParam:");
1311+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1312+ _printLine_(" matrix size: " << this->M << "x" << this->N);
1313 for(i=0;i<this->M;i++){
1314 for(i=0;i<this->N;i++){
1315- printf("%i %i %g\n",i,j,*(this->value+N*i+j));
1316+ _printLine_("" << i << " " << j << " " << *(this->value+N*i+j));
1317 }
1318 }
1319 }
1320Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.cpp
1321===================================================================
1322--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.cpp (revision 12510)
1323+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.cpp (revision 12511)
1324@@ -48,10 +48,10 @@
1325 /*FUNCTION Segment::Echo{{{*/
1326 void Segment::Echo(void){
1327
1328- printf("Segment:\n");
1329- printf(" eid: %i\n",eid);
1330- printf(" node 1: %g|%g\n",this->x1,this->y1);
1331- printf(" node 2: %g|%g\n",this->x2,this->y2);
1332+ _printLine_("Segment:");
1333+ _printLine_(" eid: " << eid);
1334+ _printLine_(" node 1: " << this->x1 << "|" << this->y1);
1335+ _printLine_(" node 2: " << this->x2 << "|" << this->y2);
1336
1337 }
1338 /*}}}*/
1339Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/Matrix.cpp
1340===================================================================
1341--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/Matrix.cpp (revision 12510)
1342+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/Matrix.cpp (revision 12511)
1343@@ -129,12 +129,12 @@
1344
1345 #ifdef _HAVE_ADOLC_
1346 /*Not sure about that one. Should we use the overloaded operator >>?*/
1347- printf("ADOLC Matrix equivalent:" );
1348+ _printString_("ADOLC Matrix equivalent:" );
1349 for(i=0;i<M;i++){
1350 for(j=0;j<N;j++){
1351- printf("%g ",*(amatrix+N*i+j));
1352+ _printString_("" << *(amatrix+N*i+j) << " ");
1353 }
1354- printf("\n");
1355+ _printLine_("");
1356 }
1357 #endif
1358 }
1359Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Vertex.cpp
1360===================================================================
1361--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Vertex.cpp (revision 12510)
1362+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Vertex.cpp (revision 12511)
1363@@ -63,16 +63,16 @@
1364 /*FUNCTION Vertex::Echo{{{*/
1365 void Vertex::Echo(void){
1366
1367- printf("Vertex:\n");
1368- printf(" id: %i\n",id);
1369- printf(" sid: %i\n",sid);
1370- printf(" x: %g\n",x);
1371- printf(" y: %g\n",y);
1372- printf(" z: %g\n",z);
1373- printf(" sigma: %g\n",sigma);
1374- printf(" connectivity: %i\n",connectivity);
1375- printf(" dof: %i\n",dof);
1376- printf(" clone: %i\n",clone);
1377+ _printLine_("Vertex:");
1378+ _printLine_(" id: " << id);
1379+ _printLine_(" sid: " << sid);
1380+ _printLine_(" x: " << x);
1381+ _printLine_(" y: " << y);
1382+ _printLine_(" z: " << z);
1383+ _printLine_(" sigma: " << sigma);
1384+ _printLine_(" connectivity: " << connectivity);
1385+ _printLine_(" dof: " << dof);
1386+ _printLine_(" clone: " << clone);
1387
1388 return;
1389 }
1390Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Numericalflux.cpp
1391===================================================================
1392--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Numericalflux.cpp (revision 12510)
1393+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Numericalflux.cpp (revision 12511)
1394@@ -150,29 +150,29 @@
1395 /*Object virtual functions definitions:*/
1396 /*FUNCTION Numericalflux::Echo {{{*/
1397 void Numericalflux::Echo(void){
1398- printf("Numericalflux:\n");
1399- printf(" id: %i\n",id);
1400- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1401+ _printLine_("Numericalflux:");
1402+ _printLine_(" id: " << id);
1403+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1404 hnodes->Echo();
1405 helement->Echo();
1406- printf(" parameters: %p\n",parameters);
1407- printf(" inputs: %p\n",inputs);
1408+ _printLine_(" parameters: " << parameters);
1409+ _printLine_(" inputs: " << inputs);
1410 }
1411 /*}}}*/
1412 /*FUNCTION Numericalflux::DeepEcho {{{*/
1413 void Numericalflux::DeepEcho(void){
1414
1415- printf("Numericalflux:\n");
1416- printf(" id: %i\n",id);
1417- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1418+ _printLine_("Numericalflux:");
1419+ _printLine_(" id: " << id);
1420+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1421 hnodes->DeepEcho();
1422 helement->DeepEcho();
1423- printf(" parameters\n");
1424+ _printLine_(" parameters");
1425 if(parameters)
1426 parameters->DeepEcho();
1427 else
1428- printf(" NULL\n");
1429- printf(" inputs\n");
1430+ _printLine_(" NULL");
1431+ _printLine_(" inputs");
1432 inputs->DeepEcho();
1433
1434 }
1435Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Penpair.cpp
1436===================================================================
1437--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 12510)
1438+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 12511)
1439@@ -56,9 +56,9 @@
1440
1441 int i;
1442
1443- printf("Penpair:\n");
1444- printf(" id: %i\n",id);
1445- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1446+ _printLine_("Penpair:");
1447+ _printLine_(" id: " << id);
1448+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1449 hnodes->Echo();
1450
1451 return;
1452@@ -67,9 +67,9 @@
1453 /*FUNCTION Penpair::DeepEcho {{{*/
1454 void Penpair::DeepEcho(void){
1455
1456- printf("Penpair:\n");
1457- printf(" id: %i\n",id);
1458- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1459+ _printLine_("Penpair:");
1460+ _printLine_(" id: " << id);
1461+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1462 hnodes->DeepEcho();
1463
1464 return;
1465Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Pengrid.cpp
1466===================================================================
1467--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Pengrid.cpp (revision 12510)
1468+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Pengrid.cpp (revision 12511)
1469@@ -108,17 +108,17 @@
1470 /*FUNCTION Pengrid::DeepEcho{{{*/
1471 void Pengrid::DeepEcho(void){
1472
1473- printf("Pengrid:\n");
1474- printf(" id: %i\n",id);
1475- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1476+ _printLine_("Pengrid:");
1477+ _printLine_(" id: " << id);
1478+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1479 hnode->DeepEcho();
1480 helement->DeepEcho();
1481 hmatpar->DeepEcho();
1482- printf(" active %i\n",this->active);
1483- printf(" zigzag_counter %i\n",this->zigzag_counter);
1484- printf(" parameters\n");
1485+ _printLine_(" active " << this->active);
1486+ _printLine_(" zigzag_counter " << this->zigzag_counter);
1487+ _printLine_(" parameters");
1488 parameters->DeepEcho();
1489- printf(" inputs\n");
1490+ _printLine_(" inputs");
1491 inputs->DeepEcho();
1492 }
1493 /*}}}*/
1494Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Icefront.cpp
1495===================================================================
1496--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 12510)
1497+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 12511)
1498@@ -126,30 +126,30 @@
1499 /*Object virtual functions definitions:*/
1500 /*FUNCTION Icefront::Echo {{{*/
1501 void Icefront::Echo(void){
1502- printf("Icefront:\n");
1503- printf(" id: %i\n",id);
1504- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1505+ _printLine_("Icefront:");
1506+ _printLine_(" id: " << id);
1507+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1508 hnodes->Echo();
1509 helement->Echo();
1510 hmatpar->Echo();
1511- printf(" parameters: %p\n",parameters);
1512+ _printLine_(" parameters: " << parameters);
1513 if(parameters)parameters->Echo();
1514- printf(" inputs: %p\n",inputs);
1515+ _printLine_(" inputs: " << inputs);
1516 if(inputs)inputs->Echo();
1517 }
1518 /*}}}*/
1519 /*FUNCTION Icefront::DeepEcho{{{*/
1520 void Icefront::DeepEcho(void){
1521
1522- printf("Icefront:\n");
1523- printf(" id: %i\n",id);
1524- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1525+ _printLine_("Icefront:");
1526+ _printLine_(" id: " << id);
1527+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1528 hnodes->DeepEcho();
1529 helement->DeepEcho();
1530 hmatpar->DeepEcho();
1531- printf(" parameters: %p\n",parameters);
1532+ _printLine_(" parameters: " << parameters);
1533 if(parameters)parameters->DeepEcho();
1534- printf(" inputs: %p\n",inputs);
1535+ _printLine_(" inputs: " << inputs);
1536 if(inputs)inputs->DeepEcho();
1537 }
1538 /*}}}*/
1539Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Friction.cpp
1540===================================================================
1541--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Friction.cpp (revision 12510)
1542+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Friction.cpp (revision 12511)
1543@@ -47,9 +47,9 @@
1544 /*methods: */
1545 /*FUNCTION Friction::Echo {{{*/
1546 void Friction::Echo(void){
1547- printf("Friction:\n");
1548- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1549- printf(" element_type: %s\n",this->element_type);
1550+ _printLine_("Friction:");
1551+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1552+ _printLine_(" element_type: " << this->element_type);
1553 inputs->Echo();
1554 matpar->Echo();
1555 }
1556Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Riftfront.cpp
1557===================================================================
1558--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12510)
1559+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12511)
1560@@ -142,43 +142,43 @@
1561 input=(Input*)this->inputs->GetInput(FrictionEnum); input->GetInputValue(&friction);
1562 input=(Input*)this->inputs->GetInput(FractionIncrementEnum); input->GetInputValue(&fractionincrement);
1563
1564- printf("Riftfront:\n");
1565- printf(" id: %i\n",id);
1566- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1567- printf(" hnodes: %p\n",hnodes);
1568- printf(" helements: %p\n",helements);
1569- printf(" hmatpar: %p\n",hmatpar);
1570- printf(" parameters: %p\n",parameters);
1571- printf(" inputs: %p\n",inputs);
1572- printf(" internal parameters: \n");
1573- printf(" normal: %g|%g\n",normal[0],normal[1]);
1574- printf(" length: %g\n",length);
1575- printf(" penalty_lock: %i\n",penalty_lock);
1576- printf(" active: %s\n",active ? "true":"false");
1577- printf(" counter: %i\n",counter);
1578- printf(" prestable: %s\n",prestable ? "true":"false");
1579- printf(" material_converged: %s\n",material_converged ? "true":"false");
1580- printf(" fill: %i\n",fill);
1581- printf(" friction: %g\n",friction);
1582- printf(" fraction: %g\n",fraction);
1583- printf(" fractionincrement: %g\n",fractionincrement);
1584- printf(" state: %i\n",state);
1585- printf(" frozen: %s\n",frozen ? "true":"false");
1586+ _printLine_("Riftfront:");
1587+ _printLine_(" id: " << id);
1588+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1589+ _printLine_(" hnodes: " << hnodes);
1590+ _printLine_(" helements: " << helements);
1591+ _printLine_(" hmatpar: " << hmatpar);
1592+ _printLine_(" parameters: " << parameters);
1593+ _printLine_(" inputs: " << inputs);
1594+ _printLine_(" internal parameters: ");
1595+ _printLine_(" normal: " << normal[0] << "|" << normal[1]);
1596+ _printLine_(" length: " << length);
1597+ _printLine_(" penalty_lock: " << penalty_lock);
1598+ _printLine_(" active: " <<(active ? "true":"false"));
1599+ _printLine_(" counter: " << counter);
1600+ _printLine_(" prestable: " << (prestable ? "true":"false"));
1601+ _printLine_(" material_converged: " << (material_converged ? "true":"false"));
1602+ _printLine_(" fill: " << fill);
1603+ _printLine_(" friction: " << friction);
1604+ _printLine_(" fraction: " << fraction);
1605+ _printLine_(" fractionincrement: " << fractionincrement);
1606+ _printLine_(" state: " << state);
1607+ _printLine_(" frozen: " << (frozen ? "true":"false"));
1608
1609 }
1610 /*}}}*/
1611 /*FUNCTION Riftfront::DeepEcho{{{*/
1612 void Riftfront::DeepEcho(void){
1613
1614- printf("Riftfront:\n");
1615- printf(" id: %i\n",id);
1616- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
1617+ _printLine_("Riftfront:");
1618+ _printLine_(" id: " << id);
1619+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
1620 hnodes->DeepEcho();
1621 helements->DeepEcho();
1622 hmatpar->DeepEcho();
1623- printf(" parameters\n");
1624+ _printLine_(" parameters");
1625 if(parameters)parameters->DeepEcho();
1626- printf(" inputs\n");
1627+ _printLine_(" inputs");
1628 if(inputs)inputs->DeepEcho();
1629 }
1630 /*}}}*/
1631@@ -632,7 +632,7 @@
1632 /*increase melange fraction: */
1633 this->fraction+=fractionincrement;
1634 if (this->fraction>1)this->fraction=(IssmDouble)1.0;
1635- //printf("riftfront %i fraction: %g\n",this->Id(),this->fraction);
1636+ //_printLine_("riftfront " << this->Id() << " fraction: " << this->fraction);
1637 }
1638
1639 //Figure out stability of this penalty
1640@@ -647,7 +647,7 @@
1641 //Set penalty flag
1642 this->active=activate;
1643
1644- //if ((penetration>0) && (this->active==1))printf("Riftfront %i wants to be released\n",Id());
1645+ //if ((penetration>0) && (this->active==1))_printLine_("Riftfront " << Id() << " wants to be released");
1646
1647 /*assign output pointer: */
1648 *punstable=unstable;
1649Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp
1650===================================================================
1651--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 12510)
1652+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 12511)
1653@@ -56,11 +56,11 @@
1654 /*FUNCTION DoubleMatExternalResult::Echo {{{*/
1655 void DoubleMatExternalResult::Echo(void){
1656
1657- printf("DoubleMatExternalResult:\n");
1658- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1659- printf(" step: %i\n",this->step);
1660- printf(" time: %g\n",this->time);
1661- printf(" matrix size: %i-%i\n",this->M,this->N);
1662+ _printLine_("DoubleMatExternalResult:");
1663+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1664+ _printLine_(" step: " << this->step);
1665+ _printLine_(" time: " << this->time);
1666+ _printLine_(" matrix size: " << this->M << "-" << this->N);
1667
1668 }
1669 /*}}}*/
1670@@ -69,12 +69,12 @@
1671
1672 int i,j;
1673
1674- printf("DoubleMatExternalResult:\n");
1675- printf(" id: %i\n",this->id);
1676- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1677- printf(" step: %i\n",this->step);
1678- printf(" time: %g\n",this->time);
1679- printf(" matrix size: %i-%i\n",this->M,this->N);
1680+ _printLine_("DoubleMatExternalResult:");
1681+ _printLine_(" id: " << this->id);
1682+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1683+ _printLine_(" step: " << this->step);
1684+ _printLine_(" time: " << this->time);
1685+ _printLine_(" matrix size: " << this->M << "-" << this->N);
1686 for (i=0;i<this->M;i++){
1687 _printString_(" [ ");
1688 for (j=0;j<this->N;j++){
1689Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp
1690===================================================================
1691--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 12510)
1692+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 12511)
1693@@ -53,8 +53,8 @@
1694 /*FUNCTION PetscVecExternalResult::Echo {{{*/
1695 void PetscVecExternalResult::Echo(void){
1696
1697- printf("PetscVecExternalResult:\n");
1698- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1699+ _printLine_("PetscVecExternalResult:");
1700+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1701
1702 }
1703 /*}}}*/
1704@@ -62,11 +62,11 @@
1705 void PetscVecExternalResult::DeepEcho(void){
1706
1707 int i;
1708- printf("PetscVecExternalResult:\n");
1709- printf(" id: %i\n",this->id);
1710- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1711- printf(" step: %i\n",this->step);
1712- printf(" time: %g\n",this->time);
1713+ _printLine_("PetscVecExternalResult:");
1714+ _printLine_(" id: " << this->id);
1715+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1716+ _printLine_(" step: " << this->step);
1717+ _printLine_(" time: " << this->time);
1718 VecView(value,PETSC_VIEWER_STDOUT_WORLD);
1719 }
1720 /*}}}*/
1721Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp
1722===================================================================
1723--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 12510)
1724+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 12511)
1725@@ -52,12 +52,12 @@
1726 /*FUNCTION StringExternalResult::DeepEcho{{{*/
1727 void StringExternalResult::DeepEcho(void){
1728
1729- printf("StringExternalResult:\n");
1730- printf(" id: %i\n",this->id);
1731- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1732- printf(" value: %s\n",this->value);
1733- printf(" step: %i\n",this->step);
1734- printf(" time: %g\n",this->time);
1735+ _printLine_("StringExternalResult:");
1736+ _printLine_(" id: " << this->id);
1737+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1738+ _printLine_(" value: " << this->value);
1739+ _printLine_(" step: " << this->step);
1740+ _printLine_(" time: " << this->time);
1741 }
1742 /*}}}*/
1743 /*FUNCTION StringExternalResult::Id{{{*/
1744Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp
1745===================================================================
1746--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 12510)
1747+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 12511)
1748@@ -53,11 +53,11 @@
1749 /*FUNCTION DoubleVecExternalResult::Echo {{{*/
1750 void DoubleVecExternalResult::Echo(void){
1751
1752- printf("DoubleVecExternalResult:\n");
1753- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1754- printf(" vector size: %i\n",this->M);
1755- printf(" step: %i\n",this->step);
1756- printf(" time: %g\n",this->time);
1757+ _printLine_("DoubleVecExternalResult:");
1758+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1759+ _printLine_(" vector size: " << this->M);
1760+ _printLine_(" step: " << this->step);
1761+ _printLine_(" time: " << this->time);
1762
1763 }
1764 /*}}}*/
1765@@ -66,15 +66,15 @@
1766
1767 int i;
1768
1769- printf("DoubleVecExternalResult:\n");
1770- printf(" id: %i\n",this->id);
1771- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1772- printf(" vector size: %i\n",this->M);
1773+ _printLine_("DoubleVecExternalResult:");
1774+ _printLine_(" id: " << this->id);
1775+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1776+ _printLine_(" vector size: " << this->M);
1777 for(i=0;i<this->M;i++){
1778- printf("%i %g\n",i,this->values[i]);
1779+ _printLine_("" << i << " " << this->values[i]);
1780 }
1781- printf(" step: %i\n",this->step);
1782- printf(" time: %g\n",this->time);
1783+ _printLine_(" step: " << this->step);
1784+ _printLine_(" time: " << this->time);
1785 }
1786 /*}}}*/
1787 /*FUNCTION DoubleVecExternalResult::Id{{{*/
1788Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp
1789===================================================================
1790--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 12510)
1791+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 12511)
1792@@ -50,12 +50,12 @@
1793 /*FUNCTION DoubleExternalResult::DeepEcho{{{*/
1794 void DoubleExternalResult::DeepEcho(void){
1795
1796- printf("DoubleExternalResult:\n");
1797- printf(" id: %i\n",this->id);
1798- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1799- printf(" value: %g\n",this->value);
1800- printf(" step: %i\n",this->step);
1801- printf(" time: %g\n",this->time);
1802+ _printLine_("DoubleExternalResult:");
1803+ _printLine_(" id: " << this->id);
1804+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1805+ _printLine_(" value: " << this->value);
1806+ _printLine_(" step: " << this->step);
1807+ _printLine_(" time: " << this->time);
1808 }
1809 /*}}}*/
1810 /*FUNCTION DoubleExternalResult::Id{{{*/
1811Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp
1812===================================================================
1813--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 12510)
1814+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 12511)
1815@@ -50,12 +50,12 @@
1816 /*FUNCTION IntExternalResult::DeepEcho{{{*/
1817 void IntExternalResult::DeepEcho(void){
1818
1819- printf("IntExternalResult:\n");
1820- printf(" id: %i\n",this->id);
1821- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1822- printf(" value: %i\n",this->value);
1823- printf(" step: %i\n",this->step);
1824- printf(" time: %g\n",this->time);
1825+ _printLine_("IntExternalResult:");
1826+ _printLine_(" id: " << this->id);
1827+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1828+ _printLine_(" value: " << this->value);
1829+ _printLine_(" step: " << this->step);
1830+ _printLine_(" time: " << this->time);
1831 }
1832 /*}}}*/
1833 /*FUNCTION IntExternalResult::Id{{{*/
1834Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp
1835===================================================================
1836--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 12510)
1837+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 12511)
1838@@ -50,12 +50,12 @@
1839 /*FUNCTION BoolExternalResult::DeepEcho{{{*/
1840 void BoolExternalResult::DeepEcho(void){
1841
1842- printf("BoolExternalResult:\n");
1843- printf(" id: %i\n",this->id);
1844- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1845- printf(" value: %s\n",this->value?"true":"false");
1846- printf(" step: %i\n",this->step);
1847- printf(" time: %g\n",this->time);
1848+ _printLine_("BoolExternalResult:");
1849+ _printLine_(" id: " << this->id);
1850+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1851+ _printLine_(" value: " <<(this->value?"true":"false"));
1852+ _printLine_(" step: " << this->step);
1853+ _printLine_(" time: " << this->time);
1854 }
1855 /*}}}*/
1856 /*FUNCTION BoolExternalResult::Id{{{*/
1857Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/FemModel.cpp
1858===================================================================
1859--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/FemModel.cpp (revision 12510)
1860+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/FemModel.cpp (revision 12511)
1861@@ -101,12 +101,12 @@
1862 /*FUNCTION FemModel::Echo {{{*/
1863 void FemModel::Echo(void){
1864
1865- printf("FemModel echo: \n");
1866- printf(" number of fem models: %i\n",nummodels);
1867- printf(" analysis_type_list: \n");
1868- for(int i=0;i<nummodels;i++)printf(" %i: %s\n",i,EnumToStringx(analysis_type_list[i]));
1869- printf(" current analysis_type: \n");
1870- printf(" %i: %s\n",analysis_counter,EnumToStringx(analysis_type_list[analysis_counter]));
1871+ _printLine_("FemModel echo: ");
1872+ _printLine_(" number of fem models: " << nummodels);
1873+ _printLine_(" analysis_type_list: ");
1874+ for(int i=0;i<nummodels;i++)_printLine_(" " << i << ": " << EnumToStringx(analysis_type_list[i]));
1875+ _printLine_(" current analysis_type: ");
1876+ _printLine_(" " << analysis_counter << ": " << EnumToStringx(analysis_type_list[analysis_counter]));
1877
1878 }
1879 /*}}}*/
1880Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp
1881===================================================================
1882--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (revision 12510)
1883+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (revision 12511)
1884@@ -49,11 +49,11 @@
1885 /*FUNCTION PentaP1ElementResult::DeepEcho{{{*/
1886 void PentaP1ElementResult::DeepEcho(void){
1887
1888- printf("PentaP1ElementResult:\n");
1889- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1890- printf(" values: [%g %g %g %g %g %g]\n",this->values[0],this->values[1],this->values[2],this->values[3],this->values[4],this->values[5]);
1891- printf(" step: %i\n",this->step);
1892- printf(" time: %g\n",this->time);
1893+ _printLine_("PentaP1ElementResult:");
1894+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1895+ _printLine_(" values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << " " << this->values[3] << " " << this->values[4] << " " << this->values[5] << "]");
1896+ _printLine_(" step: " << this->step);
1897+ _printLine_(" time: " << this->time);
1898
1899 }
1900 /*}}}*/
1901Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp
1902===================================================================
1903--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12510)
1904+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12511)
1905@@ -47,11 +47,11 @@
1906 /*FUNCTION DoubleElementResult::DeepEcho{{{*/
1907 void DoubleElementResult::DeepEcho(void){
1908
1909- printf("DoubleElementResult:\n");
1910- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1911- printf(" value: %g\n",this->value);
1912- printf(" step: %i\n",this->step);
1913- printf(" time: %g\n",this->time);
1914+ _printLine_("DoubleElementResult:");
1915+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1916+ _printLine_(" value: " << this->value);
1917+ _printLine_(" step: " << this->step);
1918+ _printLine_(" time: " << this->time);
1919 }
1920 /*}}}*/
1921 /*FUNCTION DoubleElementResult::Id{{{*/
1922Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp
1923===================================================================
1924--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp (revision 12510)
1925+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp (revision 12511)
1926@@ -47,11 +47,11 @@
1927 /*FUNCTION BoolElementResult::DeepEcho{{{*/
1928 void BoolElementResult::DeepEcho(void){
1929
1930- printf("BoolElementResult:\n");
1931- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1932- printf(" value: %s\n",this->value?"true":"false");
1933- printf(" step: %i\n",this->step);
1934- printf(" time: %g\n",this->time);
1935+ _printLine_("BoolElementResult:");
1936+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1937+ _printLine_(" value: "<<(this->value?"true":"false"));
1938+ _printLine_(" step: " << this->step);
1939+ _printLine_(" time: " << this->time);
1940 }
1941 /*}}}*/
1942 /*FUNCTION BoolElementResult::Id{{{*/
1943Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp
1944===================================================================
1945--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 12510)
1946+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 12511)
1947@@ -49,11 +49,11 @@
1948 /*FUNCTION TriaP1ElementResult::DeepEcho{{{*/
1949 void TriaP1ElementResult::DeepEcho(void){
1950
1951- printf("TriaP1ElementResult:\n");
1952- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
1953- printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]);
1954- printf(" step: %i\n",this->step);
1955- printf(" time: %g\n",this->time);
1956+ _printLine_("TriaP1ElementResult:");
1957+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
1958+ _printLine_(" values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << "]");
1959+ _printLine_(" step: " << this->step);
1960+ _printLine_(" time: " << this->time);
1961 }
1962 /*}}}*/
1963 /*FUNCTION TriaP1ElementResult::Id{{{*/
1964Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp
1965===================================================================
1966--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12510)
1967+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12511)
1968@@ -866,34 +866,34 @@
1969 /*FUNCTION Tria::DeepEcho{{{*/
1970 void Tria::DeepEcho(void){
1971
1972- printf("Tria:\n");
1973- printf(" id: %i\n",id);
1974+ _printLine_("Tria:");
1975+ _printLine_(" id: " << id);
1976 if(nodes){
1977 nodes[0]->DeepEcho();
1978 nodes[1]->DeepEcho();
1979 nodes[2]->DeepEcho();
1980 }
1981- else printf("nodes = NULL\n");
1982+ else _printLine_("nodes = NULL");
1983
1984 if (matice) matice->DeepEcho();
1985- else printf("matice = NULL\n");
1986+ else _printLine_("matice = NULL");
1987
1988 if (matpar) matpar->DeepEcho();
1989- else printf("matpar = NULL\n");
1990+ else _printLine_("matpar = NULL");
1991
1992- printf(" parameters\n");
1993+ _printLine_(" parameters");
1994 if (parameters) parameters->DeepEcho();
1995- else printf("parameters = NULL\n");
1996+ else _printLine_("parameters = NULL");
1997
1998- printf(" inputs\n");
1999+ _printLine_(" inputs");
2000 if (inputs) inputs->DeepEcho();
2001- else printf("inputs=NULL\n");
2002+ else _printLine_("inputs=NULL");
2003
2004 if (results) results->DeepEcho();
2005- else printf("results=NULL\n");
2006+ else _printLine_("results=NULL");
2007
2008- printf("neighboor sids: \n");
2009- printf(" %i %i %i\n",horizontalneighborsids[0],horizontalneighborsids[1],horizontalneighborsids[2]);
2010+ _printLine_("neighboor sids: ");
2011+ _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]);
2012
2013 return;
2014 }
2015@@ -909,34 +909,34 @@
2016 /*}}}*/
2017 /*FUNCTION Tria::Echo{{{*/
2018 void Tria::Echo(void){
2019- printf("Tria:\n");
2020- printf(" id: %i\n",id);
2021+ _printLine_("Tria:");
2022+ _printLine_(" id: " << id);
2023 if(nodes){
2024 nodes[0]->Echo();
2025 nodes[1]->Echo();
2026 nodes[2]->Echo();
2027 }
2028- else printf("nodes = NULL\n");
2029+ else _printLine_("nodes = NULL");
2030
2031 if (matice) matice->Echo();
2032- else printf("matice = NULL\n");
2033+ else _printLine_("matice = NULL");
2034
2035 if (matpar) matpar->Echo();
2036- else printf("matpar = NULL\n");
2037+ else _printLine_("matpar = NULL");
2038
2039- printf(" parameters\n");
2040+ _printLine_(" parameters");
2041 if (parameters) parameters->Echo();
2042- else printf("parameters = NULL\n");
2043+ else _printLine_("parameters = NULL");
2044
2045- printf(" inputs\n");
2046+ _printLine_(" inputs");
2047 if (inputs) inputs->Echo();
2048- else printf("inputs=NULL\n");
2049+ else _printLine_("inputs=NULL");
2050
2051 if (results) results->Echo();
2052- else printf("results=NULL\n");
2053+ else _printLine_("results=NULL");
2054
2055- printf("neighboor sids: \n");
2056- printf(" %i %i %i\n",horizontalneighborsids[0],horizontalneighborsids[1],horizontalneighborsids[2]);
2057+ _printLine_("neighboor sids: ");
2058+ _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]);
2059 }
2060 /*}}}*/
2061 /*FUNCTION Tria::ObjectEnum{{{*/
2062@@ -1206,7 +1206,7 @@
2063 elementresult->GetElementVectorFromResults(vector,sid);
2064 }
2065 else{
2066- printf("Interpolation %s not supported\n",EnumToStringx(interp));
2067+ _printLine_("Interpolation " << EnumToStringx(interp) << " not supported");
2068 }
2069 }
2070 /*}}}*/
2071Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp
2072===================================================================
2073--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12510)
2074+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12511)
2075@@ -652,8 +652,8 @@
2076
2077 int i;
2078
2079- printf("Penta:\n");
2080- printf(" id: %i\n",id);
2081+ _printLine_("Penta:");
2082+ _printLine_(" id: " << id);
2083 nodes[0]->DeepEcho();
2084 nodes[1]->DeepEcho();
2085 nodes[2]->DeepEcho();
2086@@ -662,15 +662,15 @@
2087 nodes[5]->DeepEcho();
2088 matice->DeepEcho();
2089 matpar->DeepEcho();
2090- printf(" neighbor ids: %i-%i\n",verticalneighbors[0]->Id(),verticalneighbors[1]->Id());
2091- printf(" parameters\n");
2092+ _printLine_(" neighbor ids: " << verticalneighbors[0]->Id() << "-" << verticalneighbors[1]->Id());
2093+ _printLine_(" parameters");
2094 parameters->DeepEcho();
2095- printf(" inputs\n");
2096+ _printLine_(" inputs");
2097 inputs->DeepEcho();
2098- printf(" results\n");
2099+ _printLine_(" results");
2100 results->DeepEcho();
2101- printf("neighboor sids: \n");
2102- printf(" %i %i %i\n",horizontalneighborsids[0],horizontalneighborsids[1],horizontalneighborsids[2]);
2103+ _printLine_("neighboor sids: ");
2104+ _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]);
2105
2106 return;
2107 }
2108@@ -1094,7 +1094,7 @@
2109 elementresult->GetElementVectorFromResults(vector,sid);
2110 }
2111 else{
2112- printf("Interpolation %s not supported\n",EnumToStringx(interp));
2113+ _printLine_("Interpolation " << EnumToStringx(interp) << " not supported");
2114 }
2115 }
2116 /*}}}*/
2117@@ -4328,8 +4328,8 @@
2118
2119 /*Check solution*/
2120 if(isnan(values[i])) _error2_("NaN found in solution vector");
2121- //if(values[i]<0) printf("temperature < 0°K found in solution vector\n");
2122- //if(values[i]>275) printf("temperature > 275°K found in solution vector (Paterson's rheology associated is negative)\n");
2123+ //if(values[i]<0) _printLine_("temperature < 0°K found in solution vector");
2124+ //if(values[i]>275) _printLine_("temperature > 275°K found in solution vector (Paterson's rheology associated is negative)");
2125 }
2126
2127 /*Get all inputs and parameters*/
2128Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/ControlInput.cpp
2129===================================================================
2130--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 12510)
2131+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 12511)
2132@@ -71,13 +71,13 @@
2133 /*FUNCTION ControlInput::DeepEcho{{{*/
2134 void ControlInput::DeepEcho(void){
2135
2136- printf("ControlInput:\n");
2137- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
2138- printf("---values: \n"); if (values) values->Echo();
2139- printf("---savedvalues: \n");if (savedvalues) savedvalues->Echo();
2140- printf("---minvalues: \n"); if (minvalues) minvalues->Echo();
2141- printf("---maxvalues: \n"); if (maxvalues) maxvalues->Echo();
2142- printf("---gradient: \n"); if (gradient) gradient->Echo();
2143+ _printLine_("ControlInput:");
2144+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
2145+ _printLine_("---values: "); if (values) values->Echo();
2146+ _printLine_("---savedvalues: ");if (savedvalues) savedvalues->Echo();
2147+ _printLine_("---minvalues: "); if (minvalues) minvalues->Echo();
2148+ _printLine_("---maxvalues: "); if (maxvalues) maxvalues->Echo();
2149+ _printLine_("---gradient: "); if (gradient) gradient->Echo();
2150 }
2151 /*}}}*/
2152 /*FUNCTION ControlInput::Id{{{*/
2153Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp
2154===================================================================
2155--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp (revision 12510)
2156+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp (revision 12511)
2157@@ -46,9 +46,9 @@
2158 /*FUNCTION DatasetInput::DeepEcho{{{*/
2159 void DatasetInput::DeepEcho(void){
2160
2161- printf("DatasetInput:\n");
2162- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
2163- printf("---inputs: \n"); inputs->Echo();
2164+ _printLine_("DatasetInput:");
2165+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
2166+ _printLine_("---inputs: "); inputs->Echo();
2167 }
2168 /*}}}*/
2169 /*FUNCTION DatasetInput::Id{{{*/
2170Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/IntInput.cpp
2171===================================================================
2172--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12510)
2173+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12511)
2174@@ -39,9 +39,9 @@
2175 /*FUNCTION IntInput::DeepEcho{{{*/
2176 void IntInput::DeepEcho(void){
2177
2178- printf("IntInput:\n");
2179- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
2180- printf(" value: %i\n",(int)this->value);
2181+ _printLine_("IntInput:");
2182+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
2183+ _printLine_(" value: " << (int)this->value);
2184 }
2185 /*}}}*/
2186 /*FUNCTION IntInput::Id{{{*/
2187Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/BoolInput.cpp
2188===================================================================
2189--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12510)
2190+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12511)
2191@@ -44,9 +44,9 @@
2192 /*FUNCTION BoolInput::DeepEcho{{{*/
2193 void BoolInput::DeepEcho(void){
2194
2195- printf("BoolInput:\n");
2196- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
2197- printf(" value: %s\n",value?"true":"false");
2198+ _printLine_("BoolInput:");
2199+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
2200+ _printLine_(" value: " <<(value?"true":"false"));
2201 }
2202 /*}}}*/
2203 /*FUNCTION BoolInput::Id{{{*/
2204Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp
2205===================================================================
2206--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 12510)
2207+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 12511)
2208@@ -55,9 +55,9 @@
2209 /*FUNCTION TriaP1Input::DeepEcho{{{*/
2210 void TriaP1Input::DeepEcho(void){
2211
2212- printf("TriaP1Input:\n");
2213- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
2214- printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]);
2215+ _printLine_("TriaP1Input:");
2216+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
2217+ _printLine_(" values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << "]");
2218 }
2219 /*}}}*/
2220 /*FUNCTION TriaP1Input::Id{{{*/
2221Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.cpp
2222===================================================================
2223--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.cpp (revision 12510)
2224+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.cpp (revision 12511)
2225@@ -65,12 +65,12 @@
2226
2227 int i;
2228
2229- printf("TransientInput:\n");
2230- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
2231- printf(" numtimesteps: %i\n",this->numtimesteps);
2232- printf("---inputs: \n");
2233+ _printLine_("TransientInput:");
2234+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
2235+ _printLine_(" numtimesteps: " << this->numtimesteps);
2236+ _printLine_("---inputs: ");
2237 for(i=0;i<this->numtimesteps;i++){
2238- printf(" time: %g \n",this->timesteps[i]);
2239+ _printLine_(" time: " << this->timesteps[i] << " ");
2240 ((Input*)this->inputs->GetObjectByOffset(i))->Echo();
2241 }
2242 }
2243Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp
2244===================================================================
2245--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 12510)
2246+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 12511)
2247@@ -55,9 +55,9 @@
2248 /*FUNCTION PentaP1Input::DeepEcho{{{*/
2249 void PentaP1Input::DeepEcho(void){
2250
2251- printf("PentaP1Input:\n");
2252- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
2253- printf(" values: [%g %g %g %g %g %g]\n",this->values[0],this->values[1],this->values[2],this->values[3],this->values[4],this->values[5]);
2254+ _printLine_("PentaP1Input:");
2255+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
2256+ _printLine_(" values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << " " << this->values[3] << " " << this->values[4] << " " << this->values[5] << "]");
2257 }
2258 /*}}}*/
2259 /*FUNCTION PentaP1Input::Id{{{*/
2260Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp
2261===================================================================
2262--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12510)
2263+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12511)
2264@@ -44,9 +44,9 @@
2265 /*FUNCTION DoubleInput::DeepEcho{{{*/
2266 void DoubleInput::DeepEcho(void){
2267
2268- printf("DoubleInput:\n");
2269- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
2270- printf(" value: %g\n",this->value);
2271+ _printLine_("DoubleInput:");
2272+ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
2273+ _printLine_(" value: " << this->value);
2274 }
2275 /*}}}*/
2276 /*FUNCTION DoubleInput::Id{{{*/
2277Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp
2278===================================================================
2279--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp (revision 12510)
2280+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp (revision 12511)
2281@@ -50,10 +50,10 @@
2282 /*Object virtual functions definitions:*/
2283 /*FUNCTION ExponentialVariogram::Echo {{{*/
2284 void ExponentialVariogram::Echo(void){
2285- printf("ExponentialVariogram\n");
2286- printf(" nugget: %g\n",this->nugget);
2287- printf(" sill : %g\n",this->sill);
2288- printf(" range : %g\n",this->range);
2289+ _printLine_("ExponentialVariogram");
2290+ _printLine_(" nugget: " << this->nugget);
2291+ _printLine_(" sill : " << this->sill);
2292+ _printLine_(" range : " << this->range);
2293 }
2294 /*}}}*/
2295
2296Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp
2297===================================================================
2298--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp (revision 12510)
2299+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp (revision 12511)
2300@@ -50,10 +50,10 @@
2301 /*Object virtual functions definitions:*/
2302 /*FUNCTION GaussianVariogram::Echo {{{*/
2303 void GaussianVariogram::Echo(void){
2304- printf("GaussianVariogram\n");
2305- printf(" nugget: %g\n",this->nugget);
2306- printf(" sill : %g\n",this->sill);
2307- printf(" range : %g\n",this->range);
2308+ _printLine_("GaussianVariogram");
2309+ _printLine_(" nugget: " << this->nugget);
2310+ _printLine_(" sill : " << this->sill);
2311+ _printLine_(" range : " << this->range);
2312 }
2313 /*}}}*/
2314
2315@@ -92,8 +92,8 @@
2316 a = 1./3.;
2317 gamma = (sill-nugget)*(1.-exp(-h2/(a*range*range))) + nugget;
2318
2319- //if(h2>1000*1000) printf("gamma = %g h= %g\n",gamma,sqrt(h2));
2320- printf("h = %g gamma = %g\n",sqrt(h2),gamma);
2321+ //if(h2>1000*1000) _printLine_("gamma = " << gamma << " h= " << sqrt(h2));
2322+ _printLine_("h = " << sqrt(h2) << " gamma = " << gamma);
2323 return gamma;
2324 }
2325 /*}}}*/
2326Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp
2327===================================================================
2328--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp (revision 12510)
2329+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp (revision 12511)
2330@@ -50,10 +50,10 @@
2331 /*Object virtual functions definitions:*/
2332 /*FUNCTION SphericalVariogram::Echo {{{*/
2333 void SphericalVariogram::Echo(void){
2334- printf("SphericalVariogram\n");
2335- printf(" nugget: %g\n",this->nugget);
2336- printf(" sill : %g\n",this->sill);
2337- printf(" range : %g\n",this->range);
2338+ _printLine_("SphericalVariogram");
2339+ _printLine_(" nugget: " << this->nugget);
2340+ _printLine_(" sill : " << this->sill);
2341+ _printLine_(" range : " << this->range);
2342 }
2343 /*}}}*/
2344
2345Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp
2346===================================================================
2347--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp (revision 12510)
2348+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp (revision 12511)
2349@@ -51,10 +51,10 @@
2350 /*Object virtual functions definitions:*/
2351 /*FUNCTION PowerVariogram::Echo {{{*/
2352 void PowerVariogram::Echo(void){
2353- printf("PowerVariogram\n");
2354- printf(" nugget: %g\n",this->nugget);
2355- printf(" slope : %g\n",this->slope);
2356- printf(" power : %g\n",this->power);
2357+ _printLine_("PowerVariogram");
2358+ _printLine_(" nugget: " << this->nugget);
2359+ _printLine_(" slope : " << this->slope);
2360+ _printLine_(" power : " << this->power);
2361 }
2362 /*}}}*/
2363
2364@@ -88,7 +88,7 @@
2365 /*return semi-variogram*/
2366 gamma = this->nugget + this->slope*pow(h,this->power);
2367
2368- //if(h>1000) printf("gamma = %g h=%g\n",gamma,h);
2369+ //if(h>1000) _printLine_("gamma = " << gamma << " h=" << h);
2370 return gamma;
2371 }
2372 /*}}}*/
2373Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Quadtree.cpp
2374===================================================================
2375--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Quadtree.cpp (revision 12510)
2376+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Quadtree.cpp (revision 12511)
2377@@ -296,21 +296,21 @@
2378 /*FUNCTION Quadtree::Echo{{{*/
2379 void Quadtree::Echo(void){
2380
2381- printf("Quadtree:\n");
2382- printf(" MaxDepth = %i\n",this->MaxDepth);
2383- printf(" NbQuadtreeBox = %i\n",this->NbQuadtreeBox);
2384- printf(" NbObs = %i\n",this->NbObs);
2385- printf(" root = %p\n",this->root);
2386+ _printLine_("Quadtree:");
2387+ _printLine_(" MaxDepth = " << this->MaxDepth);
2388+ _printLine_(" NbQuadtreeBox = " << this->NbQuadtreeBox);
2389+ _printLine_(" NbObs = " << this->NbObs);
2390+ _printLine_(" root = " << this->root);
2391
2392 }/*}}}*/
2393 /*FUNCTION Quadtree::DeepEcho{{{*/
2394 void Quadtree::DeepEcho(void){
2395
2396- printf("Quadtree:\n");
2397- printf(" MaxDepth = %i\n",this->MaxDepth);
2398- printf(" NbQuadtreeBox = %i\n",this->NbQuadtreeBox);
2399- printf(" NbObs = %i\n",this->NbObs);
2400- printf(" root = %p\n",this->root);
2401+ _printLine_("Quadtree:");
2402+ _printLine_(" MaxDepth = " << this->MaxDepth);
2403+ _printLine_(" NbQuadtreeBox = " << this->NbQuadtreeBox);
2404+ _printLine_(" NbObs = " << this->NbObs);
2405+ _printLine_(" root = " << this->root);
2406 boxcontainer->Echo();
2407
2408 }/*}}}*/
2409@@ -511,11 +511,11 @@
2410 /*FUNCTION QuadtreeBox::Echo{{{*/
2411 void Quadtree::QuadtreeBox::Echo(void){
2412
2413- printf("QuadtreeBox:\n");
2414- printf(" nbitems = %i\n",this->nbitems);
2415- printf(" xcenter = %g\n",this->xcenter);
2416- printf(" ycenter = %g\n",this->ycenter);
2417- printf(" length = %g\n",this->length);
2418+ _printLine_("QuadtreeBox:");
2419+ _printLine_(" nbitems = " << this->nbitems);
2420+ _printLine_(" xcenter = " << this->xcenter);
2421+ _printLine_(" ycenter = " << this->ycenter);
2422+ _printLine_(" length = " << this->length);
2423
2424 }/*}}}*/
2425 /*FUNCTION QuadtreeBox::IsWithinRange{{{*/
2426Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Observation.cpp
2427===================================================================
2428--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Observation.cpp (revision 12510)
2429+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Observation.cpp (revision 12511)
2430@@ -36,14 +36,14 @@
2431
2432 int bit;
2433
2434- printf("Observation\n");
2435- printf(" index : %i\n",this->index);
2436- printf(" x : %g\n",this->x);
2437- printf(" y : %g\n",this->y);
2438- printf(" xi : "); printbinary(this->xi); printf("\n");
2439- printf(" yi : "); printbinary(this->yi); printf("\n");
2440- printf(" weight: %g\n",this->weight);
2441- printf(" value : %g\n",this->value);
2442+ _printLine_("Observation");
2443+ _printLine_(" index : " << this->index);
2444+ _printLine_(" x : " << this->x);
2445+ _printLine_(" y : " << this->y);
2446+ _printLine_(" xi : "); printbinary(this->xi); _printLine_("");
2447+ _printLine_(" yi : "); printbinary(this->yi); _printLine_("");
2448+ _printLine_(" weight: " << this->weight);
2449+ _printLine_(" value : " << this->value);
2450 }
2451 /*}}}*/
2452
2453Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.cpp
2454===================================================================
2455--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.cpp (revision 12510)
2456+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.cpp (revision 12511)
2457@@ -156,13 +156,13 @@
2458 /*FUNCTION Node::Echo{{{*/
2459 void Node::Echo(void){
2460
2461- printf("Node:\n");
2462- printf(" id: %i\n",id);
2463- printf(" sid: %i\n",sid);
2464- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
2465+ _printLine_("Node:");
2466+ _printLine_(" id: " << id);
2467+ _printLine_(" sid: " << sid);
2468+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
2469 indexing.Echo();
2470- printf(" hvertex: not displayed\n");
2471- printf(" inputs: %p\n",inputs);
2472+ _printLine_(" hvertex: not displayed");
2473+ _printLine_(" inputs: " << inputs);
2474
2475
2476 }
2477@@ -170,14 +170,14 @@
2478 /*FUNCTION Node::DeepEcho{{{*/
2479 void Node::DeepEcho(void){
2480
2481- printf("Node:\n");
2482- printf(" id: %i\n",id);
2483- printf(" sid: %i\n",sid);
2484- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
2485+ _printLine_("Node:");
2486+ _printLine_(" id: " << id);
2487+ _printLine_(" sid: " << sid);
2488+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
2489 indexing.DeepEcho();
2490- printf("Vertex:\n");
2491+ _printLine_("Vertex:");
2492 hvertex->DeepEcho();
2493- printf(" inputs\n");
2494+ _printLine_(" inputs");
2495
2496
2497 }
2498Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp
2499===================================================================
2500--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12510)
2501+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12511)
2502@@ -45,13 +45,13 @@
2503 /*FUNCTION SpcDynamic::Echo {{{*/
2504 void SpcDynamic::Echo(void){
2505
2506- printf("SpcDynamic:\n");
2507- printf(" sid: %i\n",sid);
2508- printf(" nodeid: %i\n",nodeid);
2509- printf(" dof: %i\n",dof);
2510- printf(" value: %g\n",value);
2511- printf(" isset: %s\n",isset?"true":"false");
2512- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
2513+ _printLine_("SpcDynamic:");
2514+ _printLine_(" sid: " << sid);
2515+ _printLine_(" nodeid: " << nodeid);
2516+ _printLine_(" dof: " << dof);
2517+ _printLine_(" value: " << value);
2518+ _printLine_(" isset: " <<(isset?"true":"false"));
2519+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
2520 return;
2521 }
2522 /*}}}*/
2523Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp
2524===================================================================
2525--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12510)
2526+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12511)
2527@@ -44,24 +44,24 @@
2528 /*FUNCTION SpcStatic::Echo {{{*/
2529 void SpcStatic::Echo(void){
2530
2531- printf("SpcStatic:\n");
2532- printf(" sid: %i\n",sid);
2533- printf(" nodeid: %i\n",nodeid);
2534- printf(" dof: %i\n",dof);
2535- printf(" value: %g\n",value);
2536- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
2537+ _printLine_("SpcStatic:");
2538+ _printLine_(" sid: " << sid);
2539+ _printLine_(" nodeid: " << nodeid);
2540+ _printLine_(" dof: " << dof);
2541+ _printLine_(" value: " << value);
2542+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
2543 return;
2544 }
2545 /*}}}*/
2546 /*FUNCTION SpcStatic::DeepEcho {{{*/
2547 void SpcStatic::DeepEcho(void){
2548
2549- printf("SpcStatic:\n");
2550- printf(" sid: %i\n",sid);
2551- printf(" nodeid: %i\n",nodeid);
2552- printf(" dof: %i\n",dof);
2553- printf(" value: %g\n",value);
2554- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
2555+ _printLine_("SpcStatic:");
2556+ _printLine_(" sid: " << sid);
2557+ _printLine_(" nodeid: " << nodeid);
2558+ _printLine_(" dof: " << dof);
2559+ _printLine_(" value: " << value);
2560+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
2561 return;
2562 }
2563 /*}}}*/
2564Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp
2565===================================================================
2566--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12510)
2567+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12511)
2568@@ -59,15 +59,15 @@
2569 void SpcTransient::Echo(void){
2570
2571 int i;
2572- printf("SpcTransient:\n");
2573- printf(" sid: %i\n",sid);
2574- printf(" nodeid: %i\n",nodeid);
2575- printf(" dof: %i\n",dof);
2576- printf(" nsteps: %i\n",nsteps);
2577- printf(" analysis_type: %s\n",EnumToStringx(analysis_type));
2578- printf(" steps|times|values\n");
2579+ _printLine_("SpcTransient:");
2580+ _printLine_(" sid: " << sid);
2581+ _printLine_(" nodeid: " << nodeid);
2582+ _printLine_(" dof: " << dof);
2583+ _printLine_(" nsteps: " << nsteps);
2584+ _printLine_(" analysis_type: " << EnumToStringx(analysis_type));
2585+ _printLine_(" steps|times|values");
2586 for(i=0;i<nsteps;i++){
2587- printf("%i-%g:%g\n",i,times[i],values[i]);
2588+ _printLine_("" << i << "-" << times[i] << ":" << values[i]);
2589 }
2590 return;
2591 }
2592Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/IoModel.cpp
2593===================================================================
2594--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/IoModel.cpp (revision 12510)
2595+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/IoModel.cpp (revision 12511)
2596@@ -113,20 +113,20 @@
2597 }
2598 else{
2599 if(record_enum!=MaximumNumberOfEnums){
2600- printf("\n");
2601- printf("=========================================================================\n");
2602- printf(" Enums in marshalled file are not compatible with compiled code \n");
2603- printf(" \n");
2604- printf(" * If you are running ISSM on a remote cluster: \n");
2605- printf(" make sure that you are using the same version of ISSM on your local \n");
2606- printf(" machine and remote cluster (you might need to run svn update) \n");
2607- printf(" * If you are running ISSM on your local machine: \n");
2608- printf(" make sure that all the code is compiled (modules and executables) \n");
2609- printf(" * If you are a developer and just added a new Enum: \n");
2610- printf(" you might need to run ./Synchronize.sh in src/c/EnumDefinitions \n");
2611- printf(" and recompile \n");
2612- printf("=========================================================================\n");
2613- printf("\n");
2614+ _printLine_("");
2615+ _printLine_("=========================================================================");
2616+ _printLine_(" Enums in marshalled file are not compatible with compiled code ");
2617+ _printLine_(" ");
2618+ _printLine_(" * If you are running ISSM on a remote cluster: ");
2619+ _printLine_(" make sure that you are using the same version of ISSM on your local ");
2620+ _printLine_(" machine and remote cluster (you might need to run svn update) ");
2621+ _printLine_(" * If you are running ISSM on your local machine: ");
2622+ _printLine_(" make sure that all the code is compiled (modules and executables) ");
2623+ _printLine_(" * If you are a developer and just added a new Enum: ");
2624+ _printLine_(" you might need to run ./Synchronize.sh in src/c/EnumDefinitions ");
2625+ _printLine_(" and recompile ");
2626+ _printLine_("=========================================================================");
2627+ _printLine_("");
2628 _error2_("Enums not consistent (See error message above)");
2629 }
2630 }
Note: See TracBrowser for help on using the repository browser.