Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 12511) @@ -35,7 +35,7 @@ } else{ if(!mxIsClass(dataref,"double") && !mxIsClass(dataref,"single")){ - printf("Warning: converting matlab data from '%s' to 'double'\n",mxGetClassName(dataref)); + _printLine_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'"); } /*Convert matlab matrix to double* matrix: */ MatlabMatrixToDoubleMatrix(&outmatrix,&outmatrix_rows,&outmatrix_cols,dataref); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/PrintfFunction.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/PrintfFunction.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/PrintfFunction.cpp (revision 12511) @@ -50,7 +50,7 @@ } /*Ok, if we are running in parallel, get node 0 to print*/ - if(my_rank==0)printf(buffer); + if(my_rank==0)_printString_(buffer); /*Clean up and return*/ xDelete(buffer); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp (revision 12511) @@ -43,16 +43,16 @@ extern int num_procs; if (function_name=="" || file_line==0){ //WINDOWS - printf("%s%s","Error message: ",what()); + _printString_("" << "Error message: " << what()); } else{ if(num_procs==1){ - printf("\n??? Error using ==> %s:%i\n",file_name.c_str(),file_line); - printf("%s error message: %s\n\n",function_name.c_str(),what()); + _printLine_("\n??? Error using ==> " << file_name.c_str() << ":" << file_line); + _printLine_("" << function_name.c_str() << " error message: " << what() << "\n"); } else{ - printf("\n[%i] ??? Error using ==> %s:%i\n",my_rank,file_name.c_str(),file_line); - printf("[%i] %s error message: %s\n\n",my_rank,function_name.c_str(),what()); + _printLine_("\n[" << my_rank << "] ??? Error using ==> " << file_name.c_str() << ":" << file_line); + _printLine_("[" << my_rank << "] " << function_name.c_str() << " error message: " << what() << "\n"); } } return; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/io/PrintfFunction.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/io/PrintfFunction.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/io/PrintfFunction.cpp (revision 12511) @@ -48,7 +48,7 @@ } /*Ok, if we are running in parallel, get node 0 to print*/ - if(my_rank==0)printf(buffer); + if(my_rank==0)_printString_(buffer); /*Clean up and return*/ xDelete(buffer); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 12511) @@ -53,16 +53,16 @@ } /*Initialize output*/ - if (verbose) printf("Initializing output vector\n"); + if (verbose) _printLine_("Initializing output vector"); data_interp=xNew(nods_interp*data_cols); // read background mesh - if (verbose) printf("Reading mesh\n"); + if (verbose) _printLine_("Reading mesh"); Mesh Th(index_data,x_data,y_data,nods_data,nels_data); Th.CreateSingleVertexToTriangleConnectivity(); //Loop over output nodes - if (verbose) printf("Loop over the nodes\n"); + if (verbose) _printLine_("Loop over the nodes"); for(i=0;i= NPDMAX){ - printf("increase NPDMAX in massBalance.cpp\n"); + _printLine_("increase NPDMAX in massBalance.cpp"); exit (1); } for (it = 0; it < itm; it++){ @@ -82,7 +82,7 @@ siglimc = 2.5*signormc ; itm = (int)((PDCUT+2.*siglimc)/DT + 1.5); if (itm >= NPDCMAX){ - printf("'increase NPDCMAX in p35com'\n"); + _printLine_("'increase NPDCMAX in p35com'"); exit (1); } for (it = 0; it < itm; it++ ){ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/Chacox.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/Chacox.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/Chacox.cpp (revision 12511) @@ -65,12 +65,12 @@ if (DEBUG_TRACE > 0) { - printf("\n"); + _printLine_(""); } if (PRINT_HEADERS) { - printf("\n Chaco 2.0\n"); - printf(" Sandia National Laboratories\n\n"); + _printLine_("\n Chaco 2.0"); + _printLine_(" Sandia National Laboratories\n"); } Using_Main = TRUE; @@ -176,7 +176,7 @@ for (i=0; i 0) { - printf("\n"); + _printLine_(""); smalloc_stats(); } @@ -184,7 +184,7 @@ fclose(params_file); if (DEBUG_TRACE > 1) { - printf("\n"); + _printLine_(""); } return(0); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/input_parse.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/input_parse.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Chacox/input_parse.cpp (revision 12511) @@ -37,15 +37,15 @@ int eigensolver; /* which kind of eigensolver to use */ if (DEBUG_TRACE > 0) { - printf("\n"); + _printLine_(""); } if (PROMPT) { - printf("Parallel machine architecture:\n"); - printf(" (0) Hypercube\n"); - printf(" (1) One-dimensional mesh\n"); - printf(" (2) Two-dimensional mesh\n"); - printf(" (3) Three-dimensional mesh\n"); + _printLine_("Parallel machine architecture:"); + _printLine_(" (0) Hypercube"); + _printLine_(" (1) One-dimensional mesh"); + _printLine_(" (2) Two-dimensional mesh"); + _printLine_(" (3) Three-dimensional mesh"); } *architecture = (int)options[OPT_ARCH]; if (*architecture < 0 || *architecture > 3) { @@ -56,12 +56,12 @@ /* Name output assignment file. */ if (PROMPT) - printf("Assignment output file: "); + _printString_("Assignment output file: "); outassignname = NULL; /* Name output results file. */ if (PROMPT) - printf("File name for saving run results: "); + _printString_("File name for saving run results: "); outfilename = NULL; /* Initialize the method flags */ @@ -74,14 +74,14 @@ } else { if (PROMPT) { - printf("Global partitioning method:\n"); - printf(" (1) Multilevel-KL\n"); - printf(" (2) Spectral\n"); - printf(" (3) Inertial\n"); - printf(" (4) Linear\n"); - printf(" (5) Random\n"); - printf(" (6) Scattered\n"); - printf(" (7) Read-from-file\n"); + _printLine_("Global partitioning method:"); + _printLine_(" (1) Multilevel-KL"); + _printLine_(" (2) Spectral"); + _printLine_(" (3) Inertial"); + _printLine_(" (4) Linear"); + _printLine_(" (5) Random"); + _printLine_(" (6) Scattered"); + _printLine_(" (7) Read-from-file"); } *global_method = (int)options[OPT_GLOBAL]; if (*global_method < 1 || *global_method > 7) { @@ -93,19 +93,19 @@ if (*global_method == 7) { /* Name and open input assignment file. */ if (PROMPT) - printf("Assignment input file: "); + _printString_("Assignment input file: "); } else if (*global_method == 3) { if (PROMPT) - printf("Geometry input file name: "); + _printString_("Geometry input file name: "); } else if (*global_method == 2) { if (PROMPT) { - printf("Eigensolver:\n"); - printf(" (1) Multilevel RQI/Symmlq\n"); - printf(" (2) Lanczos\n"); + _printLine_("Eigensolver:"); + _printLine_(" (1) Multilevel RQI/Symmlq"); + _printLine_(" (2) Lanczos"); } eigensolver = (int)options[OPT_RQI]; if (eigensolver < 0 || eigensolver > 2) { @@ -116,11 +116,11 @@ if (eigensolver == 1) { if (MATCH_TYPE == 5) { /* geometric matching */ if (PROMPT) - printf("Geometry input file name: "); + _printString_("Geometry input file name: "); } *rqi_flag = 1; if (PROMPT) - printf("Number of vertices to coarsen down to: "); + _printString_("Number of vertices to coarsen down to: "); *vmax = (int)options[OPT_VMAX]; if (*vmax <= 0) { printf("%s -- Vmax %d must be greater then 0.\n", @@ -136,10 +136,10 @@ else if (*global_method == 1) { if (MATCH_TYPE == 5) { /* geometric matching */ if (PROMPT) - printf("Geometry input file name: "); + _printString_("Geometry input file name: "); } if (PROMPT) - printf("Number of vertices to coarsen down to: "); + _printString_("Number of vertices to coarsen down to: "); *vmax = (int)options[OPT_VMAX]; if (*vmax <= 0) { printf("%s -- Vmax %d must be greater then 0.\n", @@ -167,9 +167,9 @@ *local_method = 1; else { if (PROMPT) { - printf("Local refinement method:\n"); - printf(" (1) Kernighan-Lin\n"); - printf(" (2) None\n"); + _printLine_("Local refinement method:"); + _printLine_(" (1) Kernighan-Lin"); + _printLine_(" (2) None"); } *local_method = (int)options[OPT_LOCAL]; if (*local_method < 1 || *local_method > 2) { @@ -184,10 +184,10 @@ /* Get total number of hypercube dimensions in which to partition. */ *ndims_tot = 0; if (PROMPT) - printf("Total number of target hypercube dimensions: "); + _printString_("Total number of target hypercube dimensions: "); *ndims_tot = nparts[0]; if (*ndims_tot < 1) { - printf(" Number of divisions must be at least 1\n"); + _printLine_(" Number of divisions must be at least 1"); printf("%s -- Number of divisions %d must be at least 1.\n", __FUNCT__,nparts[0]); return(-1); @@ -199,20 +199,20 @@ mesh_dims[1] = mesh_dims[2] = 1; if (*architecture == 2) { if (PROMPT) - printf("X and Y extent of of 2-D mesh: "); + _printString_("X and Y extent of of 2-D mesh: "); mesh_dims[0] = nparts[0]; mesh_dims[1] = nparts[1]; } else if (*architecture == 3) { if (PROMPT) - printf("X, Y and Z extent of 3-D mesh: "); + _printString_("X, Y and Z extent of 3-D mesh: "); mesh_dims[0] = nparts[0]; mesh_dims[1] = nparts[1]; mesh_dims[2] = nparts[2]; } else { /* Anything else => 1-D mesh */ if (PROMPT) - printf("Size of 1-D mesh: "); + _printString_("Size of 1-D mesh: "); mesh_dims[0] = nparts[0]; *architecture = 1; } @@ -226,9 +226,9 @@ } else if (*nprocs <= 7) { if (PROMPT) { - printf("Partitioning dimension: \n"); - printf(" (1) Bisection\n"); - printf(" (2) Quadrisection\n"); + _printLine_("Partitioning dimension: "); + _printLine_(" (1) Bisection"); + _printLine_(" (2) Quadrisection"); } *ndims = (int)options[OPT_NDIMS]; if (*ndims < 1 || *ndims > 2) { @@ -239,10 +239,10 @@ } else { if (PROMPT) { - printf("Partitioning dimension: \n"); - printf(" (1) Bisection\n"); - printf(" (2) Quadrisection\n"); - printf(" (3) Octasection\n"); + _printLine_("Partitioning dimension: "); + _printLine_(" (1) Bisection"); + _printLine_(" (2) Quadrisection"); + _printLine_(" (3) Octasection"); } *ndims = (int)options[OPT_NDIMS]; if (*ndims < 1 || *ndims > 3) { Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 12511) @@ -57,7 +57,7 @@ _error2_("Error reading exp file."); _printf_(true,"Exp2Kmlx -- Reading %d exp profiles from file \"%s\".\n",nprof,filexp); // for (i=0; iObservationList(&x,&y,&data,&nobs); - printf("Generation Delaunay Triangulation\n"); + _printLine_("Generation Delaunay Triangulation"); BamgTriangulatex(&index,&nel,x,y,nobs); indexd =xNewZeroInit(nel*3); for(int i=0;i(index); - printf("Interpolating\n"); + _printLine_("Interpolating"); xDelete(predictions); InterpFromMeshToMesh2dx(&predictions,indexd,x,y,nobs,nel,data,nobs,1,x_interp,y_interp,n_interp,NULL,0,new DataSet()); xDelete(x); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 12511) @@ -174,7 +174,7 @@ data_value=nearestinterp(x1,x2,y1,y2, Q11,Q12,Q21,Q22,x_grid,y_grid); break; default: - printf("Interpolation %s not supported yet\n",EnumToStringx(interpenum)); + _printLine_("Interpolation " << EnumToStringx(interpenum) << " not supported yet"); return NULL; /*WARNING: no error because it would blow up the multithreading!*/ } if(isnan(data_value)) data_value=default_value; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 12511) @@ -109,10 +109,10 @@ /*Synthesize echo: {{{*/ if(my_rank==0){ - printf(" responses: %i: ",d_numresponses); - for(i=0;i0) printf("Construction of a mesh from a given geometry\n"); - if (verbosity>1) printf(" Processing geometry...\n"); + if (verbosity>0) _printLine_("Construction of a mesh from a given geometry"); + if (verbosity>1) _printLine_(" Processing geometry..."); Geometry Gh(bamggeom_in,bamgopts); //get hmin and hmax from geometry to generate the metric @@ -49,7 +49,7 @@ bamgopts->hmax = Min(bamgopts->hmax,Gh.MaximalHmax()); //build metric using geometry - if (verbosity>1) printf(" Generating Metric...\n"); + if (verbosity>1) _printLine_(" Generating Metric..."); for(i=0;i1) printf(" Generating Mesh...\n"); + if (verbosity>1) _printLine_(" Generating Mesh..."); Mesh Th(maxnbv,Gh,bamgopts); //Split corners if requested @@ -72,9 +72,9 @@ if(bamgopts->Crack) Th.CrackMesh(bamgopts); //Build output - if (verbosity>1) printf(" Write Mesh...\n"); + if (verbosity>1) _printLine_(" Write Mesh..."); Th.WriteMesh(bamgmesh_out,bamgopts); - if (verbosity>1) printf(" Write Geometry...\n"); + if (verbosity>1) _printLine_(" Write Geometry..."); Gh.WriteGeometry(bamggeom_out,bamgopts); //clean up @@ -86,8 +86,8 @@ /*Anisotropic mesh adaptation {{{*/ // read background mesh - if (verbosity>0) printf("Anisotropic mesh adaptation\n"); - if (verbosity>1) printf(" Processing initial mesh and geometry...\n"); + if (verbosity>0) _printLine_("Anisotropic mesh adaptation"); + if (verbosity>1) _printLine_(" Processing initial mesh and geometry..."); Mesh BTh(bamggeom_in,bamgmesh_in,bamgopts); //Make Quadtree from background mesh @@ -99,24 +99,24 @@ //Generate initial metric if (bamgopts->metric){ - if (verbosity>1) printf(" Processing Metric...\n"); + if (verbosity>1) _printLine_(" Processing Metric..."); BTh.ReadMetric(bamgopts); } else { - if (verbosity>1) printf(" Generating initial Metric...\n"); + if (verbosity>1) _printLine_(" Generating initial Metric..."); Metric Mhmax(bamgopts->hmax); for (int iv=0;ivfield){ - if (verbosity>1) printf(" Merge metric with field provided...\n"); + if (verbosity>1) _printLine_(" Merge metric with field provided..."); BTh.AddMetric(bamgopts); } // change using hVertices if provided if(bamgopts->hVertices && bamgopts->hVerticesSize[0]==BTh.nbv){ - if (verbosity>1) printf(" Merging Metric with hVertices...\n"); + if (verbosity>1) _printLine_(" Merging Metric with hVertices..."); for (i=0;ihVertices[i])){ BTh[i].m=Metric((float)bamgopts->hVertices[i]); @@ -126,7 +126,7 @@ // change using hminVertices if provided if (bamgopts->hminVertices){ - if (verbosity>1) printf(" Merging Metric with hminVertices...\n"); + if (verbosity>1) _printLine_(" Merging Metric with hminVertices..."); for (i=0;ihminVertices[i])){ Metric M=BTh.vertices[i].m; @@ -139,7 +139,7 @@ // change using hmaxVertices if provided if (bamgopts->hmaxVertices){ - if (verbosity>1) printf(" Merging Metric with hmaxVertices...\n"); + if (verbosity>1) _printLine_(" Merging Metric with hmaxVertices..."); for (i=0;ihmaxVertices[i])){ Metric M=BTh.vertices[i].m; @@ -163,7 +163,7 @@ BTh.BoundAnisotropy(bamgopts->anisomax,hminaniso); //Build new mesh - if (verbosity>1) printf(" Generating Mesh...\n"); + if (verbosity>1) _printLine_(" Generating Mesh..."); Thr=&BTh,Thb=0; Mesh & Th( *(0 ? new Mesh(*Thr,&Thr->Gh,Thb,maxnbv) : new Mesh(maxnbv,BTh,bamgopts,bamgopts->KeepVertices))); if (Thr != &BTh) delete Thr; @@ -184,19 +184,19 @@ //display info if(verbosity>0) { if (Th.nbt-Th.nbtout-Th.nbq*2){ - printf(" new number of triangles = %i\n",(Th.nbt-Th.nbtout-Th.nbq*2)); + _printLine_(" new number of triangles = " << (Th.nbt-Th.nbtout-Th.nbq*2)); } if (Th.nbq ){ - printf(" new number of quads = %i\n",Th.nbq); + _printLine_(" new number of quads = " << Th.nbq); } } //Build output - if (verbosity>1) printf(" Write Mesh...\n"); + if (verbosity>1) _printLine_(" Write Mesh..."); Th.WriteMesh(bamgmesh_out,bamgopts); - if (verbosity>1) printf(" Write Geometry...\n"); + if (verbosity>1) _printLine_(" Write Geometry..."); Th.Gh.WriteGeometry(bamggeom_out,bamgopts); - if (verbosity>1) printf(" Write Metric...\n"); + if (verbosity>1) _printLine_(" Write Metric..."); BTh.WriteMetric(bamgopts); /*clean up*/ @@ -206,7 +206,7 @@ } /*No error return*/ - if (verbosity>1) printf(" Exiting Bamg.\n"); + if (verbosity>1) _printLine_(" Exiting Bamg."); return noerr; } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 12511) @@ -58,9 +58,9 @@ void SeqVec::Echo(void){ int i; - printf("SeqVec size %i\n",this->M); + _printLine_("SeqVec size " << this->M); for(i=0;iM,this->N); + _printLine_("SeqMat size " << this->M << "-" << this->N); for(i=0;imatrix[N*i+j]); + _printString_("" << this->matrix[N*i+j] << " "); } - printf("\n"); + _printLine_(""); } } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12511) @@ -152,9 +152,9 @@ int i; - printf("DofIndexing:\n"); - printf(" gsize: %i\n",gsize); - printf(" clone: %i\n",clone); + _printLine_("DofIndexing:"); + _printLine_(" gsize: " << gsize); + _printLine_(" clone: " << clone); } /*}}}*/ /*FUNCTION DofIndexing::DeepEcho{{{*/ @@ -162,49 +162,49 @@ int i; - printf("DofIndexing:\n"); - printf(" gsize: %i\n",gsize); - printf(" fsize: %i\n",fsize); - printf(" ssize: %i\n",ssize); - printf(" clone: %i\n",clone); + _printLine_("DofIndexing:"); + _printLine_(" gsize: " << gsize); + _printLine_(" fsize: " << fsize); + _printLine_(" ssize: " << ssize); + _printLine_(" clone: " << clone); - printf(" set membership: f,s sets \n"); + _printLine_(" set membership: f,s sets "); for(i=0;issize); + _printString_(" svalues (" << this->ssize << "): |"); for(i=0;igsize;i++){ - if(this->s_set[i])printf(" %g |",svalues[i]); + if(this->s_set[i])_printString_(" " << svalues[i] << " |"); } - printf("\n"); + _printLine_(""); if(doftype){ - printf(" doftype: |"); + _printString_(" doftype: |"); for(i=0;igsize); + _printString_(" g_doflist (" << this->gsize << "): |"); for(i=0;igsize;i++){ - printf(" %i |",gdoflist[i]); + _printString_(" " << gdoflist[i] << " |"); } - printf("\n"); + _printLine_(""); - printf(" f_doflist (%i): |",this->fsize); + _printString_(" f_doflist (" << this->fsize << "): |"); for(i=0;ifsize;i++){ - printf(" %i |",fdoflist[i]); + _printString_(" " << fdoflist[i] << " |"); } - printf("\n"); + _printLine_(""); - printf(" s_doflist (%i): |",this->ssize); + _printString_(" s_doflist (" << this->ssize << "): |"); for(i=0;issize;i++){ - printf(" %i |",sdoflist[i]); + _printString_(" " << sdoflist[i] << " |"); } - printf("\n"); + _printLine_(""); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matice.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12511) @@ -59,22 +59,22 @@ /*FUNCTION Matice::Echo {{{*/ void Matice::Echo(void){ - printf("Matice:\n"); - printf(" mid: %i\n",mid); - printf(" inputs:\n"); + _printLine_("Matice:"); + _printLine_(" mid: " << mid); + _printLine_(" inputs:"); inputs->Echo(); - printf(" element:\n"); + _printLine_(" element:"); helement->Echo(); } /*}}}*/ /*FUNCTION Matice::DeepEcho {{{*/ void Matice::DeepEcho(void){ - printf("Matice:\n"); - printf(" mid: %i\n",mid); - printf(" inputs:\n"); + _printLine_("Matice:"); + _printLine_(" mid: " << mid); + _printLine_(" inputs:"); inputs->DeepEcho(); - printf(" element:\n"); + _printLine_(" element:"); helement->Echo(); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matpar.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12511) @@ -56,21 +56,21 @@ /*FUNCTION Matpar::Echo {{{*/ void Matpar::Echo(void){ - printf("Matpar:\n"); - printf(" mid: %i\n",mid); - printf(" rho_ice: %g\n",rho_ice); - printf(" rho_water: %g\n",rho_water); - printf(" rho_freshwater: %g\n",rho_freshwater); - printf(" mu_water: %g\n",mu_water); - printf(" heatcapacity: %g\n",heatcapacity); - printf(" thermalconductivity: %g\n",thermalconductivity); - printf(" latentheat: %g\n",latentheat); - printf(" beta: %g\n",beta); - printf(" meltingpoint: %g\n",meltingpoint); - printf(" referencetemperature: %g\n",referencetemperature); - printf(" mixed_layer_capacity: %g\n",mixed_layer_capacity); - printf(" thermal_exchange_velocity: %g\n",thermal_exchange_velocity); - printf(" g: %g\n",g); + _printLine_("Matpar:"); + _printLine_(" mid: " << mid); + _printLine_(" rho_ice: " << rho_ice); + _printLine_(" rho_water: " << rho_water); + _printLine_(" rho_freshwater: " << rho_freshwater); + _printLine_(" mu_water: " << mu_water); + _printLine_(" heatcapacity: " << heatcapacity); + _printLine_(" thermalconductivity: " << thermalconductivity); + _printLine_(" latentheat: " << latentheat); + _printLine_(" beta: " << beta); + _printLine_(" meltingpoint: " << meltingpoint); + _printLine_(" referencetemperature: " << referencetemperature); + _printLine_(" mixed_layer_capacity: " << mixed_layer_capacity); + _printLine_(" thermal_exchange_velocity: " << thermal_exchange_velocity); + _printLine_(" g: " << g); return; } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Gauss/GaussTria.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Gauss/GaussTria.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Gauss/GaussTria.cpp (revision 12511) @@ -107,38 +107,38 @@ /*FUNCTION GaussTria::Echo{{{*/ void GaussTria::Echo(void){ - printf("GaussTria:\n"); - printf(" numgauss: %i\n",numgauss); + _printLine_("GaussTria:"); + _printLine_(" numgauss: " << numgauss); if (weights){ - printf(" weights = ["); - for(int i=0;ienum_type,EnumToStringx(this->enum_type)); - printf(" value: %p\n",this->value); + _printLine_("FileParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << this->value); } /*}}}*/ /*FUNCTION FileParam::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12511) @@ -62,9 +62,9 @@ /*FUNCTION IntVecParam::Echo {{{*/ void IntVecParam::Echo(void){ - printf("IntVecParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" vector size: %i\n",this->M); + _printLine_("IntVecParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" vector size: " << this->M); } /*}}}*/ @@ -73,11 +73,11 @@ int i; - printf("IntVecParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" vector size: %i\n",this->M); + _printLine_("IntVecParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" vector size: " << this->M); for(i=0;iM;i++){ - printf("%i %i\n",i,this->values[i]); + _printLine_("" << i << " " << this->values[i]); } } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12511) @@ -47,9 +47,9 @@ /*FUNCTION IntParam::DeepEcho{{{*/ void IntParam::DeepEcho(void){ - printf("IntParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %i\n",this->value); + _printLine_("IntParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << this->value); } /*}}}*/ /*FUNCTION IntParam::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12511) @@ -47,9 +47,9 @@ /*FUNCTION BoolParam::DeepEcho{{{*/ void BoolParam::DeepEcho(void){ - printf("BoolParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %s\n",this->value?"true":"false"); + _printLine_("BoolParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " <<(this->value?"true":"false")); } /*}}}*/ /*FUNCTION BoolParam::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12511) @@ -47,9 +47,9 @@ /*FUNCTION IntMatParam::Echo {{{*/ void IntMatParam::Echo(void){ - printf("IntMatParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" matrix size: %ix%i\n",this->M,this->N); + _printLine_("IntMatParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" matrix size: " << this->M << "x" << this->N); } /*}}}*/ @@ -58,12 +58,12 @@ int i,j; - printf("IntMatParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" matrix size: %ix%i\n",this->M,this->N); + _printLine_("IntMatParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" matrix size: " << this->M << "x" << this->N); for(i=0;iM;i++){ for(i=0;iN;i++){ - printf("(%i,%i) %i\n",i,j,*(this->value+N*i+j)); + _printLine_("(" << i << "," << j << ") " << *(this->value+N*i+j)); } } } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12511) @@ -48,8 +48,8 @@ /*FUNCTION VectorParam::Echo {{{*/ void VectorParam::Echo(void){ - printf("VectorParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); + _printLine_("VectorParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); } /*}}}*/ @@ -57,8 +57,8 @@ void VectorParam::DeepEcho(void){ int i; - printf("VectorParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); + _printLine_("VectorParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); value->Echo(); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12511) @@ -46,8 +46,8 @@ /*FUNCTION MatrixParam::Echo {{{*/ void MatrixParam::Echo(void){ - printf("MatrixParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); + _printLine_("MatrixParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); } /*}}}*/ @@ -55,8 +55,8 @@ void MatrixParam::DeepEcho(void){ int i; - printf("MatrixParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); + _printLine_("MatrixParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); this->value->Echo(); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12511) @@ -74,11 +74,11 @@ int i; char* string=NULL; - printf("StringArrayParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); + _printLine_("StringArrayParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); for(i=0;inumstrings;i++){ string=this->value[i]; - printf(" %i: %s\n",i,string); + _printLine_(" " << i << ": " << string); } } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12511) @@ -49,9 +49,9 @@ /*}}}*/ /*FUNCTION StringParam::DeepEcho{{{*/ void StringParam::DeepEcho(void){ - printf("StringParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %s\n",this->value); + _printLine_("StringParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << this->value); } /*}}}*/ /*FUNCTION StringParam::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12511) @@ -46,9 +46,9 @@ /*FUNCTION DoubleVecParam::Echo {{{*/ void DoubleVecParam::Echo(void){ - printf("DoubleVecParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" vector size: %i\n",this->M); + _printLine_("DoubleVecParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" vector size: " << this->M); } /*}}}*/ @@ -57,11 +57,11 @@ int i; - printf("DoubleVecParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" vector size: %i\n",this->M); + _printLine_("DoubleVecParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" vector size: " << this->M); for(i=0;iM;i++){ - printf("%i %g\n",i,this->values[i]); + _printLine_("" << i << " " << this->values[i]); } } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12511) @@ -44,9 +44,9 @@ /*FUNCTION DoubleParam::DeepEcho{{{*/ void DoubleParam::DeepEcho(void){ - printf("DoubleParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %g\n",this->value); + _printLine_("DoubleParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << this->value); } /*}}}*/ /*FUNCTION DoubleParam::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12511) @@ -86,10 +86,10 @@ /*FUNCTION DoubleMatArrayParam::Echo {{{*/ void DoubleMatArrayParam::Echo(void){ - printf("DoubleMatArrayParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" array size: %i\n",this->M); - printf(" array pointer: %p\n",this->array); + _printLine_("DoubleMatArrayParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" array size: " << this->M); + _printLine_(" array pointer: " << this->array); } /*}}}*/ @@ -100,19 +100,19 @@ int m,n; IssmDouble* matrix=NULL; - printf("DoubleMatArrayParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" array size: %i\n",this->M); + _printLine_("DoubleMatArrayParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" array size: " << this->M); for(i=0;ienum_type,EnumToStringx(this->enum_type)); - printf(" matrix size: %ix%i\n",this->M,this->N); + _printLine_("DoubleMatParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" matrix size: " << this->M << "x" << this->N); } /*}}}*/ @@ -58,12 +58,12 @@ int i,j; - printf("DoubleMatParam:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" matrix size: %ix%i\n",this->M,this->N); + _printLine_("DoubleMatParam:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" matrix size: " << this->M << "x" << this->N); for(i=0;iM;i++){ for(i=0;iN;i++){ - printf("%i %i %g\n",i,j,*(this->value+N*i+j)); + _printLine_("" << i << " " << j << " " << *(this->value+N*i+j)); } } } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.cpp (revision 12511) @@ -48,10 +48,10 @@ /*FUNCTION Segment::Echo{{{*/ void Segment::Echo(void){ - printf("Segment:\n"); - printf(" eid: %i\n",eid); - printf(" node 1: %g|%g\n",this->x1,this->y1); - printf(" node 2: %g|%g\n",this->x2,this->y2); + _printLine_("Segment:"); + _printLine_(" eid: " << eid); + _printLine_(" node 1: " << this->x1 << "|" << this->y1); + _printLine_(" node 2: " << this->x2 << "|" << this->y2); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/Matrix.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/Matrix.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Numerics/Matrix.cpp (revision 12511) @@ -129,12 +129,12 @@ #ifdef _HAVE_ADOLC_ /*Not sure about that one. Should we use the overloaded operator >>?*/ - printf("ADOLC Matrix equivalent:" ); + _printString_("ADOLC Matrix equivalent:" ); for(i=0;iEcho(); helement->Echo(); - printf(" parameters: %p\n",parameters); - printf(" inputs: %p\n",inputs); + _printLine_(" parameters: " << parameters); + _printLine_(" inputs: " << inputs); } /*}}}*/ /*FUNCTION Numericalflux::DeepEcho {{{*/ void Numericalflux::DeepEcho(void){ - printf("Numericalflux:\n"); - printf(" id: %i\n",id); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("Numericalflux:"); + _printLine_(" id: " << id); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); hnodes->DeepEcho(); helement->DeepEcho(); - printf(" parameters\n"); + _printLine_(" parameters"); if(parameters) parameters->DeepEcho(); else - printf(" NULL\n"); - printf(" inputs\n"); + _printLine_(" NULL"); + _printLine_(" inputs"); inputs->DeepEcho(); } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Penpair.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 12511) @@ -56,9 +56,9 @@ int i; - printf("Penpair:\n"); - printf(" id: %i\n",id); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("Penpair:"); + _printLine_(" id: " << id); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); hnodes->Echo(); return; @@ -67,9 +67,9 @@ /*FUNCTION Penpair::DeepEcho {{{*/ void Penpair::DeepEcho(void){ - printf("Penpair:\n"); - printf(" id: %i\n",id); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("Penpair:"); + _printLine_(" id: " << id); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); hnodes->DeepEcho(); return; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Pengrid.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Pengrid.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Pengrid.cpp (revision 12511) @@ -108,17 +108,17 @@ /*FUNCTION Pengrid::DeepEcho{{{*/ void Pengrid::DeepEcho(void){ - printf("Pengrid:\n"); - printf(" id: %i\n",id); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("Pengrid:"); + _printLine_(" id: " << id); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); hnode->DeepEcho(); helement->DeepEcho(); hmatpar->DeepEcho(); - printf(" active %i\n",this->active); - printf(" zigzag_counter %i\n",this->zigzag_counter); - printf(" parameters\n"); + _printLine_(" active " << this->active); + _printLine_(" zigzag_counter " << this->zigzag_counter); + _printLine_(" parameters"); parameters->DeepEcho(); - printf(" inputs\n"); + _printLine_(" inputs"); inputs->DeepEcho(); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Icefront.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 12511) @@ -126,30 +126,30 @@ /*Object virtual functions definitions:*/ /*FUNCTION Icefront::Echo {{{*/ void Icefront::Echo(void){ - printf("Icefront:\n"); - printf(" id: %i\n",id); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("Icefront:"); + _printLine_(" id: " << id); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); hnodes->Echo(); helement->Echo(); hmatpar->Echo(); - printf(" parameters: %p\n",parameters); + _printLine_(" parameters: " << parameters); if(parameters)parameters->Echo(); - printf(" inputs: %p\n",inputs); + _printLine_(" inputs: " << inputs); if(inputs)inputs->Echo(); } /*}}}*/ /*FUNCTION Icefront::DeepEcho{{{*/ void Icefront::DeepEcho(void){ - printf("Icefront:\n"); - printf(" id: %i\n",id); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("Icefront:"); + _printLine_(" id: " << id); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); hnodes->DeepEcho(); helement->DeepEcho(); hmatpar->DeepEcho(); - printf(" parameters: %p\n",parameters); + _printLine_(" parameters: " << parameters); if(parameters)parameters->DeepEcho(); - printf(" inputs: %p\n",inputs); + _printLine_(" inputs: " << inputs); if(inputs)inputs->DeepEcho(); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Friction.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Friction.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Friction.cpp (revision 12511) @@ -47,9 +47,9 @@ /*methods: */ /*FUNCTION Friction::Echo {{{*/ void Friction::Echo(void){ - printf("Friction:\n"); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); - printf(" element_type: %s\n",this->element_type); + _printLine_("Friction:"); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); + _printLine_(" element_type: " << this->element_type); inputs->Echo(); matpar->Echo(); } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Riftfront.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12511) @@ -142,43 +142,43 @@ input=(Input*)this->inputs->GetInput(FrictionEnum); input->GetInputValue(&friction); input=(Input*)this->inputs->GetInput(FractionIncrementEnum); input->GetInputValue(&fractionincrement); - printf("Riftfront:\n"); - printf(" id: %i\n",id); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); - printf(" hnodes: %p\n",hnodes); - printf(" helements: %p\n",helements); - printf(" hmatpar: %p\n",hmatpar); - printf(" parameters: %p\n",parameters); - printf(" inputs: %p\n",inputs); - printf(" internal parameters: \n"); - printf(" normal: %g|%g\n",normal[0],normal[1]); - printf(" length: %g\n",length); - printf(" penalty_lock: %i\n",penalty_lock); - printf(" active: %s\n",active ? "true":"false"); - printf(" counter: %i\n",counter); - printf(" prestable: %s\n",prestable ? "true":"false"); - printf(" material_converged: %s\n",material_converged ? "true":"false"); - printf(" fill: %i\n",fill); - printf(" friction: %g\n",friction); - printf(" fraction: %g\n",fraction); - printf(" fractionincrement: %g\n",fractionincrement); - printf(" state: %i\n",state); - printf(" frozen: %s\n",frozen ? "true":"false"); + _printLine_("Riftfront:"); + _printLine_(" id: " << id); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); + _printLine_(" hnodes: " << hnodes); + _printLine_(" helements: " << helements); + _printLine_(" hmatpar: " << hmatpar); + _printLine_(" parameters: " << parameters); + _printLine_(" inputs: " << inputs); + _printLine_(" internal parameters: "); + _printLine_(" normal: " << normal[0] << "|" << normal[1]); + _printLine_(" length: " << length); + _printLine_(" penalty_lock: " << penalty_lock); + _printLine_(" active: " <<(active ? "true":"false")); + _printLine_(" counter: " << counter); + _printLine_(" prestable: " << (prestable ? "true":"false")); + _printLine_(" material_converged: " << (material_converged ? "true":"false")); + _printLine_(" fill: " << fill); + _printLine_(" friction: " << friction); + _printLine_(" fraction: " << fraction); + _printLine_(" fractionincrement: " << fractionincrement); + _printLine_(" state: " << state); + _printLine_(" frozen: " << (frozen ? "true":"false")); } /*}}}*/ /*FUNCTION Riftfront::DeepEcho{{{*/ void Riftfront::DeepEcho(void){ - printf("Riftfront:\n"); - printf(" id: %i\n",id); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("Riftfront:"); + _printLine_(" id: " << id); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); hnodes->DeepEcho(); helements->DeepEcho(); hmatpar->DeepEcho(); - printf(" parameters\n"); + _printLine_(" parameters"); if(parameters)parameters->DeepEcho(); - printf(" inputs\n"); + _printLine_(" inputs"); if(inputs)inputs->DeepEcho(); } /*}}}*/ @@ -632,7 +632,7 @@ /*increase melange fraction: */ this->fraction+=fractionincrement; if (this->fraction>1)this->fraction=(IssmDouble)1.0; - //printf("riftfront %i fraction: %g\n",this->Id(),this->fraction); + //_printLine_("riftfront " << this->Id() << " fraction: " << this->fraction); } //Figure out stability of this penalty @@ -647,7 +647,7 @@ //Set penalty flag this->active=activate; - //if ((penetration>0) && (this->active==1))printf("Riftfront %i wants to be released\n",Id()); + //if ((penetration>0) && (this->active==1))_printLine_("Riftfront " << Id() << " wants to be released"); /*assign output pointer: */ *punstable=unstable; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 12511) @@ -56,11 +56,11 @@ /*FUNCTION DoubleMatExternalResult::Echo {{{*/ void DoubleMatExternalResult::Echo(void){ - printf("DoubleMatExternalResult:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); - printf(" matrix size: %i-%i\n",this->M,this->N); + _printLine_("DoubleMatExternalResult:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); + _printLine_(" matrix size: " << this->M << "-" << this->N); } /*}}}*/ @@ -69,12 +69,12 @@ int i,j; - printf("DoubleMatExternalResult:\n"); - printf(" id: %i\n",this->id); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); - printf(" matrix size: %i-%i\n",this->M,this->N); + _printLine_("DoubleMatExternalResult:"); + _printLine_(" id: " << this->id); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); + _printLine_(" matrix size: " << this->M << "-" << this->N); for (i=0;iM;i++){ _printString_(" [ "); for (j=0;jN;j++){ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 12511) @@ -53,8 +53,8 @@ /*FUNCTION PetscVecExternalResult::Echo {{{*/ void PetscVecExternalResult::Echo(void){ - printf("PetscVecExternalResult:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); + _printLine_("PetscVecExternalResult:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); } /*}}}*/ @@ -62,11 +62,11 @@ void PetscVecExternalResult::DeepEcho(void){ int i; - printf("PetscVecExternalResult:\n"); - printf(" id: %i\n",this->id); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("PetscVecExternalResult:"); + _printLine_(" id: " << this->id); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); VecView(value,PETSC_VIEWER_STDOUT_WORLD); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 12511) @@ -52,12 +52,12 @@ /*FUNCTION StringExternalResult::DeepEcho{{{*/ void StringExternalResult::DeepEcho(void){ - printf("StringExternalResult:\n"); - printf(" id: %i\n",this->id); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %s\n",this->value); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("StringExternalResult:"); + _printLine_(" id: " << this->id); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << this->value); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ /*FUNCTION StringExternalResult::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 12511) @@ -53,11 +53,11 @@ /*FUNCTION DoubleVecExternalResult::Echo {{{*/ void DoubleVecExternalResult::Echo(void){ - printf("DoubleVecExternalResult:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" vector size: %i\n",this->M); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("DoubleVecExternalResult:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" vector size: " << this->M); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ @@ -66,15 +66,15 @@ int i; - printf("DoubleVecExternalResult:\n"); - printf(" id: %i\n",this->id); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" vector size: %i\n",this->M); + _printLine_("DoubleVecExternalResult:"); + _printLine_(" id: " << this->id); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" vector size: " << this->M); for(i=0;iM;i++){ - printf("%i %g\n",i,this->values[i]); + _printLine_("" << i << " " << this->values[i]); } - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ /*FUNCTION DoubleVecExternalResult::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 12511) @@ -50,12 +50,12 @@ /*FUNCTION DoubleExternalResult::DeepEcho{{{*/ void DoubleExternalResult::DeepEcho(void){ - printf("DoubleExternalResult:\n"); - printf(" id: %i\n",this->id); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %g\n",this->value); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("DoubleExternalResult:"); + _printLine_(" id: " << this->id); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << this->value); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ /*FUNCTION DoubleExternalResult::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 12511) @@ -50,12 +50,12 @@ /*FUNCTION IntExternalResult::DeepEcho{{{*/ void IntExternalResult::DeepEcho(void){ - printf("IntExternalResult:\n"); - printf(" id: %i\n",this->id); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %i\n",this->value); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("IntExternalResult:"); + _printLine_(" id: " << this->id); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << this->value); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ /*FUNCTION IntExternalResult::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 12511) @@ -50,12 +50,12 @@ /*FUNCTION BoolExternalResult::DeepEcho{{{*/ void BoolExternalResult::DeepEcho(void){ - printf("BoolExternalResult:\n"); - printf(" id: %i\n",this->id); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %s\n",this->value?"true":"false"); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("BoolExternalResult:"); + _printLine_(" id: " << this->id); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " <<(this->value?"true":"false")); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ /*FUNCTION BoolExternalResult::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/FemModel.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/FemModel.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/FemModel.cpp (revision 12511) @@ -101,12 +101,12 @@ /*FUNCTION FemModel::Echo {{{*/ void FemModel::Echo(void){ - printf("FemModel echo: \n"); - printf(" number of fem models: %i\n",nummodels); - printf(" analysis_type_list: \n"); - for(int i=0;ienum_type,EnumToStringx(this->enum_type)); - 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]); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("PentaP1ElementResult:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << " " << this->values[3] << " " << this->values[4] << " " << this->values[5] << "]"); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12511) @@ -47,11 +47,11 @@ /*FUNCTION DoubleElementResult::DeepEcho{{{*/ void DoubleElementResult::DeepEcho(void){ - printf("DoubleElementResult:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %g\n",this->value); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("DoubleElementResult:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << this->value); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ /*FUNCTION DoubleElementResult::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp (revision 12511) @@ -47,11 +47,11 @@ /*FUNCTION BoolElementResult::DeepEcho{{{*/ void BoolElementResult::DeepEcho(void){ - printf("BoolElementResult:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %s\n",this->value?"true":"false"); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("BoolElementResult:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: "<<(this->value?"true":"false")); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ /*FUNCTION BoolElementResult::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 12511) @@ -49,11 +49,11 @@ /*FUNCTION TriaP1ElementResult::DeepEcho{{{*/ void TriaP1ElementResult::DeepEcho(void){ - printf("TriaP1ElementResult:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]); - printf(" step: %i\n",this->step); - printf(" time: %g\n",this->time); + _printLine_("TriaP1ElementResult:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << "]"); + _printLine_(" step: " << this->step); + _printLine_(" time: " << this->time); } /*}}}*/ /*FUNCTION TriaP1ElementResult::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12511) @@ -866,34 +866,34 @@ /*FUNCTION Tria::DeepEcho{{{*/ void Tria::DeepEcho(void){ - printf("Tria:\n"); - printf(" id: %i\n",id); + _printLine_("Tria:"); + _printLine_(" id: " << id); if(nodes){ nodes[0]->DeepEcho(); nodes[1]->DeepEcho(); nodes[2]->DeepEcho(); } - else printf("nodes = NULL\n"); + else _printLine_("nodes = NULL"); if (matice) matice->DeepEcho(); - else printf("matice = NULL\n"); + else _printLine_("matice = NULL"); if (matpar) matpar->DeepEcho(); - else printf("matpar = NULL\n"); + else _printLine_("matpar = NULL"); - printf(" parameters\n"); + _printLine_(" parameters"); if (parameters) parameters->DeepEcho(); - else printf("parameters = NULL\n"); + else _printLine_("parameters = NULL"); - printf(" inputs\n"); + _printLine_(" inputs"); if (inputs) inputs->DeepEcho(); - else printf("inputs=NULL\n"); + else _printLine_("inputs=NULL"); if (results) results->DeepEcho(); - else printf("results=NULL\n"); + else _printLine_("results=NULL"); - printf("neighboor sids: \n"); - printf(" %i %i %i\n",horizontalneighborsids[0],horizontalneighborsids[1],horizontalneighborsids[2]); + _printLine_("neighboor sids: "); + _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]); return; } @@ -909,34 +909,34 @@ /*}}}*/ /*FUNCTION Tria::Echo{{{*/ void Tria::Echo(void){ - printf("Tria:\n"); - printf(" id: %i\n",id); + _printLine_("Tria:"); + _printLine_(" id: " << id); if(nodes){ nodes[0]->Echo(); nodes[1]->Echo(); nodes[2]->Echo(); } - else printf("nodes = NULL\n"); + else _printLine_("nodes = NULL"); if (matice) matice->Echo(); - else printf("matice = NULL\n"); + else _printLine_("matice = NULL"); if (matpar) matpar->Echo(); - else printf("matpar = NULL\n"); + else _printLine_("matpar = NULL"); - printf(" parameters\n"); + _printLine_(" parameters"); if (parameters) parameters->Echo(); - else printf("parameters = NULL\n"); + else _printLine_("parameters = NULL"); - printf(" inputs\n"); + _printLine_(" inputs"); if (inputs) inputs->Echo(); - else printf("inputs=NULL\n"); + else _printLine_("inputs=NULL"); if (results) results->Echo(); - else printf("results=NULL\n"); + else _printLine_("results=NULL"); - printf("neighboor sids: \n"); - printf(" %i %i %i\n",horizontalneighborsids[0],horizontalneighborsids[1],horizontalneighborsids[2]); + _printLine_("neighboor sids: "); + _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]); } /*}}}*/ /*FUNCTION Tria::ObjectEnum{{{*/ @@ -1206,7 +1206,7 @@ elementresult->GetElementVectorFromResults(vector,sid); } else{ - printf("Interpolation %s not supported\n",EnumToStringx(interp)); + _printLine_("Interpolation " << EnumToStringx(interp) << " not supported"); } } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12511) @@ -652,8 +652,8 @@ int i; - printf("Penta:\n"); - printf(" id: %i\n",id); + _printLine_("Penta:"); + _printLine_(" id: " << id); nodes[0]->DeepEcho(); nodes[1]->DeepEcho(); nodes[2]->DeepEcho(); @@ -662,15 +662,15 @@ nodes[5]->DeepEcho(); matice->DeepEcho(); matpar->DeepEcho(); - printf(" neighbor ids: %i-%i\n",verticalneighbors[0]->Id(),verticalneighbors[1]->Id()); - printf(" parameters\n"); + _printLine_(" neighbor ids: " << verticalneighbors[0]->Id() << "-" << verticalneighbors[1]->Id()); + _printLine_(" parameters"); parameters->DeepEcho(); - printf(" inputs\n"); + _printLine_(" inputs"); inputs->DeepEcho(); - printf(" results\n"); + _printLine_(" results"); results->DeepEcho(); - printf("neighboor sids: \n"); - printf(" %i %i %i\n",horizontalneighborsids[0],horizontalneighborsids[1],horizontalneighborsids[2]); + _printLine_("neighboor sids: "); + _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]); return; } @@ -1094,7 +1094,7 @@ elementresult->GetElementVectorFromResults(vector,sid); } else{ - printf("Interpolation %s not supported\n",EnumToStringx(interp)); + _printLine_("Interpolation " << EnumToStringx(interp) << " not supported"); } } /*}}}*/ @@ -4328,8 +4328,8 @@ /*Check solution*/ if(isnan(values[i])) _error2_("NaN found in solution vector"); - //if(values[i]<0) printf("temperature < 0°K found in solution vector\n"); - //if(values[i]>275) printf("temperature > 275°K found in solution vector (Paterson's rheology associated is negative)\n"); + //if(values[i]<0) _printLine_("temperature < 0°K found in solution vector"); + //if(values[i]>275) _printLine_("temperature > 275°K found in solution vector (Paterson's rheology associated is negative)"); } /*Get all inputs and parameters*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/ControlInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 12511) @@ -71,13 +71,13 @@ /*FUNCTION ControlInput::DeepEcho{{{*/ void ControlInput::DeepEcho(void){ - printf("ControlInput:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf("---values: \n"); if (values) values->Echo(); - printf("---savedvalues: \n");if (savedvalues) savedvalues->Echo(); - printf("---minvalues: \n"); if (minvalues) minvalues->Echo(); - printf("---maxvalues: \n"); if (maxvalues) maxvalues->Echo(); - printf("---gradient: \n"); if (gradient) gradient->Echo(); + _printLine_("ControlInput:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_("---values: "); if (values) values->Echo(); + _printLine_("---savedvalues: ");if (savedvalues) savedvalues->Echo(); + _printLine_("---minvalues: "); if (minvalues) minvalues->Echo(); + _printLine_("---maxvalues: "); if (maxvalues) maxvalues->Echo(); + _printLine_("---gradient: "); if (gradient) gradient->Echo(); } /*}}}*/ /*FUNCTION ControlInput::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp (revision 12511) @@ -46,9 +46,9 @@ /*FUNCTION DatasetInput::DeepEcho{{{*/ void DatasetInput::DeepEcho(void){ - printf("DatasetInput:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf("---inputs: \n"); inputs->Echo(); + _printLine_("DatasetInput:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_("---inputs: "); inputs->Echo(); } /*}}}*/ /*FUNCTION DatasetInput::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12511) @@ -39,9 +39,9 @@ /*FUNCTION IntInput::DeepEcho{{{*/ void IntInput::DeepEcho(void){ - printf("IntInput:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %i\n",(int)this->value); + _printLine_("IntInput:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << (int)this->value); } /*}}}*/ /*FUNCTION IntInput::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/BoolInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12511) @@ -44,9 +44,9 @@ /*FUNCTION BoolInput::DeepEcho{{{*/ void BoolInput::DeepEcho(void){ - printf("BoolInput:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %s\n",value?"true":"false"); + _printLine_("BoolInput:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " <<(value?"true":"false")); } /*}}}*/ /*FUNCTION BoolInput::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 12511) @@ -55,9 +55,9 @@ /*FUNCTION TriaP1Input::DeepEcho{{{*/ void TriaP1Input::DeepEcho(void){ - printf("TriaP1Input:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]); + _printLine_("TriaP1Input:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << "]"); } /*}}}*/ /*FUNCTION TriaP1Input::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.cpp (revision 12511) @@ -65,12 +65,12 @@ int i; - printf("TransientInput:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" numtimesteps: %i\n",this->numtimesteps); - printf("---inputs: \n"); + _printLine_("TransientInput:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" numtimesteps: " << this->numtimesteps); + _printLine_("---inputs: "); for(i=0;inumtimesteps;i++){ - printf(" time: %g \n",this->timesteps[i]); + _printLine_(" time: " << this->timesteps[i] << " "); ((Input*)this->inputs->GetObjectByOffset(i))->Echo(); } } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 12511) @@ -55,9 +55,9 @@ /*FUNCTION PentaP1Input::DeepEcho{{{*/ void PentaP1Input::DeepEcho(void){ - printf("PentaP1Input:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - 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]); + _printLine_("PentaP1Input:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << " " << this->values[3] << " " << this->values[4] << " " << this->values[5] << "]"); } /*}}}*/ /*FUNCTION PentaP1Input::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12511) @@ -44,9 +44,9 @@ /*FUNCTION DoubleInput::DeepEcho{{{*/ void DoubleInput::DeepEcho(void){ - printf("DoubleInput:\n"); - printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); - printf(" value: %g\n",this->value); + _printLine_("DoubleInput:"); + _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); + _printLine_(" value: " << this->value); } /*}}}*/ /*FUNCTION DoubleInput::Id{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp (revision 12511) @@ -50,10 +50,10 @@ /*Object virtual functions definitions:*/ /*FUNCTION ExponentialVariogram::Echo {{{*/ void ExponentialVariogram::Echo(void){ - printf("ExponentialVariogram\n"); - printf(" nugget: %g\n",this->nugget); - printf(" sill : %g\n",this->sill); - printf(" range : %g\n",this->range); + _printLine_("ExponentialVariogram"); + _printLine_(" nugget: " << this->nugget); + _printLine_(" sill : " << this->sill); + _printLine_(" range : " << this->range); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp (revision 12511) @@ -50,10 +50,10 @@ /*Object virtual functions definitions:*/ /*FUNCTION GaussianVariogram::Echo {{{*/ void GaussianVariogram::Echo(void){ - printf("GaussianVariogram\n"); - printf(" nugget: %g\n",this->nugget); - printf(" sill : %g\n",this->sill); - printf(" range : %g\n",this->range); + _printLine_("GaussianVariogram"); + _printLine_(" nugget: " << this->nugget); + _printLine_(" sill : " << this->sill); + _printLine_(" range : " << this->range); } /*}}}*/ @@ -92,8 +92,8 @@ a = 1./3.; gamma = (sill-nugget)*(1.-exp(-h2/(a*range*range))) + nugget; - //if(h2>1000*1000) printf("gamma = %g h= %g\n",gamma,sqrt(h2)); - printf("h = %g gamma = %g\n",sqrt(h2),gamma); + //if(h2>1000*1000) _printLine_("gamma = " << gamma << " h= " << sqrt(h2)); + _printLine_("h = " << sqrt(h2) << " gamma = " << gamma); return gamma; } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp (revision 12511) @@ -50,10 +50,10 @@ /*Object virtual functions definitions:*/ /*FUNCTION SphericalVariogram::Echo {{{*/ void SphericalVariogram::Echo(void){ - printf("SphericalVariogram\n"); - printf(" nugget: %g\n",this->nugget); - printf(" sill : %g\n",this->sill); - printf(" range : %g\n",this->range); + _printLine_("SphericalVariogram"); + _printLine_(" nugget: " << this->nugget); + _printLine_(" sill : " << this->sill); + _printLine_(" range : " << this->range); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp (revision 12511) @@ -51,10 +51,10 @@ /*Object virtual functions definitions:*/ /*FUNCTION PowerVariogram::Echo {{{*/ void PowerVariogram::Echo(void){ - printf("PowerVariogram\n"); - printf(" nugget: %g\n",this->nugget); - printf(" slope : %g\n",this->slope); - printf(" power : %g\n",this->power); + _printLine_("PowerVariogram"); + _printLine_(" nugget: " << this->nugget); + _printLine_(" slope : " << this->slope); + _printLine_(" power : " << this->power); } /*}}}*/ @@ -88,7 +88,7 @@ /*return semi-variogram*/ gamma = this->nugget + this->slope*pow(h,this->power); - //if(h>1000) printf("gamma = %g h=%g\n",gamma,h); + //if(h>1000) _printLine_("gamma = " << gamma << " h=" << h); return gamma; } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Quadtree.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Quadtree.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Quadtree.cpp (revision 12511) @@ -296,21 +296,21 @@ /*FUNCTION Quadtree::Echo{{{*/ void Quadtree::Echo(void){ - printf("Quadtree:\n"); - printf(" MaxDepth = %i\n",this->MaxDepth); - printf(" NbQuadtreeBox = %i\n",this->NbQuadtreeBox); - printf(" NbObs = %i\n",this->NbObs); - printf(" root = %p\n",this->root); + _printLine_("Quadtree:"); + _printLine_(" MaxDepth = " << this->MaxDepth); + _printLine_(" NbQuadtreeBox = " << this->NbQuadtreeBox); + _printLine_(" NbObs = " << this->NbObs); + _printLine_(" root = " << this->root); }/*}}}*/ /*FUNCTION Quadtree::DeepEcho{{{*/ void Quadtree::DeepEcho(void){ - printf("Quadtree:\n"); - printf(" MaxDepth = %i\n",this->MaxDepth); - printf(" NbQuadtreeBox = %i\n",this->NbQuadtreeBox); - printf(" NbObs = %i\n",this->NbObs); - printf(" root = %p\n",this->root); + _printLine_("Quadtree:"); + _printLine_(" MaxDepth = " << this->MaxDepth); + _printLine_(" NbQuadtreeBox = " << this->NbQuadtreeBox); + _printLine_(" NbObs = " << this->NbObs); + _printLine_(" root = " << this->root); boxcontainer->Echo(); }/*}}}*/ @@ -511,11 +511,11 @@ /*FUNCTION QuadtreeBox::Echo{{{*/ void Quadtree::QuadtreeBox::Echo(void){ - printf("QuadtreeBox:\n"); - printf(" nbitems = %i\n",this->nbitems); - printf(" xcenter = %g\n",this->xcenter); - printf(" ycenter = %g\n",this->ycenter); - printf(" length = %g\n",this->length); + _printLine_("QuadtreeBox:"); + _printLine_(" nbitems = " << this->nbitems); + _printLine_(" xcenter = " << this->xcenter); + _printLine_(" ycenter = " << this->ycenter); + _printLine_(" length = " << this->length); }/*}}}*/ /*FUNCTION QuadtreeBox::IsWithinRange{{{*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Observation.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Observation.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Kriging/Observation.cpp (revision 12511) @@ -36,14 +36,14 @@ int bit; - printf("Observation\n"); - printf(" index : %i\n",this->index); - printf(" x : %g\n",this->x); - printf(" y : %g\n",this->y); - printf(" xi : "); printbinary(this->xi); printf("\n"); - printf(" yi : "); printbinary(this->yi); printf("\n"); - printf(" weight: %g\n",this->weight); - printf(" value : %g\n",this->value); + _printLine_("Observation"); + _printLine_(" index : " << this->index); + _printLine_(" x : " << this->x); + _printLine_(" y : " << this->y); + _printLine_(" xi : "); printbinary(this->xi); _printLine_(""); + _printLine_(" yi : "); printbinary(this->yi); _printLine_(""); + _printLine_(" weight: " << this->weight); + _printLine_(" value : " << this->value); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.cpp (revision 12511) @@ -156,13 +156,13 @@ /*FUNCTION Node::Echo{{{*/ void Node::Echo(void){ - printf("Node:\n"); - printf(" id: %i\n",id); - printf(" sid: %i\n",sid); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("Node:"); + _printLine_(" id: " << id); + _printLine_(" sid: " << sid); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); indexing.Echo(); - printf(" hvertex: not displayed\n"); - printf(" inputs: %p\n",inputs); + _printLine_(" hvertex: not displayed"); + _printLine_(" inputs: " << inputs); } @@ -170,14 +170,14 @@ /*FUNCTION Node::DeepEcho{{{*/ void Node::DeepEcho(void){ - printf("Node:\n"); - printf(" id: %i\n",id); - printf(" sid: %i\n",sid); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("Node:"); + _printLine_(" id: " << id); + _printLine_(" sid: " << sid); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); indexing.DeepEcho(); - printf("Vertex:\n"); + _printLine_("Vertex:"); hvertex->DeepEcho(); - printf(" inputs\n"); + _printLine_(" inputs"); } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12511) @@ -45,13 +45,13 @@ /*FUNCTION SpcDynamic::Echo {{{*/ void SpcDynamic::Echo(void){ - printf("SpcDynamic:\n"); - printf(" sid: %i\n",sid); - printf(" nodeid: %i\n",nodeid); - printf(" dof: %i\n",dof); - printf(" value: %g\n",value); - printf(" isset: %s\n",isset?"true":"false"); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("SpcDynamic:"); + _printLine_(" sid: " << sid); + _printLine_(" nodeid: " << nodeid); + _printLine_(" dof: " << dof); + _printLine_(" value: " << value); + _printLine_(" isset: " <<(isset?"true":"false")); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); return; } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12511) @@ -44,24 +44,24 @@ /*FUNCTION SpcStatic::Echo {{{*/ void SpcStatic::Echo(void){ - printf("SpcStatic:\n"); - printf(" sid: %i\n",sid); - printf(" nodeid: %i\n",nodeid); - printf(" dof: %i\n",dof); - printf(" value: %g\n",value); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("SpcStatic:"); + _printLine_(" sid: " << sid); + _printLine_(" nodeid: " << nodeid); + _printLine_(" dof: " << dof); + _printLine_(" value: " << value); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); return; } /*}}}*/ /*FUNCTION SpcStatic::DeepEcho {{{*/ void SpcStatic::DeepEcho(void){ - printf("SpcStatic:\n"); - printf(" sid: %i\n",sid); - printf(" nodeid: %i\n",nodeid); - printf(" dof: %i\n",dof); - printf(" value: %g\n",value); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); + _printLine_("SpcStatic:"); + _printLine_(" sid: " << sid); + _printLine_(" nodeid: " << nodeid); + _printLine_(" dof: " << dof); + _printLine_(" value: " << value); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); return; } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12510) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12511) @@ -59,15 +59,15 @@ void SpcTransient::Echo(void){ int i; - printf("SpcTransient:\n"); - printf(" sid: %i\n",sid); - printf(" nodeid: %i\n",nodeid); - printf(" dof: %i\n",dof); - printf(" nsteps: %i\n",nsteps); - printf(" analysis_type: %s\n",EnumToStringx(analysis_type)); - printf(" steps|times|values\n"); + _printLine_("SpcTransient:"); + _printLine_(" sid: " << sid); + _printLine_(" nodeid: " << nodeid); + _printLine_(" dof: " << dof); + _printLine_(" nsteps: " << nsteps); + _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); + _printLine_(" steps|times|values"); for(i=0;i