Changeset 15099


Ignore:
Timestamp:
05/24/13 12:38:54 (12 years ago)
Author:
Eric.Larour
Message:

CHG: greatly simplified the shared/io/Print routines. Replaced
_printf_ by _pprintString_ , then replaced all _printLine_ by _printString_
and _pprintLine_ by _pprintString_
We will then replace the _printString_ by _printf_ and _pprintString_ by _printf0_

Location:
issm/trunk-jpl/src
Files:
216 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/DakotaSpawnCore.cpp

    r15001 r15099  
    6262        femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum);
    6363
    64         if(VerboseQmu()) _pprintLine_("qmu iteration: " << counter);
     64        if(VerboseQmu()) _pprintString_("qmu iteration: " << counter << "\n");
    6565
    6666        /* only cpu 0, running dakota is providing us with variables and variables_descriptors and numresponses: broadcast onto other cpus: */
    … …  
    7171
    7272        /*Determine solution sequence: */
    73         if(VerboseQmu()) _pprintLine_("Starting " << EnumToStringx(solution_type) << " core:");
     73        if(VerboseQmu()) _pprintString_("Starting " << EnumToStringx(solution_type) << " core:" << "\n");
    7474        WrapperCorePointerFromSolutionEnum(&solutioncore,femmodel->parameters,solution_type,nodakotacore);
    7575
    … …  
    7878
    7979        /*compute responses: */
    80         if(VerboseQmu()) _pprintLine_("compute dakota responses:");
     80        if(VerboseQmu()) _pprintString_("compute dakota responses:" << "\n");
    8181        femmodel->DakotaResponsesx(d_responses,responses_descriptors,numresponsedescriptors,d_numresponses);
    8282

  • issm/trunk-jpl/src/c/analyses/ResetBoundaryConditions.cpp

    r15001 r15099  
    1313        Nodes *nodes = NULL;
    1414
    15         if(VerboseSolution()) _pprintLine_("   updating boundary conditions...");
     15        if(VerboseSolution()) _pprintString_("   updating boundary conditions..." << "\n");
    1616
    1717        /*set current analysis: */

  • issm/trunk-jpl/src/c/analyses/ad_core.cpp

    r15001 r15099  
    4949                        if(!(num_dependents*num_independents)) return;
    5050
    51                         if(VerboseAutodiff())_pprintLine_("   start ad core");
     51                        if(VerboseAutodiff())_pprintString_("   start ad core" << "\n");
    5252
    5353                        /*retrieve state variable: */
    … …  
    286286                        tapestats(1,tape_stats); //reading of tape statistics
    287287                        if(VerboseAutodiff()){
    288                                 _pprintLine_("   ADOLC statistics: ");
    289                                 _pprintLine_("   "<<setw(45)<<left<<"Number of independents: " <<tape_stats[0]);
    290                                 _pprintLine_("   "<<setw(45)<<left<<"Number of dependents: " <<tape_stats[1]);
    291                                 _pprintLine_("   "<<setw(45)<<left<<"Maximal number of live active variables: " <<tape_stats[2]);
    292                                 _pprintLine_("   "<<setw(45)<<left<<"Size of value stack (number of overwrites): " <<tape_stats[3]);
    293                                 _pprintLine_("   "<<setw(45)<<left<<"Buffer size (a multiple of eight): " <<tape_stats[4]);
    294                                 _pprintLine_("   "<<setw(45)<<left<<"Total number of operations recorded: " <<tape_stats[5]);
    295                         }
    296                         if(VerboseAutodiff())_pprintLine_("   end AD core");
     288                                _pprintString_("   ADOLC statistics: " << "\n");
     289                                _pprintString_("   "<<setw(45)<<left<<"Number of independents: " <<tape_stats[0] << "\n");
     290                                _pprintString_("   "<<setw(45)<<left<<"Number of dependents: " <<tape_stats[1] << "\n");
     291                                _pprintString_("   "<<setw(45)<<left<<"Maximal number of live active variables: " <<tape_stats[2] << "\n");
     292                                _pprintString_("   "<<setw(45)<<left<<"Size of value stack (number of overwrites): " <<tape_stats[3] << "\n");
     293                                _pprintString_("   "<<setw(45)<<left<<"Buffer size (a multiple of eight): " <<tape_stats[4] << "\n");
     294                                _pprintString_("   "<<setw(45)<<left<<"Total number of operations recorded: " <<tape_stats[5] << "\n");
     295                        }
     296                        if(VerboseAutodiff())_pprintString_("   end AD core" << "\n");
    297297
    298298                        /*Free resources: */

  • issm/trunk-jpl/src/c/analyses/adjointbalancethickness_core.cpp

    r15001 r15099  
    1919
    2020        /*compute thickness */
    21         if(VerboseSolution()) _pprintLine_("   computing thickness");
     21        if(VerboseSolution()) _pprintString_("   computing thickness" << "\n");
    2222        femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum);
    2323        solutionsequence_linear(femmodel);
    … …  
    2727
    2828        /*compute adjoint*/
    29         if(VerboseSolution()) _pprintLine_("   computing adjoint");
     29        if(VerboseSolution()) _pprintString_("   computing adjoint" << "\n");
    3030        femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum,AdjointBalancethicknessAnalysisEnum);
    3131        solutionsequence_adjoint_linear(femmodel);
    … …  
    3333        /*Save results*/
    3434        if(save_results){
    35                 if(VerboseSolution()) _pprintLine_("   saving results");
     35                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    3636                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointEnum);
    3737        }

  • issm/trunk-jpl/src/c/analyses/adjointdiagnostic_core.cpp

    r15001 r15099  
    2222
    2323        /*Compute velocities*/
    24         if(VerboseSolution()) _pprintLine_("   computing velocities");
     24        if(VerboseSolution()) _pprintString_("   computing velocities" << "\n");
    2525        femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
    2626        solutionsequence_nonlinear(femmodel,conserve_loads);
    … …  
    3030
    3131        /*Compute adjoint*/
    32         if(VerboseSolution()) _pprintLine_("   computing adjoint");
     32        if(VerboseSolution()) _pprintString_("   computing adjoint" << "\n");
    3333        femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum);
    3434        solutionsequence_adjoint_linear(femmodel);
    … …  
    3636        /*Save results*/
    3737        if(save_results){
    38                 if(VerboseSolution()) _pprintLine_("   saving results");
     38                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    3939                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointxEnum);
    4040                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointyEnum);

  • issm/trunk-jpl/src/c/analyses/balancethickness_core.cpp

    r15001 r15099  
    2121        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    2222
    23         if(VerboseSolution()) _pprintLine_("call computational core:");
     23        if(VerboseSolution()) _pprintString_("call computational core:" << "\n");
    2424        solutionsequence_linear(femmodel);
    2525
    2626        if(save_results){
    27                 if(VerboseSolution()) _pprintLine_("   saving results");
     27                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    2828                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
    2929        }

  • issm/trunk-jpl/src/c/analyses/bedslope_core.cpp

    r15001 r15099  
    1818        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    1919
    20         if(VerboseSolution()) _pprintLine_("   computing slope");
     20        if(VerboseSolution()) _pprintString_("   computing slope" << "\n");
    2121
    2222        /*Call on core computations: */
    … …  
    2727
    2828        if(save_results){
    29                 if(VerboseSolution()) _pprintLine_("   saving results");
     29                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    3030                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeXEnum);
    3131                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeYEnum);

  • issm/trunk-jpl/src/c/analyses/control_core.cpp

    r15055 r15099  
    6666
    6767        /*Launch once a complete solution to set up all inputs*/
    68         if(VerboseControl()) _pprintLine_("   preparing initial solution");
     68        if(VerboseControl()) _pprintString_("   preparing initial solution" << "\n");
    6969        if(isstokes) solutioncore(femmodel);
    7070
    … …  
    8181
    8282                /*Display info*/
    83                 if(VerboseControl()) _pprintLine_("\n" << "   control method step " << n+1 << "/" << nsteps);
     83                if(VerboseControl()) _pprintString_("\n" << "   control method step " << n+1 << "/" << nsteps << "\n");
    8484                for(i=0;i<num_responses;i++) step_responses[i]=reCast<int,IssmDouble>(responses[n*num_responses+i]);
    8585                femmodel->parameters->SetParam(step_responses,1,num_responses,StepResponsesEnum);
    … …  
    8888                if(solution_type==SteadystateSolutionEnum) solutioncore(femmodel);
    8989
    90                 if(VerboseControl()) _pprintLine_("   compute adjoint state:");
     90                if(VerboseControl()) _pprintString_("   compute adjoint state:" << "\n");
    9191                adjointcore(femmodel);
    9292                gradient_core(femmodel,n,search_scalar==0);
    … …  
    9898                }
    9999
    100                 if(VerboseControl()) _pprintLine_("   optimizing along gradient direction");
     100                if(VerboseControl()) _pprintString_("   optimizing along gradient direction" << "\n");
    101101                optpars.maxiter=reCast<int,IssmDouble>(maxiter[n]); optpars.cm_jump=cm_jump[n];
    102102                BrentSearch(&search_scalar,J+n,&optpars,&objectivefunction,&optargs);
    103103
    104                 if(VerboseControl()) _pprintLine_("   updating parameter using optimized search scalar"); //true means update save controls
     104                if(VerboseControl()) _pprintString_("   updating parameter using optimized search scalar" << "\n"); //true means update save controls
    105105                InputControlUpdatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,search_scalar,true);
    106106
    … …  
    108108        }
    109109
    110         if(VerboseControl()) _pprintLine_("   preparing final solution");
     110        if(VerboseControl()) _pprintString_("   preparing final solution" << "\n");
    111111        femmodel->parameters->SetParam(true,SaveResultsEnum);
    112112        solutioncore(femmodel);

  • issm/trunk-jpl/src/c/analyses/controltao_core.cpp

    r15001 r15099  
    5454        /*Initialize TAO*/
    5555        TaoCreate(IssmComm::GetComm(),&tao);
    56         if(VerboseControl()) _pprintLine_("   Initializing the Toolkit for Advanced Optimization (TAO)");
     56        if(VerboseControl()) _pprintString_("   Initializing the Toolkit for Advanced Optimization (TAO)" << "\n");
    5757        TaoSetFromOptions(tao);
    5858        TaoSetType(tao,"tao_blmvm");
    … …  
    7979
    8080        /*Solver optimization problem*/
    81         if(VerboseControl()) _pprintLine_("   Starting optimization");
     81        if(VerboseControl()) _pprintString_("   Starting optimization" << "\n");
    8282        TaoSolve(tao);
    8383        TaoView(tao,PETSC_VIEWER_STDOUT_WORLD);
    … …  
    9090
    9191        /*Finalize*/
    92         if(VerboseControl()) _pprintLine_("   preparing final solution");
     92        if(VerboseControl()) _pprintString_("   preparing final solution" << "\n");
    9393        femmodel->parameters->SetParam(true,SaveResultsEnum);
    9494        void (*solutioncore)(FemModel*)=NULL;
    … …  
    166166
    167167        TaoGetSolutionStatus(tao, &its, &f, &gnorm, &cnorm, &xdiff, NULL);
    168         if(its==0) _pprintLine_("Iter       Function      Residual  |  List of contributions");
    169         if(its==0) _pprintLine_("-----------------------------------+-----------------------");
     168        if(its==0) _pprintString_("Iter       Function      Residual  |  List of contributions" << "\n");
     169        if(its==0) _pprintString_("-----------------------------------+-----------------------" << "\n");
    170170        _pprintString_(setw(4)<<its<<"   "<<setw(12)<<setprecision(7)<<f<<"  "<<setw(12)<<setprecision(7)<<gnorm<<"  | ");
    171171        user->J[its]=f;
    … …  
    176176                _pprintString_(" "<<setw(12)<<setprecision(7)<<f);
    177177        }
    178         _pprintLine_("");
     178        _pprintString_("" << "\n");
    179179
    180180        /*Clean-up and return*/

  • issm/trunk-jpl/src/c/analyses/diagnostic_core.cpp

    r15001 r15099  
    5858        if(ishutter){
    5959
    60                 if(VerboseSolution()) _pprintLine_("   computing hutter velocities");
     60                if(VerboseSolution()) _pprintString_("   computing hutter velocities" << "\n");
    6161
    6262                //Take the last velocity into account so that the velocity on the MacAyeal domain is not zero
    … …  
    7171        if ((ismacayealpattyn || isl1l2) ^ isstokes){ // ^ = xor
    7272
    73                 if(VerboseSolution()) _pprintLine_("   computing velocities");
     73                if(VerboseSolution()) _pprintString_("   computing velocities" << "\n");
    7474                femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
    7575                if(newton>0)
    … …  
    8181        if (ismacayealpattyn && isstokes){
    8282
    83                 if(VerboseSolution()) _pprintLine_("   computing coupling macayealpattyn and stokes velocities and pressure ");
     83                if(VerboseSolution()) _pprintString_("   computing coupling macayealpattyn and stokes velocities and pressure " << "\n");
    8484                solutionsequence_stokescoupling_nonlinear(femmodel,conserve_loads);
    8585        }
    … …  
    8787        if (dim==3 & (ishutter || ismacayealpattyn)){
    8888
    89                 if(VerboseSolution()) _pprintLine_("   computing vertical velocities");
     89                if(VerboseSolution()) _pprintString_("   computing vertical velocities" << "\n");
    9090                femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
    9191                solutionsequence_linear(femmodel);
    … …  
    9393
    9494        if(save_results){
    95                 if(VerboseSolution()) _pprintLine_("   saving results");
     95                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    9696                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
    9797                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);

  • issm/trunk-jpl/src/c/analyses/enthalpy_core.cpp

    r15001 r15099  
    1818        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    1919
    20         if(VerboseSolution()) _pprintLine_("   computing enthalpy");
     20        if(VerboseSolution()) _pprintString_("   computing enthalpy" << "\n");
    2121        femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum);
    2222        solutionsequence_nonlinear(femmodel,true);
    … …  
    2626
    2727        if(save_results){
    28                 if(VerboseSolution()) _pprintLine_("   saving results");
     28                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    2929                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum);
    3030                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum);

  • issm/trunk-jpl/src/c/analyses/gia_core.cpp

    r15001 r15099  
    2626        femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
    2727
    28         if(VerboseSolution()) _pprintLine_("   computing GIA");
     28        if(VerboseSolution()) _pprintString_("   computing GIA" << "\n");
    2929
    3030        /*Call on core computations: */
    … …  
    5050
    5151        if(save_results){
    52                 if(VerboseSolution()) _pprintLine_("   saving results");
     52                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    5353                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GiaWEnum);
    5454                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GiadWdtEnum);

  • issm/trunk-jpl/src/c/analyses/gradient_core.cpp

    r15001 r15099  
    2020
    2121        /*Compute gradient*/
    22         if(VerboseControl()) _pprintLine_("   compute cost function gradient");
     22        if(VerboseControl()) _pprintString_("   compute cost function gradient" << "\n");
    2323        Gradjx(&gradient,&norm_list,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters);
    2424
    2525        if (orthogonalize){
    26                 if(VerboseControl()) _pprintLine_("   orthogonalization");
     26                if(VerboseControl()) _pprintString_("   orthogonalization" << "\n");
    2727                ControlInputGetGradientx(&old_gradient,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters);
    2828                Orthx(&new_gradient,gradient,old_gradient); delete old_gradient; delete gradient;

  • issm/trunk-jpl/src/c/analyses/hydrology_core.cpp

    r15037 r15099  
    5151        for(i=0;i<nsteps;i++){
    5252
    53                 if(nsteps)if(VerboseSolution()) _pprintLine_("time step:" << i+1 << "/" << nsteps);
     53                if(nsteps)if(VerboseSolution()) _pprintString_("time step:" << i+1 << "/" << nsteps << "\n");
    5454                time+=dt;
    5555                step+=1;
    … …  
    5858
    5959                if (hydrology_model==HydrologyshreveEnum){
    60                         if(VerboseSolution()) _pprintLine_("   computing water column");
     60                        if(VerboseSolution()) _pprintString_("   computing water column" << "\n");
    6161                        femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum);
    6262                        solutionsequence_nonlinear(femmodel,modify_loads);
    … …  
    6767
    6868                        if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
    69                                 if(VerboseSolution()) _pprintLine_("   saving results ");
     69                                if(VerboseSolution()) _pprintString_("   saving results " << "\n");
    7070                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum);
    7171                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVxEnum);
    … …  
    7373
    7474                                /*unload results*/
    75                                 if(VerboseSolution()) _pprintLine_("   saving temporary results");
     75                                if(VerboseSolution()) _pprintString_("   saving temporary results" << "\n");
    7676                                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    7777                        }
    … …  
    8282                        femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
    8383
    84                         if(VerboseSolution()) _pprintLine_("   computing water transfer");
     84                        if(VerboseSolution()) _pprintString_("   computing water transfer" << "\n");
    8585
    86                         if(VerboseSolution()) _pprintLine_("   computing water head");
     86                        if(VerboseSolution()) _pprintString_("   computing water head" << "\n");
    8787                        solutionsequence_hydro_nonlinear(femmodel);
    8888                        if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
    89                                 if(VerboseSolution()) _pprintLine_("   saving results ");
     89                                if(VerboseSolution()) _pprintString_("   saving results " << "\n");
    9090                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadEnum);
    9191                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadResidualEnum);
    … …  
    9494                                }
    9595                                /*unload results*/
    96                                 if(VerboseSolution()) _pprintLine_("   saving temporary results");
     96                                if(VerboseSolution()) _pprintString_("   saving temporary results" << "\n");
    9797                                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    9898                        }

  • issm/trunk-jpl/src/c/analyses/prognostic_core.cpp

    r15097 r15099  
    3232
    3333        if(issmbgradients){
    34           if(VerboseSolution)_printLine_("      call smb gradients module\n");
     34          if(VerboseSolution)_printString_("    call smb gradients module\n" << "\n");
    3535          SmbGradientsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    3636        }
    3737        if(ispdd){
    3838                if(isdelta18o){
    39                         if(VerboseSolution()) _pprintLine_("   call Delta18oParametrization module");
     39                        if(VerboseSolution()) _pprintString_("   call Delta18oParametrization module" << "\n");
    4040                        Delta18oParameterizationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    4141                }
    42                 if(VerboseSolution()) _pprintLine_("   call positive degree day module");
     42                if(VerboseSolution()) _pprintString_("   call positive degree day module" << "\n");
    4343                PositiveDegreeDayx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    4444        }
    45         if(VerboseSolution()) _pprintLine_("   call computational core");
     45        if(VerboseSolution()) _pprintString_("   call computational core" << "\n");
    4646        solutionsequence_linear(femmodel);
    4747
    4848        if(save_results){
    49                 if(VerboseSolution()) _pprintLine_("   saving results");
     49                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    5050                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
    5151                femmodel->RequestedOutputsx(requested_outputs,numoutputs);

  • issm/trunk-jpl/src/c/analyses/steadystate_core.cpp

    r15079 r15099  
    4848        for(;;){
    4949
    50                 if(VerboseSolution()) _pprintLine_("   computing temperature and velocity for step: " << step);
     50                if(VerboseSolution()) _pprintString_("   computing temperature and velocity for step: " << step << "\n");
    5151                #ifdef _HAVE_THERMAL_
    5252                if(isenthalpy==0){
    … …  
    6363                #endif
    6464
    65                 if(VerboseSolution()) _pprintLine_("   computing new velocity");
     65                if(VerboseSolution()) _pprintString_("   computing new velocity" << "\n");
    6666                diagnostic_core(femmodel);
    6767                GetSolutionFromInputsx(&ug,femmodel->elements, femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters);
    6868
    6969                if(step>1){
    70                         if(VerboseSolution()) _pprintLine_("   checking steadystate convergence");
     70                        if(VerboseSolution()) _pprintString_("   checking steadystate convergence" << "\n");
    7171                        if(steadystateconvergence(tg,tg_old,ug,ug_old,reltol)) break;
    7272                }
    7373                if(step>maxiter){
    74                         if(VerboseSolution()) _pprintLine_("   maximum number steadystate iterations " << maxiter << " reached");
     74                        if(VerboseSolution()) _pprintString_("   maximum number steadystate iterations " << maxiter << " reached" << "\n");
    7575                        break;
    7676                }
    … …  
    8383
    8484        if(save_results){
    85                 if(VerboseSolution()) _pprintLine_("   saving results");
     85                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    8686                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
    8787                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
    … …  
    117117        if (xIsNan<IssmDouble>(ndu) || xIsNan<IssmDouble>(nu)) _error_("convergence criterion is NaN!");
    118118        if((ndu/nu)<reltol){
    119                 if(VerboseConvergence()) _pprintLine_("\n"<<setw(50)<<left<<"   Velocity convergence: norm(du)/norm(u)"<<ndu/nu*100<<" < "<<reltol*100<<" %");
     119                if(VerboseConvergence()) _pprintString_("\n"<<setw(50)<<left<<"   Velocity convergence: norm(du)/norm(u)"<<ndu/nu*100<<" < "<<reltol*100<<" %" << "\n");
    120120        }
    121121        else{
    122                 if(VerboseConvergence()) _pprintLine_("\n"<<setw(50)<<left<<"   Velocity convergence: norm(du)/norm(u)"<<ndu/nu*100<<" > "<<reltol*100<<" %");
     122                if(VerboseConvergence()) _pprintString_("\n"<<setw(50)<<left<<"   Velocity convergence: norm(du)/norm(u)"<<ndu/nu*100<<" > "<<reltol*100<<" %" << "\n");
    123123                converged=false;
    124124        }
    … …  
    129129        if (xIsNan<IssmDouble>(ndt) || xIsNan<IssmDouble>(nt)) _error_("convergence criterion is NaN!");
    130130        if((ndt/nt)<reltol){
    131                 if(VerboseConvergence()) _pprintLine_(setw(50)<<left<<"   Temperature convergence: norm(dt)/norm(t)"<<ndt/nt*100<<" < "<<reltol*100<<" %");
     131                if(VerboseConvergence()) _pprintString_(setw(50)<<left<<"   Temperature convergence: norm(dt)/norm(t)"<<ndt/nt*100<<" < "<<reltol*100<<" %" << "\n");
    132132        }
    133133        else{
    134                 if(VerboseConvergence()) _pprintLine_(setw(50)<<left<<"   Temperature convergence: norm(dt)/norm(t)"<<ndt/nt*100<<" > "<<reltol*100<<" %");
     134                if(VerboseConvergence()) _pprintString_(setw(50)<<left<<"   Temperature convergence: norm(dt)/norm(t)"<<ndt/nt*100<<" > "<<reltol*100<<" %" << "\n");
    135135                converged=false;
    136136        }

  • issm/trunk-jpl/src/c/analyses/surfaceslope_core.cpp

    r15001 r15099  
    1818        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    1919
    20         if(VerboseSolution()) _pprintLine_("computing slope...");
     20        if(VerboseSolution()) _pprintString_("computing slope..." << "\n");
    2121
    2222        /*Call on core computations: */
    … …  
    2727
    2828        if(save_results){
    29                 if(VerboseSolution()) _pprintLine_("saving results:");
     29                if(VerboseSolution()) _pprintString_("saving results:" << "\n");
    3030                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeXEnum);
    3131                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeYEnum);

  • issm/trunk-jpl/src/c/analyses/thermal_core.cpp

    r15001 r15099  
    2525        }
    2626
    27         if(VerboseSolution()) _pprintLine_("   computing temperatures");
     27        if(VerboseSolution()) _pprintString_("   computing temperatures" << "\n");
    2828        femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);
    2929        solutionsequence_thermal_nonlinear(femmodel);
    3030
    31         if(VerboseSolution()) _pprintLine_("   computing melting");
     31        if(VerboseSolution()) _pprintString_("   computing melting" << "\n");
    3232        femmodel->SetCurrentConfiguration(MeltingAnalysisEnum);
    3333        solutionsequence_linear(femmodel);
    3434
    3535        if(save_results){
    36                 if(VerboseSolution()) _pprintLine_("   saving results");
     36                if(VerboseSolution()) _pprintString_("   saving results" << "\n");
    3737                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum);
    3838                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum);

  • issm/trunk-jpl/src/c/analyses/transient_core.cpp

    r15001 r15099  
    8585                femmodel->parameters->SetParam(step,StepEnum);
    8686
    87                 if(VerboseSolution()) _pprintLine_("iteration " << step << "/" << floor((finaltime-time)/dt)+step << "  time [yr]: " << time/yts << " (time step: " << dt/yts << ")");
     87                if(VerboseSolution()) _pprintString_("iteration " << step << "/" << floor((finaltime-time)/dt)+step << "  time [yr]: " << time/yts << " (time step: " << dt/yts << ")" << "\n");
    8888                if(step%output_frequency==0 || time==finaltime)
    8989                 save_results=true;
    … …  
    9393
    9494                if(isthermal && dim==3){
    95                         if(VerboseSolution()) _pprintLine_("   computing temperatures");
     95                        if(VerboseSolution()) _pprintString_("   computing temperatures" << "\n");
    9696                        #ifdef _HAVE_THERMAL_
    9797                        if(isenthalpy==0){
    … …  
    107107
    108108                if(isdiagnostic){
    109                         if(VerboseSolution()) _pprintLine_("   computing new velocity");
     109                        if(VerboseSolution()) _pprintString_("   computing new velocity" << "\n");
    110110                        #ifdef _HAVE_DIAGNOSTIC_
    111111                        diagnostic_core(femmodel);
    … …  
    116116
    117117                if(isprognostic){
    118                         if(VerboseSolution()) _pprintLine_("   computing new thickness");
     118                        if(VerboseSolution()) _pprintString_("   computing new thickness" << "\n");
    119119                        prognostic_core(femmodel);
    120                         if(VerboseSolution()) _pprintLine_("   updating vertices positions");
     120                        if(VerboseSolution()) _pprintString_("   updating vertices positions" << "\n");
    121121                        femmodel->UpdateVertexPositionsx();
    122122                }
    123123
    124124                if(isgroundingline){
    125                         if(VerboseSolution()) _pprintLine_("   computing new grounding line position");
     125                        if(VerboseSolution()) _pprintString_("   computing new grounding line position" << "\n");
    126126                        #ifdef _HAVE_GROUNDINGLINE_
    127127                        GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    … …  
    131131                }
    132132                if(isgia){
    133                         if(VerboseSolution()) _pprintLine_("   computing glacial isostatic adjustment");
     133                        if(VerboseSolution()) _pprintString_("   computing glacial isostatic adjustment" << "\n");
    134134                        #ifdef _HAVE_GIA_
    135135                        gia_core(femmodel);
    … …  
    142142                /*unload results*/
    143143                if(save_results){
    144                         if(VerboseSolution()) _pprintLine_("   saving transient results");
     144                        if(VerboseSolution()) _pprintString_("   saving transient results" << "\n");
    145145                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum);
    146146                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum);
    … …  
    158158                        }
    159159
    160                         if(VerboseSolution()) _pprintLine_("   saving temporary results");
     160                        if(VerboseSolution()) _pprintString_("   saving temporary results" << "\n");
    161161                        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    162162                }

  • issm/trunk-jpl/src/c/bamg/BamgVertex.cpp

    r15066 r15099  
    1515        void BamgVertex::Echo(void){
    1616
    17                 _printLine_("Vertex:");
    18                 _printLine_("  integer   coordinates i.x: " << i.x << ", i.y: " << i.y);
    19                 _printLine_("  Euclidean coordinates r.x: " << r.x << ", r.y: " << r.y);
    20                 _printLine_("  ReferenceNumber = " << ReferenceNumber);
     17                _printString_("Vertex:" << "\n");
     18                _printString_("  integer   coordinates i.x: " << i.x << ", i.y: " << i.y << "\n");
     19                _printString_("  Euclidean coordinates r.x: " << r.x << ", r.y: " << r.y << "\n");
     20                _printString_("  ReferenceNumber = " << ReferenceNumber << "\n");
    2121                m.Echo();
    2222

  • issm/trunk-jpl/src/c/bamg/Edge.cpp

    r15067 r15099  
    2727        /*FUNCTION Edge::Echo {{{*/
    2828        void Edge::Echo(void){
    29                 _printLine_("Edge:");
    30                 _printLine_("   pointers towards two vertices: " << v[0] << " " << v[1]);
    31                 _printLine_("   ReferenceNumber = " << ReferenceNumber);
    32                 _printLine_("   GeomEdgeHook = " << GeomEdgeHook);
    33                 _printLine_("   two adjacent edges on the same curve: " << adj[0] << " " << adj[1]);
     29                _printString_("Edge:" << "\n");
     30                _printString_("   pointers towards two vertices: " << v[0] << " " << v[1] << "\n");
     31                _printString_("   ReferenceNumber = " << ReferenceNumber << "\n");
     32                _printString_("   GeomEdgeHook = " << GeomEdgeHook << "\n");
     33                _printString_("   two adjacent edges on the same curve: " << adj[0] << " " << adj[1] << "\n");
    3434        }
    3535        /*}}}*/

  • issm/trunk-jpl/src/c/bamg/EigenMetric.cpp

    r15067 r15099  
    114114        void EigenMetric::Echo(void){
    115115
    116                 _printLine_("EigenMetric:");
    117                 _printLine_("   lambda1: " << lambda1);
    118                 _printLine_("   lambda2: " << lambda2);
    119                 _printLine_("   v.x: " << v.x);
    120                 _printLine_("   v.y: " << v.y);
     116                _printString_("EigenMetric:" << "\n");
     117                _printString_("   lambda1: " << lambda1 << "\n");
     118                _printString_("   lambda2: " << lambda2 << "\n");
     119                _printString_("   v.x: " << v.x << "\n");
     120                _printString_("   v.y: " << v.y << "\n");
    121121
    122122                return;

  • issm/trunk-jpl/src/c/bamg/Geometry.cpp

    r15066 r15099  
    8080                //Vertices
    8181                if (bamggeom->Vertices){
    82                         if(verbose>5) _printLine_("      processing Vertices");
     82                        if(verbose>5) _printString_("      processing Vertices" << "\n");
    8383                        if (bamggeom->VerticesSize[1]!=3) _error_("Vertices should have 3 columns");
    8484                        vertices = new GeomVertex[nbv];
    … …  
    125125                        double* verticeslength=NULL;
    126126
    127                         if(verbose>5) _printLine_("      processing Edges");
     127                        if(verbose>5) _printString_("      processing Edges" << "\n");
    128128                        if (bamggeom->EdgesSize[1]!=3) _error_("Edges should have 3 columns");
    129129                        edges = new GeomEdge[nbe];
    … …  
    180180                //hVertices
    181181                if(bamgopts->hVertices && bamgopts->hVerticesSize[0]==nbv){
    182                         if(verbose>5) _printLine_("      processing hVertices");
     182                        if(verbose>5) _printString_("      processing hVertices" << "\n");
    183183                        for (i=0;i< nbv;i++){
    184184                                if (!xIsNan<IssmPDouble>(bamgopts->hVertices[i])){
    … …  
    190190                //MetricVertices
    191191                if(bamgopts->metric && bamgopts->metric[0]==nbv){
    192                         if(verbose>5) _printLine_("      processing MetricVertices");
     192                        if(verbose>5) _printString_("      processing MetricVertices" << "\n");
    193193                        for (i=0;i< nbv;i++) {
    194194                                vertices[i].m = Metric((double)bamgopts->metric[i*3+0],(double)bamgopts->metric[i*3+1],(double)bamgopts->metric[i*3+2]);
    … …  
    198198                //MaxCornerAngle
    199199                if (bamgopts->MaxCornerAngle){
    200                         if(verbose>5) _printLine_("      processing MaxCornerAngle");
     200                        if(verbose>5) _printString_("      processing MaxCornerAngle" << "\n");
    201201                        MaxCornerAngle=bamgopts->MaxCornerAngle*Pi/180;
    202202                }
    … …  
    237237                //RequiredVertices
    238238                if(bamggeom->RequiredVertices){
    239                         if(verbose>5) _printLine_("      processing RequiredVertices");
     239                        if(verbose>5) _printString_("      processing RequiredVertices" << "\n");
    240240                        if (bamggeom->RequiredVerticesSize[1]!=1) _error_("RequiredVertices should have 1 column");
    241241                        n=bamggeom->RequiredVerticesSize[0];
    … …  
    249249                //RequiredEdges
    250250                if(bamggeom->RequiredEdges){
    251                         if(verbose>5) _printLine_("      processing RequiredEdges");
     251                        if(verbose>5) _printString_("      processing RequiredEdges" << "\n");
    252252                        if (bamggeom->RequiredEdgesSize[1]!=1) _error_("RequiredEdges should have 1 column");
    253253                        n=bamggeom->RequiredEdgesSize[0];
    … …  
    261261                //SubDomain
    262262                if(bamggeom->SubDomains){
    263                         if(verbose>5) _printLine_("      processing SubDomains");
     263                        if(verbose>5) _printString_("      processing SubDomains" << "\n");
    264264                        if (bamggeom->SubDomainsSize[1]!=4) _error_("SubDomains should have 4 columns");
    265265                        nbsubdomains=bamggeom->SubDomainsSize[0];
    … …  
    293293
    294294                /*Vertices*/
    295                 if(verbose>5) _printLine_("      writing Vertices");
     295                if(verbose>5) _printString_("      writing Vertices" << "\n");
    296296                bamggeom->VerticesSize[0]=nbv;
    297297                bamggeom->VerticesSize[1]=3;
    … …  
    309309
    310310                /*Edges*/
    311                 if(verbose>5) _printLine_("      writing Edges");
     311                if(verbose>5) _printString_("      writing Edges" << "\n");
    312312                bamggeom->EdgesSize[0]=nbe;
    313313                bamggeom->EdgesSize[1]=3;
    … …  
    327327
    328328                /*RequiredEdges*/
    329                 if(verbose>5) _printLine_("      writing " << nbreq << " RequiredEdges");
     329                if(verbose>5) _printString_("      writing " << nbreq << " RequiredEdges" << "\n");
    330330                bamggeom->RequiredEdgesSize[0]=nbreq;
    331331                bamggeom->RequiredEdgesSize[1]=1;
    … …  
    344344
    345345                /*RequiredVertices*/
    346                 if(verbose>5) _printLine_("      writing " << nbreqv << " RequiredVertices");
     346                if(verbose>5) _printString_("      writing " << nbreqv << " RequiredVertices" << "\n");
    347347                bamggeom->RequiredVerticesSize[0]=nbreqv;
    348348                bamggeom->RequiredVerticesSize[1]=1;
    … …  
    359359
    360360                /*SubDomains*/
    361                 if(verbose>5) _printLine_("      writing SubDomains");
     361                if(verbose>5) _printString_("      writing SubDomains" << "\n");
    362362                bamggeom->SubDomainsSize[0]=nbsubdomains;
    363363                bamggeom->SubDomainsSize[1]=4;
    … …  
    373373
    374374                /*TangentAtEdges*/
    375                 if(verbose>5) _printLine_("      writing TangentAtEdges");
     375                if(verbose>5) _printString_("      writing TangentAtEdges" << "\n");
    376376                bamggeom->TangentAtEdgesSize[0]=nbtan;
    377377                bamggeom->TangentAtEdgesSize[1]=4;
    … …  
    402402        void Geometry::Echo(void){
    403403
    404                 _printLine_("Geometry:");
    405                 _printLine_("   nbv  (number of vertices) : " << nbv);
    406                 _printLine_("   nbe  (number of edges)    : " << nbe);
    407                 _printLine_("   nbsubdomains: " << nbsubdomains);
    408                 _printLine_("   nbcurves: " << nbcurves);
    409                 _printLine_("   vertices: " << vertices);
    410                 _printLine_("   edges: " << edges);
    411                 _printLine_("   quadtree: " << quadtree);
    412                 _printLine_("   subdomains: " << subdomains);
    413                 _printLine_("   curves: " << curves);
    414                 _printLine_("   pmin (x,y): (" << pmin.x << " " << pmin.y << ")");
    415                 _printLine_("   pmax (x,y): (" << pmax.x << " " << pmax.y << ")");
    416                 _printLine_("   coefIcoor: " << coefIcoor);
    417                 _printLine_("   MaxCornerAngle: " << MaxCornerAngle);
     404                _printString_("Geometry:" << "\n");
     405                _printString_("   nbv  (number of vertices) : " << nbv << "\n");
     406                _printString_("   nbe  (number of edges)    : " << nbe << "\n");
     407                _printString_("   nbsubdomains: " << nbsubdomains << "\n");
     408                _printString_("   nbcurves: " << nbcurves << "\n");
     409                _printString_("   vertices: " << vertices << "\n");
     410                _printString_("   edges: " << edges << "\n");
     411                _printString_("   quadtree: " << quadtree << "\n");
     412                _printString_("   subdomains: " << subdomains << "\n");
     413                _printString_("   curves: " << curves << "\n");
     414                _printString_("   pmin (x,y): (" << pmin.x << " " << pmin.y << ")" << "\n");
     415                _printString_("   pmax (x,y): (" << pmax.x << " " << pmax.y << ")" << "\n");
     416                _printString_("   coefIcoor: " << coefIcoor << "\n");
     417                _printString_("   MaxCornerAngle: " << MaxCornerAngle << "\n");
    418418
    419419                return;
    … …  
    524524                        /*if there is a vertex found that is to close to vertices[i] -> error*/
    525525                        if( v && Norme1(v->r - vertices[i].r) < eps ){
    526                                 _printLine_("reference numbers: " << v->ReferenceNumber << " " << vertices[i].ReferenceNumber);
    527                                 _printLine_("Id: " << i+1);
    528                                 _printLine_("Coords: ["<<v->r.x<<" "<<v->r.y<<"] ["<<vertices[i].r.x<<" "<<vertices[i].r.y<<"]");
     526                                _printString_("reference numbers: " << v->ReferenceNumber << " " << vertices[i].ReferenceNumber << "\n");
     527                                _printString_("Id: " << i+1 << "\n");
     528                                _printString_("Coords: ["<<v->r.x<<" "<<v->r.y<<"] ["<<vertices[i].r.x<<" "<<vertices[i].r.y<<"]" << "\n");
    529529
    530530                                delete [] next_p;
    … …  
    869869                        if (bge<=0) {
    870870                                if(NbTry) {
    871                                         _printLine_("Fatal Error: on the class Mesh before call Geometry::ProjectOnCurve");
    872                                         _printLine_("That bug might come from:");
    873                                         _printLine_(" 1)  a mesh edge  containing more than " << mxe/2 << " geometrical edges");
    874                                         _printLine_(" 2)  code bug : be sure that we call   Mesh::SetVertexFieldOn() before");
    875                                         _printLine_("To solve the problem do a coarsening of the geometrical mesh or change the constant value of mxe (dangerous)");
     871                                        _printString_("Fatal Error: on the class Mesh before call Geometry::ProjectOnCurve" << "\n");
     872                                        _printString_("That bug might come from:" << "\n");
     873                                        _printString_(" 1)  a mesh edge  containing more than " << mxe/2 << " geometrical edges" << "\n");
     874                                        _printString_(" 2)  code bug : be sure that we call   Mesh::SetVertexFieldOn() before" << "\n");
     875                                        _printString_("To solve the problem do a coarsening of the geometrical mesh or change the constant value of mxe (dangerous)" << "\n");
    876876                                        _error_("see above");
    877877                                }
    … …  
    886886                while (eg1 != (GeomEdge*) vg1  &&  (*eg1)(direction1) != (GeomVertex*) vg1) {
    887887                        if(tge>=mxe ) {
    888                                 _printLine_("WARNING: on the class Mesh before call Geometry::ProjectOnCurve is having issues (isn't it Eric?)");
     888                                _printString_("WARNING: on the class Mesh before call Geometry::ProjectOnCurve is having issues (isn't it Eric?)" << "\n");
    889889                                NbTry++;
    890890                                if (NbTry<2) goto retry;
    891                                 _printLine_("Fatal Error: on the class Mesh before call Geometry::ProjectOnCurve");
    892                                 _printLine_("That bug might come from:");
    893                                 _printLine_(" 1)  a mesh edge  contening more than " << mxe/2 << " geometrical edges");
    894                                 _printLine_(" 2)  code bug : be sure that we call   Mesh::SetVertexFieldOn() before");
    895                                 _printLine_("To solve the problem do a coarsening of the geometrical mesh or change the constant value of mxe (dangerous)");
     891                                _printString_("Fatal Error: on the class Mesh before call Geometry::ProjectOnCurve" << "\n");
     892                                _printString_("That bug might come from:" << "\n");
     893                                _printString_(" 1)  a mesh edge  contening more than " << mxe/2 << " geometrical edges" << "\n");
     894                                _printString_(" 2)  code bug : be sure that we call   Mesh::SetVertexFieldOn() before" << "\n");
     895                                _printString_("To solve the problem do a coarsening of the geometrical mesh or change the constant value of mxe (dangerous)" << "\n");
    896896                                _error_("see above");
    897897                        }

  • issm/trunk-jpl/src/c/bamg/ListofIntersectionTriangles.cpp

    r15066 r15099  
    169169                        //x.Echo();
    170170                        //y.Echo();
    171                         //_printLine_("cx = " << cx << ", cy=" << cy);
     171                        //_printString_("cx = " << cx << ", cy=" << cy << "\n");
    172172
    173173                        si += sint;
    … …  
    188188                        MaxNbSeg *= 2;
    189189                        if (verbosity>3){
    190                                 _printLine_("   reshape lSegsI from " << mneo << " to " << MaxNbSeg);
     190                                _printString_("   reshape lSegsI from " << mneo << " to " << MaxNbSeg << "\n");
    191191                        }
    192192                        _assert_(lSegsI && NbSeg<MaxNbSeg);
    … …  
    213213                for (int i=0;i<MaxSize;i++) nw[i] = lIntTria[i];       
    214214                long int verbosity=0;
    215                 if(verbosity>3) _printLine_("   ListofIntersectionTriangles  ReShape Maxsize " << MaxSize << " -> " << MaxNbSeg);
     215                if(verbosity>3) _printString_("   ListofIntersectionTriangles  ReShape Maxsize " << MaxSize << " -> " << MaxNbSeg << "\n");
    216216                MaxSize = newsize;
    217217                delete [] lIntTria;// remove old

  • issm/trunk-jpl/src/c/bamg/Mesh.cpp

    r15066 r15099  
    3131                if(bamggeom->Edges==NULL) {
    3232                        /*Recreate geometry if needed*/
    33                         _printLine_("WARNING: mesh present but no geometry found. Reconstructing...");
     33                        _printString_("WARNING: mesh present but no geometry found. Reconstructing..." << "\n");
    3434                        BuildGeometryFromMesh(bamgopts);
    3535                        Gh.PostRead();
    … …  
    103103                          if (kk[i]>=0) kk[i]=k++;
    104104                        }
    105                   _printLine_("   number of vertices " << k << ", remove = " << Tho.nbv - k);
    106                   _printLine_("   number of triangles " << kt << ", remove = " << nbInT-kt);
    107                   _printLine_("   number of New boundary edge " << nbNewBedge);
     105                  _printString_("   number of vertices " << k << ", remove = " << Tho.nbv - k << "\n");
     106                  _printString_("   number of triangles " << kt << ", remove = " << nbInT-kt << "\n");
     107                  _printString_("   number of New boundary edge " << nbNewBedge << "\n");
    108108                  long imaxnbv =k;
    109109                  Init(imaxnbv);
    … …  
    281281
    282282                //Vertices
    283                 if (verbose) _printLine_("Reading vertices (" << nbv << ")");
     283                if (verbose) _printString_("Reading vertices (" << nbv << ")" << "\n");
    284284                vertices=xNew<BamgVertex>(nbv);
    285285                orderedvertices=xNew<BamgVertex*>(nbv);
    … …  
    295295
    296296                //Triangles
    297                 if (verbose) _printLine_("Reading triangles (" << nbt << ")");
     297                if (verbose) _printString_("Reading triangles (" << nbt << ")" << "\n");
    298298                triangles =new Triangle[maxnbt]; //we cannot allocate only nbt triangles since
    299299                nodeflags=xNew<bool>(nbv);
    … …  
    311311
    312312                /*Recreate geometry: */
    313                 if (verbose) _printLine_("Building Geometry");
     313                if (verbose) _printString_("Building Geometry" << "\n");
    314314                BuildGeometryFromMesh();
    315                 if (verbose) _printLine_("Completing geometry");
     315                if (verbose) _printString_("Completing geometry" << "\n");
    316316                Gh.PostRead();
    317317
    … …  
    320320                for(i=0;i<nbv;i++){
    321321                        if(!nodeflags[i]){
    322                                 _printLine_("Vertex " << i+1 << " does not belong to any element");
     322                                _printString_("Vertex " << i+1 << " does not belong to any element" << "\n");
    323323                                isorphan=true;
    324324                        }
    … …  
    347347                //Vertices
    348348                if(bamgmesh->Vertices){
    349                         if(verbose>5) _printLine_("      processing Vertices");
     349                        if(verbose>5) _printString_("      processing Vertices" << "\n");
    350350
    351351                        vertices=xNew<BamgVertex>(nbv);
    … …  
    368368                //Triangles
    369369                if(bamgmesh->Triangles){
    370                         if(verbose>5) _printLine_("      processing Triangles");
     370                        if(verbose>5) _printString_("      processing Triangles" << "\n");
    371371                        triangles =new Triangle[maxnbt]; //we cannot allocate only nbt triangles since
    372372                        //other triangles will be added for each edge
    … …  
    386386                //Quadrilaterals
    387387                if(bamgmesh->Quadrilaterals){
    388                         if(verbose>5) _printLine_("      processing Quadrilaterals");
     388                        if(verbose>5) _printString_("      processing Quadrilaterals" << "\n");
    389389                        long i1,i2,i3,i4;
    390390                        triangles =new Triangle[nbt];
    … …  
    408408                //VerticesOnGeomEdge
    409409                if(bamgmesh->VerticesOnGeomEdge){
    410                         if(verbose>5) _printLine_("      processing VerticesOnGeomEdge");
     410                        if(verbose>5) _printString_("      processing VerticesOnGeomEdge" << "\n");
    411411                        NbVerticesOnGeomEdge=bamgmesh->VerticesOnGeomEdgeSize[0];
    412412                        VerticesOnGeomEdge= new  VertexOnGeom[NbVerticesOnGeomEdge] ;
    … …  
    423423                //VerticesOnGeomVertex
    424424                if(bamgmesh->VerticesOnGeomVertexSize[0]){
    425                         if(verbose>5) _printLine_("      processing VerticesOnGeomVertex");
     425                        if(verbose>5) _printString_("      processing VerticesOnGeomVertex" << "\n");
    426426                        NbVerticesOnGeomVertex=bamgmesh->VerticesOnGeomVertexSize[0];
    427427                        VerticesOnGeomVertex  = new  VertexOnGeom[NbVerticesOnGeomVertex] ;
    … …  
    439439                        double* len=NULL;
    440440
    441                         if(verbose>5) _printLine_("      processing Edges");
     441                        if(verbose>5) _printString_("      processing Edges" << "\n");
    442442                        nbe=bamgmesh->EdgesSize[0];
    443443                        edges= new Edge[nbe];
    … …  
    499499                //EdgeOnGeomEdge
    500500                if(bamgmesh->EdgesOnGeomEdge){
    501                         if(verbose>5) _printLine_("      processing EdgesOnGeomEdge");
     501                        if(verbose>5) _printString_("      processing EdgesOnGeomEdge" << "\n");
    502502                        int i1,i2,i,j;
    503503                        i2=bamgmesh->EdgesOnGeomEdgeSize[0];
    … …  
    516516                if(bamgmesh->SubDomains){
    517517                        long i3,head,direction;
    518                         if(verbose>5) _printLine_("      processing SubDomains");
     518                        if(verbose>5) _printString_("      processing SubDomains" << "\n");
    519519                        nbsubdomains=bamgmesh->SubDomainsSize[0];
    520520                        subdomains = new SubDomain [ nbsubdomains ];
    … …  
    585585
    586586                /*Vertices*/
    587                 if(verbose>5) _printLine_("      writing Vertices");
     587                if(verbose>5) _printString_("      writing Vertices" << "\n");
    588588                bamgmesh->VerticesSize[0]=nbv;
    589589                bamgmesh->VerticesSize[1]=3;
    … …  
    598598
    599599                /*Edges*/
    600                 if(verbose>5) _printLine_("      writing Edges");
     600                if(verbose>5) _printString_("      writing Edges" << "\n");
    601601                bamgmesh->EdgesSize[0]=nbe;
    602602                bamgmesh->EdgesSize[1]=3;
    … …  
    615615
    616616                /*Element edges*/
    617                 if(verbose>5) _printLine_("      writing element edges");
     617                if(verbose>5) _printString_("      writing element edges" << "\n");
    618618                SetOfEdges4* edge4=new SetOfEdges4(nbt*3,nbv);
    619619                double* elemedge=NULL;
    … …  
    671671
    672672                /*IssmSegments*/
    673                 if(verbose>5) _printLine_("      writing IssmSegments");
     673                if(verbose>5) _printString_("      writing IssmSegments" << "\n");
    674674                bamgmesh->IssmSegmentsSize[0]=NumIssmSegments;
    675675                bamgmesh->IssmSegmentsSize[1]=4;
    … …  
    714714
    715715                /*Triangles*/
    716                 if(verbose>5) _printLine_("      writing Triangles");
     716                if(verbose>5) _printString_("      writing Triangles" << "\n");
    717717                k=nbInT-nbq*2;
    718718                num=0;
    … …  
    735735
    736736                /*Quadrilaterals*/
    737                 if(verbose>5) _printLine_("      writing Quadrilaterals");
     737                if(verbose>5) _printString_("      writing Quadrilaterals" << "\n");
    738738                bamgmesh->QuadrilateralsSize[0]=nbq;
    739739                bamgmesh->QuadrilateralsSize[1]=5;
    … …  
    756756
    757757                /*SubDomains*/
    758                 if(verbose>5) _printLine_("      writing SubDomains");
     758                if(verbose>5) _printString_("      writing SubDomains" << "\n");
    759759                bamgmesh->SubDomainsSize[0]=nbsubdomains;
    760760                bamgmesh->SubDomainsSize[1]=4;
    … …  
    770770
    771771                /*SubDomainsFromGeom*/
    772                 if(verbose>5) _printLine_("      writing SubDomainsFromGeom");
     772                if(verbose>5) _printString_("      writing SubDomainsFromGeom" << "\n");
    773773                bamgmesh->SubDomainsFromGeomSize[0]=Gh.nbsubdomains;
    774774                bamgmesh->SubDomainsFromGeomSize[1]=4;
    … …  
    784784
    785785                /*VerticesOnGeomVertex*/
    786                 if(verbose>5) _printLine_("      writing VerticesOnGeomVertex");
     786                if(verbose>5) _printString_("      writing VerticesOnGeomVertex" << "\n");
    787787                bamgmesh->VerticesOnGeomVertexSize[0]=NbVerticesOnGeomVertex;
    788788                bamgmesh->VerticesOnGeomVertexSize[1]=2;
    … …  
    798798
    799799                /*VertexOnGeomEdge*/
    800                 if(verbose>5) _printLine_("      writing VerticesOnGeomEdge");
     800                if(verbose>5) _printString_("      writing VerticesOnGeomEdge" << "\n");
    801801                bamgmesh->VerticesOnGeomEdgeSize[0]=NbVerticesOnGeomEdge;
    802802                bamgmesh->VerticesOnGeomEdgeSize[1]=3;
    … …  
    815815
    816816                /*EdgesOnGeomEdge*/
    817                 if(verbose>5) _printLine_("      writing EdgesOnGeomEdge");
     817                if(verbose>5) _printString_("      writing EdgesOnGeomEdge" << "\n");
    818818                k=0;
    819819                for (i=0;i<nbe;i++){
    … …  
    835835
    836836                /*Element Connectivity*/
    837                 if(verbose>5) _printLine_("      writing Element connectivity");
     837                if(verbose>5) _printString_("      writing Element connectivity" << "\n");
    838838                bamgmesh->ElementConnectivitySize[0]=nbt-nbtout;
    839839                bamgmesh->ElementConnectivitySize[1]=3;
    … …  
    855855
    856856                /*ElementNodal Connectivity*/
    857                 if(verbose>5) _printLine_("      writing Nodal element connectivity");
     857                if(verbose>5) _printString_("      writing Nodal element connectivity" << "\n");
    858858                bamgmesh->NodalElementConnectivitySize[0]=nbv;
    859859                bamgmesh->NodalElementConnectivitySize[1]=connectivitymax_1;
    … …  
    870870
    871871                /*Nodal Connectivity*/
    872                 if(verbose>5) _printLine_("      writing Nodal connectivity");
     872                if(verbose>5) _printString_("      writing Nodal connectivity" << "\n");
    873873                //chaining algorithm (again...)
    874874                int* head_2=NULL;
    … …  
    924924
    925925                /*Cracked vertices*/
    926                 if(verbose>5) _printLine_("      writing Cracked vertices");
     926                if(verbose>5) _printString_("      writing Cracked vertices" << "\n");
    927927                bamgmesh->CrackedVerticesSize[0]=NbCrackedVertices;
    928928                bamgmesh->CrackedVerticesSize[1]=2;
    … …  
    936936
    937937                /*Cracked vertices*/
    938                 if(verbose>5) _printLine_("      writing Cracked vertices");
     938                if(verbose>5) _printString_("      writing Cracked vertices" << "\n");
    939939                bamgmesh->CrackedEdgesSize[0]=NbCrackedEdges;
    940940                bamgmesh->CrackedEdgesSize[1]=4;
    … …  
    964964                int  i,j;
    965965
    966                 if(bamgopts->verbose>3) _printLine_("      processing metric");
     966                if(bamgopts->verbose>3) _printString_("      processing metric" << "\n");
    967967                double hmin = Max(bamgopts->hmin,MinimalHmin());
    968968                double hmax = Min(bamgopts->hmax,MaximalHmax());
    … …  
    12651265
    12661266                //display info
    1267                 if (verbose > 1)  _printLine_("   BoundAnisotropy by " << anisomax);
     1267                if (verbose > 1)  _printString_("   BoundAnisotropy by " << anisomax << "\n");
    12681268
    12691269                double h1=1.e30,h2=1e-30;
    … …  
    12921292                //display info
    12931293                if (verbose>2){
    1294                         _printLine_("      input:  Hmin = " << pow(h2,-0.5)  << ", Hmax = " << pow(h1,-0.5) << ", factor of anisotropy max  = " << pow(rx,0.5));
    1295                         _printLine_("      output: Hmin = " << pow(hn2,-0.5) << ", Hmax = " << pow(hn1,-0.5)<< ", factor of anisotropy max  = " <<pow(rnx,0.5));
     1294                        _printString_("      input:  Hmin = " << pow(h2,-0.5)  << ", Hmax = " << pow(h1,-0.5) << ", factor of anisotropy max  = " << pow(rx,0.5) << "\n");
     1295                        _printString_("      output: Hmin = " << pow(hn2,-0.5) << ", Hmax = " << pow(hn1,-0.5)<< ", factor of anisotropy max  = " <<pow(rnx,0.5) << "\n");
    12961296                }
    12971297        }
    … …  
    13151315
    13161316                //display info
    1317                 if (verbose>1) _printLine_("   construction of the geometry from the 2d mesh");
     1317                if (verbose>1) _printString_("   construction of the geometry from the 2d mesh" << "\n");
    13181318
    13191319                //check that the mesh is not empty
    … …  
    13751375                                //else (see 3 lines above), the edge has been called more than twice: return error
    13761376                                else {
    1377                                         _printLine_("The edge (" << GetId(triangles[i][VerticesOfTriangularEdge[j][0]]) << "," << GetId(triangles[i][VerticesOfTriangularEdge[j][1]]) << ") belongs to more than 2 triangles (" << k << ")");
    1378                                         _printLine_("Edge " << j << " of triangle " << i);
    1379                                         _printLine_("Edge " << (-st[k]+2)%3 << " of triangle " << (-st[k]+2)/3);
    1380                                         _printLine_("Edge " << triangles[(-st[k]+2)/3].NuEdgeTriangleAdj((int)((-st[k]+2)%3)) << " of triangle " << GetId(triangles[(-st[k]+2)/3].TriangleAdj((int)((-st[k]+2)%3))));
     1377                                        _printString_("The edge (" << GetId(triangles[i][VerticesOfTriangularEdge[j][0]]) << "," << GetId(triangles[i][VerticesOfTriangularEdge[j][1]]) << ") belongs to more than 2 triangles (" << k << ")" << "\n");
     1378                                        _printString_("Edge " << j << " of triangle " << i << "\n");
     1379                                        _printString_("Edge " << (-st[k]+2)%3 << " of triangle " << (-st[k]+2)/3 << "\n");
     1380                                        _printString_("Edge " << triangles[(-st[k]+2)/3].NuEdgeTriangleAdj((int)((-st[k]+2)%3)) << " of triangle " << GetId(triangles[(-st[k]+2)/3].TriangleAdj((int)((-st[k]+2)%3))) << "\n");
    13811381                                        _error_("An edge belongs to more than 2 triangles");
    13821382                                }       
    … …  
    13901390                //display info
    13911391                if(verbose>5) {
    1392                         _printLine_("         info on Mesh:");
    1393                         _printLine_("            - number of vertices    = " << nbv);
    1394                         _printLine_("            - number of triangles   = " << nbt);
    1395                         _printLine_("            - number of given edges = " << nbe);
    1396                         _printLine_("            - number of all edges   = " << nbedges);
    1397                         _printLine_("            - Euler number 1 - nb of holes = " << nbt-nbedges+nbv);
     1392                        _printString_("         info on Mesh:" << "\n");
     1393                        _printString_("            - number of vertices    = " << nbv << "\n");
     1394                        _printString_("            - number of triangles   = " << nbt << "\n");
     1395                        _printString_("            - number of given edges = " << nbe << "\n");
     1396                        _printString_("            - number of all edges   = " << nbedges << "\n");
     1397                        _printString_("            - Euler number 1 - nb of holes = " << nbt-nbedges+nbv << "\n");
    13981398                }
    13991399
    … …  
    14261426
    14271427                        //display info
    1428                         if(verbose>4) _printLine_("   Construction of the edges " << nbe);
     1428                        if(verbose>4) _printString_("   Construction of the edges " << nbe << "\n");
    14291429
    14301430                        for (i=0;i<nbedges;i++){
    … …  
    14521452                                                edges[add].ReferenceNumber=edgessave[i].ReferenceNumber;                     
    14531453                                                edges[add].GeomEdgeHook=edgessave[i].GeomEdgeHook; //  HACK to get required edges
    1454                                                 _printLine_("oh no...");
     1454                                                _printString_("oh no..." << "\n");
    14551455                                        }
    14561456                                        else
    … …  
    15671567                        }
    15681568                }
    1569                 if (verbose> 3) _printLine_("      The Number of sub domain = " << nbsubdomains);
     1569                if (verbose> 3) _printString_("      The Number of sub domain = " << nbsubdomains << "\n");
    15701570
    15711571                //build subdomains
    … …  
    16191619                Gh.nbsubdomains = nbsubdomains;
    16201620                Gh.subdomains = new GeomSubDomain[nbsubdomains];
    1621                 if (verbose>3) _printLine_("   number of vertices = " << Gh.nbv << "\n   number of edges = " << Gh.nbe);
     1621                if (verbose>3) _printString_("   number of vertices = " << Gh.nbv << "\n   number of edges = " << Gh.nbe << "\n");
    16221622                NbVerticesOnGeomVertex = Gh.nbv;
    16231623                VerticesOnGeomVertex = new VertexOnGeom[NbVerticesOnGeomVertex];
    … …  
    17911791                //display infos
    17921792                if(verbose>1) {
    1793                         _printLine_("   Construction of Metric: number of field: " << nbsol << " (nbt=" << nbt << ", nbv=" << nbv << ")");
     1793                        _printString_("   Construction of Metric: number of field: " << nbsol << " (nbt=" << nbt << ", nbv=" << nbv << ")" << "\n");
    17941794                }
    17951795
    … …  
    18631863
    18641864                        //display info
    1865                         if(verbose>2) _printLine_("      Solution " << nusol << ", Min = " << smin << ", Max = " << smax << ", Delta = " << sdelta);
     1865                        if(verbose>2) _printString_("      Solution " << nusol << ", Min = " << smin << ", Max = " << smax << ", Delta = " << sdelta << "\n");
    18661866
    18671867                        //skip constant field
    18681868                        if (sdelta < 1.0e-10*Max(absmax,1e-20)){
    1869                                 _printLine_("      Solution " << nusol << " is constant, skipping...");
     1869                                _printString_("      Solution " << nusol << " is constant, skipping..." << "\n");
    18701870                                continue;
    18711871                        }
    … …  
    19931993                //display infos
    19941994                if(verbose>1) {
    1995                         _printLine_("   Construction of Metric: number of field: " << nbsol << " (nbt=" << nbt << ", nbv=" << nbv << ")");
     1995                        _printString_("   Construction of Metric: number of field: " << nbsol << " (nbt=" << nbt << ", nbv=" << nbv << ")" << "\n");
    19961996                }
    19971997
    … …  
    20762076
    20772077                        //display info
    2078                         if(verbose>2) _printLine_("      Solution " << nusol << ", Min = " << smin << ", Max = " << smax << ", Delta = " << sdelta << ", number of fields = " << nbsol);
     2078                        if(verbose>2) _printString_("      Solution " << nusol << ", Min = " << smin << ", Max = " << smax << ", Delta = " << sdelta << ", number of fields = " << nbsol << "\n");
    20792079
    20802080                        //skip constant field
    20812081                        if (sdelta < 1.0e-10*Max(absmax,1e-20) ){
    2082                                 if (verbose>2) _printLine_("      Solution " << nusol << " is constant, skipping...");
     2082                                if (verbose>2) _printString_("      Solution " << nusol << " is constant, skipping..." << "\n");
    20832083                                continue;
    20842084                        }
    … …  
    22652265                //Return if no edge is cracked
    22662266                if(k==0) return;
    2267                 if (verbose>4) _printLine_("      number of Cracked Edges = " << k);
     2267                if (verbose>4) _printString_("      number of Cracked Edges = " << k << "\n");
    22682268
    22692269                //Initialize Cracked edge
    … …  
    23062306
    23072307                //Add new vertices
    2308                 if (verbose>4) _printLine_("      number of Cracked Vertices = " << NbCrackedVertices);
     2308                if (verbose>4) _printString_("      number of Cracked Vertices = " << NbCrackedVertices << "\n");
    23092309                if (NbCrackedVertices){
    23102310                        CrackedVertices=xNew<long>(2*NbCrackedVertices);
    … …  
    23752375                                        }
    23762376                                }
    2377                                 //_printLine_(element_renu[GetId(ta.t)] << " -> " << GetId((*ta.t)[0])+1 << " " << GetId((*ta.t)[1])+1 << " " << GetId((*ta.t)[2])+1 << ", edge [" << i1 << "->" << j1 << " " << i2 << "->" << j2 << "]");
     2377                                //_printString_(element_renu[GetId(ta.t)] << " -> " << GetId((*ta.t)[0])+1 << " " << GetId((*ta.t)[1])+1 << " " << GetId((*ta.t)[2])+1 << ", edge [" << i1 << "->" << j1 << " " << i2 << "->" << j2 << "]" << "\n");
    23782378                                ta = Next(ta).Adj();
    23792379                                if (count++>50) _error_("Maximum number of iteration exceeded");
    … …  
    23992399                int i;
    24002400
    2401                 _printLine_("Mesh Echo:");
    2402                 _printLine_("   nbv = " << nbv);
    2403                 _printLine_("   nbt = " << nbt);
    2404                 _printLine_("   nbe = " << nbe);
    2405                 _printLine_("   nbq = " << nbq);
    2406                 _printLine_("   index:");
     2401                _printString_("Mesh Echo:" << "\n");
     2402                _printString_("   nbv = " << nbv << "\n");
     2403                _printString_("   nbt = " << nbt << "\n");
     2404                _printString_("   nbe = " << nbe << "\n");
     2405                _printString_("   nbq = " << nbq << "\n");
     2406                _printString_("   index:" << "\n");
    24072407                for (i=0;i<nbt;i++){
    2408                         _printLine_("   " << setw(4) << i+1 << ": ["
     2408                        _printString_("   " << setw(4) << i+1 << ": ["
    24092409                                                << setw(4) << (((BamgVertex *)triangles[i](0))?GetId(triangles[i][0])+1:0) << " "
    24102410                                                << setw(4) << (((BamgVertex *)triangles[i](0))?GetId(triangles[i][1])+1:0) << " "
    24112411                                                << setw(4) << (((BamgVertex *)triangles[i](0))?GetId(triangles[i][2])+1:0) << "]");
    24122412                }
    2413                 _printLine_("   coordinates:");
     2413                _printString_("   coordinates:" << "\n");
    24142414                for (i=0;i<nbv;i++){
    2415                         _printLine_("   " << setw(4) << i+1 << ": [" << vertices[i].r.x << " " << vertices[i].r.y << "]");
     2415                        _printString_("   " << setw(4) << i+1 << ": [" << vertices[i].r.x << " " << vertices[i].r.y << "]" << "\n");
    24162416                }
    24172417
    … …  
    24272427
    24282428                        //display
    2429                         if (verbose > 2) _printLine_("   ForceBoundary  nb of edge: " << nbe);
     2429                        if (verbose > 2) _printString_("   ForceBoundary  nb of edge: " << nbe << "\n");
    24302430
    24312431                        //check that there is no triangle with 0 determinant
    … …  
    24582458                                Nbswap +=  vertices[j].Optim(1,0);
    24592459                        }
    2460                         if (verbose > 3) _printLine_("      number of inforced edge = " << nbfe << ", number of swap= " << Nbswap);
     2460                        if (verbose > 3) _printString_("      number of inforced edge = " << nbfe << ", number of swap= " << Nbswap << "\n");
    24612461                }
    24622462        /*}}}*/
    … …  
    24682468
    24692469                if (verbose >2){
    2470                         if (OutSide) _printLine_("   Find all external sub-domain");
    2471                         else _printLine_("   Find all internal sub-domain");
     2470                        if (OutSide) _printString_("   Find all external sub-domain" << "\n");
     2471                        else _printString_("   Find all internal sub-domain" << "\n");
    24722472                  }
    24732473                short * HeapArete = new short[nbt];
    … …  
    26132613                                                                 }//while (t)
    26142614                                                                }
    2615                                                         if(verbose>4) _printLine_("      Number of removes subdomains (OutSideMesh) = " << nbsubdomains-j);
     2615                                                        if(verbose>4) _printString_("      Number of removes subdomains (OutSideMesh) = " << nbsubdomains-j << "\n");
    26162616                                                        nbsubdomains=j;
    26172617                                                  }
    … …  
    26922692
    26932693                                if (inew < nbsubdomains) {
    2694                                         if (verbose>5) _printLine_("WARNING: " << nbsubdomains-inew << " SubDomains are being removed");
     2694                                        if (verbose>5) _printString_("WARNING: " << nbsubdomains-inew << " SubDomains are being removed" << "\n");
    26952695                                        nbsubdomains=inew;}
    26962696
    … …  
    27992799
    28002800                //Display info
    2801                 if (verbose>2) _printLine_("   Insert initial " << nbv << " vertices");
     2801                if (verbose>2) _printString_("   Insert initial " << nbv << " vertices" << "\n");
    28022802
    28032803                //Compute integer coordinates for the existing vertices
    … …  
    28902890                /*Now, add the vertices One by One*/
    28912891                long NbSwap=0;
    2892                 if (verbose>3) _printLine_("   Begining of insertion process...");
     2892                if (verbose>3) _printString_("   Begining of insertion process..." << "\n");
    28932893
    28942894                for (int icount=2; icount<nbv; icount++) {
    … …  
    29132913                //Display info
    29142914                if (verbose>3) {
    2915                         _printLine_("      NbSwap of insertion: " << NbSwap);
    2916                         _printLine_("      NbSwap/nbv:          " << NbSwap/nbv);
     2915                        _printString_("      NbSwap of insertion: " << NbSwap << "\n");
     2916                        _printString_("      NbSwap/nbv:          " << NbSwap/nbv << "\n");
    29172917                }
    29182918
    … …  
    29282928                         NbSwap += orderedvertices[is1]->Optim(0,0);
    29292929                        if (verbose>3) {
    2930                                 _printLine_("      Optim Loop: " << Nbloop);
    2931                                 _printLine_("      NbSwap/nbv:          " << NbSwap/nbv);
     2930                                _printString_("      Optim Loop: " << Nbloop << "\n");
     2931                                _printString_("      NbSwap/nbv:          " << NbSwap/nbv << "\n");
    29322932                        }
    29332933                        if(!NbSwap) break;
    … …  
    29522952
    29532953                //display info if required
    2954                 if (verbose>5) _printLine_("      Try to Insert " << nbvnew << " new points");
     2954                if (verbose>5) _printString_("      Try to Insert " << nbvnew << " new points" << "\n");
    29552955
    29562956                //return if no new points
    … …  
    30023002                }
    30033003                if (verbose>3) {
    3004                         _printLine_("         number of new points: " << iv);
    3005                         _printLine_("         number of to close (?) points: " << nbv-iv);
    3006                         _printLine_("         number of swap after: " << NbSwap);
     3004                        _printString_("         number of new points: " << iv << "\n");
     3005                        _printString_("         number of to close (?) points: " << nbv-iv << "\n");
     3006                        _printString_("         number of swap after: " << NbSwap << "\n");
    30073007                }
    30083008                nbv = iv;
    30093009
    30103010                for (i=nbvold;i<nbv;i++) NbSwap += vertices[i].Optim(1); 
    3011                 if (verbose>3) _printLine_("   NbSwap=" << NbSwap);
     3011                if (verbose>3) _printString_("   NbSwap=" << NbSwap << "\n");
    30123012
    30133013                NbTSwap +=  NbSwap ;
    … …  
    30553055                        if (!e[i]){
    30563056                                kk++;
    3057                                 if(kk<10) _printLine_("BUG: the geometrical edge " << i << " is on no edge curve");
     3057                                if(kk<10) _printString_("BUG: the geometrical edge " << i << " is on no edge curve" << "\n");
    30583058                        }
    30593059                }
    … …  
    30693069                long int verbose=0;
    30703070
    3071                 if (verbose>2) _printLine_("MakeQuadrangles costheta = " << costheta);
     3071                if (verbose>2) _printString_("MakeQuadrangles costheta = " << costheta << "\n");
    30723072
    30733073                if (costheta >1) {
    3074                         if (verbose>5) _printLine_("   do nothing: costheta > 1");
     3074                        if (verbose>5) _printString_("   do nothing: costheta > 1" << "\n");
    30753075                }
    30763076
    … …  
    30983098                        nbq = kk;
    30993099                        if (verbose>2){
    3100                                 _printLine_("   number of quadrilaterals    = " << nbq);
    3101                                 _printLine_("   number of triangles         = " << nbt-nbtout- nbq*2);
    3102                                 _printLine_("   number of outside triangles = " << nbtout);
     3100                                _printString_("   number of quadrilaterals    = " << nbq << "\n");
     3101                                _printString_("   number of triangles         = " << nbt-nbtout- nbq*2 << "\n");
     3102                                _printString_("   number of outside triangles = " << nbtout << "\n");
    31033103                        }
    31043104                        delete [] qq;
    … …  
    31263126
    31273127                const  double maxsubdiv2 = maxsubdiv*maxsubdiv;
    3128                 if(verbose>1) _printLine_("   Limit the subdivision of a edges in the new mesh by " << maxsubdiv);
     3128                if(verbose>1) _printString_("   Limit the subdivision of a edges in the new mesh by " << maxsubdiv << "\n");
    31293129                // for all the edges
    31303130                // if the len of the edge is to long
    … …  
    31693169                }
    31703170                if(verbose>3){
    3171                         _printLine_("      number of metric changes = " << nbchange << ", maximum number of subdivision of a edges before change = " << pow(lmax,0.5));
     3171                        _printString_("      number of metric changes = " << nbchange << ", maximum number of subdivision of a edges before change = " << pow(lmax,0.5) << "\n");
    31723172                }
    31733173        }
    … …  
    32233223                /*First, insert old points if requested*/
    32243224                if (KeepVertices && (&Bh != this) && (nbv+Bh.nbv< maxnbv)){
    3225                         if (verbose>5) _printLine_("         Inserting initial mesh points");
     3225                        if (verbose>5) _printString_("         Inserting initial mesh points" << "\n");
    32263226                        for (i=0;i<Bh.nbv;i++){
    32273227                                BamgVertex &bv=Bh[i];
    … …  
    32423242                // Big loop (most time consuming)
    32433243                int iter=0;
    3244                 if (verbose>5) _printLine_("         Big loop");
     3244                if (verbose>5) _printString_("         Big loop" << "\n");
    32453245                do {
    32463246                        /*Update variables*/
    … …  
    34733473        // find extrema coordinates of vertices pmin,pmax
    34743474        long i;
    3475         if(verbose>2) _printLine_("      Reconstruct mesh of " << nbv << " vertices");
     3475        if(verbose>2) _printString_("      Reconstruct mesh of " << nbv << " vertices" << "\n");
    34763476
    34773477        //initialize orderedvertices
    … …  
    35303530        //Display info if required
    35313531        if(verbose>5) {
    3532                 _printLine_("         info of Mesh:");
    3533                 _printLine_("            - number of vertices    = " << nbv << " ");
    3534                 _printLine_("            - number of triangles   = " << nbt << " ");
    3535                 _printLine_("            - number of given edges = " << nbe << " ");
    3536                 _printLine_("            - number of all edges   = " << edge4->nb());
    3537                 _printLine_("            - Euler number 1 - nb of holes = " << nbt-edge4->nb()+nbv);
     3532                _printString_("         info of Mesh:" << "\n");
     3533                _printString_("            - number of vertices    = " << nbv << " " << "\n");
     3534                _printString_("            - number of triangles   = " << nbt << " " << "\n");
     3535                _printString_("            - number of given edges = " << nbe << " " << "\n");
     3536                _printString_("            - number of all edges   = " << edge4->nb() << "\n");
     3537                _printString_("            - Euler number 1 - nb of holes = " << nbt-edge4->nb()+nbv << "\n");
    35383538        }
    35393539
    … …  
    35523552                                if (k<10) {
    35533553                                        //print only 10 edges
    3554                                         _printLine_("Lost boundary edges " << i << " : " << edge4->i(i) << " " << edge4->j(i));
     3554                                        _printString_("Lost boundary edges " << i << " : " << edge4->i(i) << " " << edge4->j(i) << "\n");
    35553555                                }
    35563556                                else if (k==10){
    3557                                         _printLine_("Other lost boundary edges not shown...");
     3557                                        _printString_("Other lost boundary edges not shown..." << "\n");
    35583558                                }
    35593559                        }
    … …  
    37433743                                        /*Check that the 2 vertices are on geometry AND required*/
    37443744                                        if(!edges[i][j].GeomEdgeHook->IsRequiredVertex()){
    3745                                                 _printLine_("ReconstructExistingMesh error message: problem with the edge number " << i+1 << ": [" << GetId(edges[i][0])+1 << " " << GetId(edges[i][1])+1 << "]");
    3746                                                 _printLine_("This edge is on geometrical edge number " << Gh.GetId(edges[i].GeomEdgeHook)+1);
     3745                                                _printString_("ReconstructExistingMesh error message: problem with the edge number " << i+1 << ": [" << GetId(edges[i][0])+1 << " " << GetId(edges[i][1])+1 << "]" << "\n");
     3746                                                _printString_("This edge is on geometrical edge number " << Gh.GetId(edges[i].GeomEdgeHook)+1 << "\n");
    37473747                                                if (edges[i][j].GeomEdgeHook->OnGeomVertex())
    3748                                                  _printLine_("the vertex number " << GetId(edges[i][j])+1 << " of this edge is a geometric BamgVertex number " << Gh.GetId(edges[i][j].GeomEdgeHook->gv)+1);
     3748                                                 _printString_("the vertex number " << GetId(edges[i][j])+1 << " of this edge is a geometric BamgVertex number " << Gh.GetId(edges[i][j].GeomEdgeHook->gv)+1 << "\n");
    37493749                                                else if (edges[i][j].GeomEdgeHook->OnGeomEdge())
    3750                                                  _printLine_("the vertex number " << GetId(edges[i][j])+1 << " of this edge is a geometric Edge number " << Gh.GetId(edges[i][j].GeomEdgeHook->ge)+1);
     3750                                                 _printString_("the vertex number " << GetId(edges[i][j])+1 << " of this edge is a geometric Edge number " << Gh.GetId(edges[i][j].GeomEdgeHook->ge)+1 << "\n");
    37513751                                                else
    3752                                                  _printLine_("Its pointer is " << edges[i][j].GeomEdgeHook);
    3753 
    3754                                                 _printLine_("This edge is on geometry and has no adjacent edge (open curve) and one of the tip is not required");
     3752                                                 _printString_("Its pointer is " << edges[i][j].GeomEdgeHook << "\n");
     3753
     3754                                                _printString_("This edge is on geometry and has no adjacent edge (open curve) and one of the tip is not required" << "\n");
    37553755                                                _error_("See above (might be cryptic...)");
    37563756                                        }
    … …  
    38403840                long it,ie,i;
    38413841
    3842                 _printLine_("renumbering triangles");
     3842                _printString_("renumbering triangles" << "\n");
    38433843                for ( it=0;it<nbt;it++)
    38443844                 triangles[it].Renumbering(vertices,ve,renu);
    38453845
    3846                 _printLine_("renumbering edges");
     3846                _printString_("renumbering edges" << "\n");
    38473847                for ( ie=0;ie<nbe;ie++)
    38483848                 edges[ie].Renumbering(vertices,ve,renu);
    38493849
    3850                 _printLine_("renumbering vertices on geom");
     3850                _printString_("renumbering vertices on geom" << "\n");
    38513851                for (i=0;i< NbVerticesOnGeomVertex;i++)
    38523852                  {
    … …  
    38563856                  }
    38573857
    3858                 _printLine_("renumbering vertices on edge");
     3858                _printString_("renumbering vertices on edge" << "\n");
    38593859                for (i=0;i< NbVerticesOnGeomEdge;i++)
    38603860                  {
    … …  
    38643864                  }
    38653865
    3866                 _printLine_("renumbering vertices on Bth vertex");
     3866                _printString_("renumbering vertices on Bth vertex" << "\n");
    38673867                for (i=0;i< NbVertexOnBThVertex;i++)
    38683868                  {
    … …  
    39543954                                number_of_errors++;
    39553955                                if (number_of_errors<20){
    3956                                         _printLine_("Area of Triangle " << i+1 << " < 0 (det=" << triangles[i].det << ")");
     3956                                        _printString_("Area of Triangle " << i+1 << " < 0 (det=" << triangles[i].det << ")" << "\n");
    39573957                                }
    39583958                        }
    … …  
    40224022        gammamn=sqrt(gammamn);
    40234023        gammamx=sqrt(gammamx);   
    4024         _printLine_("   Adaptmesh info:");
    4025         _printLine_("      number of triangles = " << nt);
    4026         _printLine_("      hmin = " << hmin << ", hmax=" << hmax);
    4027         _printLine_("      area = " << area << ", M area = " << Marea << ", M area/( |Khat| nt) = " <<  Marea/(aireKh*nt));
    4028         _printLine_("      infinite-regularity(?): min = " << gammamn << ", max = " << gammamx);
    4029         _printLine_("      anisomax = " << pow(alpha2,0.5) << ", beta max = " << 1./pow(beta/aireKh,0.5) << ", min = " << 1./pow(beta0/aireKh,0.5));
     4024        _printString_("   Adaptmesh info:" << "\n");
     4025        _printString_("      number of triangles = " << nt << "\n");
     4026        _printString_("      hmin = " << hmin << ", hmax=" << hmax << "\n");
     4027        _printString_("      area = " << area << ", M area = " << Marea << ", M area/( |Khat| nt) = " <<  Marea/(aireKh*nt) << "\n");
     4028        _printString_("      infinite-regularity(?): min = " << gammamn << ", max = " << gammamx << "\n");
     4029        _printString_("      anisomax = " << pow(alpha2,0.5) << ", beta max = " << 1./pow(beta/aireKh,0.5) << ", min = " << 1./pow(beta0/aireKh,0.5) << "\n");
    40304030}
    40314031/*}}}*/
    … …  
    40614061                        }
    40624062                } 
    4063         _printLine_(" --- Histogram of the unit mesh,  nb of edges = " << nbedges);
    4064         _printLine_("      length of edge in   | %% of edge  | Nb of edges ");
    4065         _printLine_("      --------------------+-------------+-------------");
     4063        _printString_(" --- Histogram of the unit mesh,  nb of edges = " << nbedges << "\n");
     4064        _printString_("      length of edge in   | %% of edge  | Nb of edges " << "\n");
     4065        _printString_("      --------------------+-------------+-------------" << "\n");
    40664066        for   (i=0;i<=kmax;i++){
    40674067                if (i==0) _printString_( "      " << setw(10) << 0.);
    … …  
    40694069                if (i==kmax) _printString_("          +inf   ");
    40704070                else      _printString_( "      " << setw(10) << exp(lmin+(i+1)/delta));
    4071                 _printLine_("|  " << setw(10) << (long((10000. * histo[i])/ nbedges)/100.) << " |");
    4072                 _printLine_("  " << histo[i]);
    4073         }
    4074         _printLine_("      --------------------+-------------+-------------");
     4071                _printString_("|  " << setw(10) << (long((10000. * histo[i])/ nbedges)/100.) << " |" << "\n");
     4072                _printString_("  " << histo[i] << "\n");
     4073        }
     4074        _printString_("      --------------------+-------------+-------------" << "\n");
    40754075}
    40764076/*}}}*/
    … …  
    40984098        for ( k=0;k<NbVerticesOnGeomEdge;k++ )
    40994099         tstart[ GetId(VerticesOnGeomEdge[k].meshvertex)]=&vide;
    4100         if(verbose>2) _printLine_("   SmoothingVertex: nb Iteration = " << nbiter << ", Omega=" << omega);
     4100        if(verbose>2) _printString_("   SmoothingVertex: nb Iteration = " << nbiter << ", Omega=" << omega << "\n");
    41014101        for (k=0;k<nbiter;k++)
    41024102          {
    … …  
    41104110                  if (tstart[i] != &vide) // not a boundary vertex
    41114111                        NbSwap += vertices[i].Optim(1);
    4112                 if (verbose>3) _printLine_("      move max = " << pow(delta,0.5) << ", iteration = " << k << ", nb of swap = " << NbSwap);
     4112                if (verbose>3) _printString_("      move max = " << pow(delta,0.5) << ", iteration = " << k << ", nb of swap = " << NbSwap << "\n");
    41134113          }
    41144114
    … …  
    41244124
    41254125        if(raisonmax<1.1) return;
    4126         if(verbose > 1) _printLine_("   Mesh::SmoothMetric raisonmax = " << raisonmax);
     4126        if(verbose > 1) _printString_("   Mesh::SmoothMetric raisonmax = " << raisonmax << "\n");
    41274127        CreateSingleVertexToTriangleConnectivity();
    41284128        long i,j,kch,kk,ip;
    … …  
    41904190                Exchange(first_np_or_next_t0,first_np_or_next_t1);
    41914191        }
    4192         if(verbose>2) _printLine_("      number of iterations = " << kch);
     4192        if(verbose>2) _printString_("      number of iterations = " << kch << "\n");
    41934193        delete [] first_np_or_next_t0;
    41944194        delete [] first_np_or_next_t1;
    … …  
    43784378                                                                                ||   (bb=Area2( t[0].r , A.r    , t[2].r )) < 0.0 
    43794379                                                                                ||   (cc=Area2( t[0].r , t[1].r , A.r    )) < 0.0)){
    4380                                                         _printLine_(ke + nbvold << " not in triangle " << i << " In= " << !!t.link << " " << aa << " " << bb << " " << cc << " " << dd);
     4380                                                        _printString_(ke + nbvold << " not in triangle " << i << " In= " << !!t.link << " " << aa << " " << bb << " " << cc << " " << dd << "\n");
    43814381                                                        _error_("Number of triangles with P2 interpolation Problem");
    43824382                                                }
    … …  
    43864386                                                                                ||   (bb=Area2( tt[0].r , A.r     , tt[2].r )) < 0
    43874387                                                                                ||   (cc=Area2( tt[0].r , tt[1].r , A.r     )) < 0)){
    4388                                                         _printLine_(ke + nbvold << " not in triangle " << ii << " In= " << !!tt.link << " " << aa << " " << bb << " " << cc << " " << dd);
     4388                                                        _printString_(ke + nbvold << " not in triangle " << ii << " In= " << !!tt.link << " " << aa << " " << bb << " " << cc << " " << dd << "\n");
    43894389                                                        _error_("Number of triangles with P2 interpolation Problem");
    43904390                                                }
    … …  
    46794679
    46804680                if (verbose>2){
    4681                         _printLine_("   number of quadrilaterals    = " << nbq);
    4682                         _printLine_("   number of triangles         = " << nbt-nbtout- nbq*2);
    4683                         _printLine_("   number of outside triangles = " << nbtout);
     4681                        _printString_("   number of quadrilaterals    = " << nbq << "\n");
     4682                        _printString_("   number of triangles         = " << nbt-nbtout- nbq*2 << "\n");
     4683                        _printString_("   number of outside triangles = " << nbtout << "\n");
    46844684                }
    46854685
    … …  
    47484748                        Triangle *tcvi = TriangleFindFromCoord(vi.i,det3);
    47494749                        if (tcvi && !tcvi->link) {
    4750                                 _printLine_("problem inserting point in SplitInternalEdgeWithBorderVertices (tcvj && !tcvj->link)");
     4750                                _printString_("problem inserting point in SplitInternalEdgeWithBorderVertices (tcvj && !tcvj->link)" << "\n");
    47514751                        }
    47524752
    … …  
    47604760                }
    47614761                if (verbose>3) {
    4762                         _printLine_("   number of points: " << iv);
    4763                         _printLine_("   number of swap to  split internal edges with border vertices: " << NbSwap);
     4762                        _printString_("   number of points: " << iv << "\n");
     4763                        _printString_("   number of swap to  split internal edges with border vertices: " << NbSwap << "\n");
    47644764                        nbv = iv;
    47654765                }
    47664766        }
    4767         if (NbSplitEdge>nbv-nbvold) _printLine_("WARNING: not enough vertices  to split all internal edges, we lost " << NbSplitEdge - ( nbv-nbvold) << " edges...");
    4768         if (verbose>2) _printLine_("SplitInternalEdgeWithBorderVertices: Number of splited edge " << NbSplitEdge);
     4767        if (NbSplitEdge>nbv-nbvold) _printString_("WARNING: not enough vertices  to split all internal edges, we lost " << NbSplitEdge - ( nbv-nbvold) << " edges..." << "\n");
     4768        if (verbose>2) _printString_("SplitInternalEdgeWithBorderVertices: Number of splited edge " << NbSplitEdge << "\n");
    47694769
    47704770        return  NbSplitEdge;
    … …  
    49364936
    49374937        //Vertices
    4938         if(verbose) _printLine_("Reading vertices (" << nbv << ")");
     4938        if(verbose) _printString_("Reading vertices (" << nbv << ")" << "\n");
    49394939        for (i=0;i<nbv;i++){
    49404940                vertices[i].r.x=x[i];
    … …  
    52485248
    52495249                //Insert points inside existing triangles
    5250                 if (verbose>4) _printLine_("      -- current number of vertices = " << nbv);
    5251                 if (verbose>3) _printLine_("      Creating initial Constrained Delaunay Triangulation...");
    5252                 if (verbose>3) _printLine_("         Inserting boundary points");
     5250                if (verbose>4) _printString_("      -- current number of vertices = " << nbv << "\n");
     5251                if (verbose>3) _printString_("      Creating initial Constrained Delaunay Triangulation..." << "\n");
     5252                if (verbose>3) _printString_("         Inserting boundary points" << "\n");
    52535253                Insert();
    52545254
    52555255                //Force the boundary
    5256                 if (verbose>3) _printLine_("         Forcing boundaries");
     5256                if (verbose>3) _printString_("         Forcing boundaries" << "\n");
    52575257                ForceBoundary();
    52585258
    52595259                //Extract SubDomains
    5260                 if (verbose>3) _printLine_("         Extracting subdomains");
     5260                if (verbose>3) _printString_("         Extracting subdomains" << "\n");
    52615261                FindSubDomain();
    52625262
    5263                 if (verbose>3) _printLine_("      Inserting internal points");
     5263                if (verbose>3) _printString_("      Inserting internal points" << "\n");
    52645264                NewPoints(*this,bamgopts,0) ;
    5265                 if (verbose>4) _printLine_("      -- current number of vertices = " << nbv);
     5265                if (verbose>4) _printString_("      -- current number of vertices = " << nbv << "\n");
    52665266        }
    52675267        /*}}}*/
    … …  
    53665366                                        int nc=ei.GeomEdgeHook->CurveNumber;
    53675367
    5368                                         //_printLine_("Dealing with curve number " << nc);
    5369                                         //_printLine_("edge on geometry is same as GhCurve? " << (ei.GeomEdgeHook==Gh.curves[nc].FirstEdge || ei.GeomEdgeHook==Gh.curves[nc].LastEdge)?"yes":"no");
     5368                                        //_printString_("Dealing with curve number " << nc << "\n");
     5369                                        //_printString_("edge on geometry is same as GhCurve? " << (ei.GeomEdgeHook==Gh.curves[nc].FirstEdge || ei.GeomEdgeHook==Gh.curves[nc].LastEdge)?"yes":"no" << "\n");
    53705370                                        //if(ei.GeomEdgeHook==Gh.curves[nc].FirstEdge || ei.GeomEdgeHook==Gh.curves[nc].LastEdge){
    5371                                         //      _printLine_("Do we have the right extremity? curve first vertex -> " << ((GeomVertex *)*ei[je].GeomEdgeHook==&(*Gh.curves[nc].FirstEdge)[Gh.curves[nc].FirstVertexIndex])?"yes":"no");
    5372                                         //      _printLine_("Do we have the right extremity? curve last  vertex -> " << ((GeomVertex *)*ei[je].GeomEdgeHook==&(*Gh.curves[nc].LastEdge)[Gh.curves[nc].LastVertexIndex])?"yes":"no");
     5371                                        //      _printString_("Do we have the right extremity? curve first vertex -> " << ((GeomVertex *)*ei[je].GeomEdgeHook==&(*Gh.curves[nc].FirstEdge)[Gh.curves[nc].FirstVertexIndex])?"yes":"no" << "\n");
     5372                                        //      _printString_("Do we have the right extremity? curve last  vertex -> " << ((GeomVertex *)*ei[je].GeomEdgeHook==&(*Gh.curves[nc].LastEdge)[Gh.curves[nc].LastVertexIndex])?"yes":"no" << "\n");
    53735373                                        //}
    53745374                                        //BUG FIX from original bamg
    … …  
    55775577
    55785578                //Insert points inside existing triangles
    5579                 if (verbose>4) _printLine_("      -- current number of vertices = " << nbv);
    5580                 if (verbose>3) _printLine_("      Creating initial Constrained Delaunay Triangulation...");
    5581                 if (verbose>3) _printLine_("         Inserting boundary points");
     5579                if (verbose>4) _printString_("      -- current number of vertices = " << nbv << "\n");
     5580                if (verbose>3) _printString_("      Creating initial Constrained Delaunay Triangulation..." << "\n");
     5581                if (verbose>3) _printString_("         Inserting boundary points" << "\n");
    55825582                Insert();
    55835583
    55845584                //Force the boundary
    5585                 if (verbose>3) _printLine_("         Forcing boundaries");
     5585                if (verbose>3) _printString_("         Forcing boundaries" << "\n");
    55865586                ForceBoundary();
    55875587
    55885588                //Extract SubDomains
    5589                 if (verbose>3) _printLine_("         Extracting subdomains");
     5589                if (verbose>3) _printString_("         Extracting subdomains" << "\n");
    55905590                FindSubDomain();
    55915591
    5592                 if (verbose>3) _printLine_("      Inserting internal points");
     5592                if (verbose>3) _printString_("      Inserting internal points" << "\n");
    55935593                NewPoints(BTh,bamgopts,KeepVertices) ;
    5594                 if (verbose>4) _printLine_("      -- current number of vertices = " << nbv);
     5594                if (verbose>4) _printString_("      -- current number of vertices = " << nbv << "\n");
    55955595        }
    55965596        /*}}}*/

  • issm/trunk-jpl/src/c/bamg/Metric.cpp

    r15067 r15099  
    7171        void Metric::Echo(void){
    7272
    73                 _printLine_("Metric:");
    74                 _printLine_("   [a11 a21 a22]: [" << a11 << " " << a21 << " " << a22 << "]");
     73                _printString_("Metric:" << "\n");
     74                _printString_("   [a11 a21 a22]: [" << a11 << " " << a21 << " " << a22 << "]" << "\n");
    7575
    7676                return;
    … …  
    200200                LastMetricInterpole.lab=l;
    201201                LastMetricInterpole.opt=i;
    202                 if (i>200 && kkk++<10) _printLine_("WARNING: LengthInterpole: ( i=" << i << " l=" << l << " sss=" << sss << " ) " << sstop);
     202                if (i>200 && kkk++<10) _printString_("WARNING: LengthInterpole: ( i=" << i << " l=" << l << " sss=" << sss << " ) " << sstop << "\n");
    203203                return l;
    204204        }

  • issm/trunk-jpl/src/c/bamg/Triangle.cpp

    r15066 r15099  
    109109                int i;
    110110
    111                 _printLine_("Triangle:");
    112                 _printLine_("   vertices pointer towards three vertices");
    113                 _printLine_("      vertices[0] vertices[1] vertices[2] = " << vertices[0] << " " << vertices[1] << " " << vertices[2]);
    114                 _printLine_("   adj pointer towards three adjacent triangles");
    115                 _printLine_("      adj[0] adj[1] adj[2] = " << adj[0] << " " << adj[1] << " " << adj[2]);
    116                 _printLine_("   det (integer triangle determinant) = " << det);
     111                _printString_("Triangle:" << "\n");
     112                _printString_("   vertices pointer towards three vertices" << "\n");
     113                _printString_("      vertices[0] vertices[1] vertices[2] = " << vertices[0] << " " << vertices[1] << " " << vertices[2] << "\n");
     114                _printString_("   adj pointer towards three adjacent triangles" << "\n");
     115                _printString_("      adj[0] adj[1] adj[2] = " << adj[0] << " " << adj[1] << " " << adj[2] << "\n");
     116                _printString_("   det (integer triangle determinant) = " << det << "\n");
    117117                if (link){
    118                         _printLine_("   link (pointer toward duplicate triangle)= " << link);
     118                        _printString_("   link (pointer toward duplicate triangle)= " << link << "\n");
    119119                }
    120120                else{
    121                         _printLine_("   color = " << color);
    122                 }
    123 
    124                 _printLine_("\nThree vertices:");
     121                        _printString_("   color = " << color << "\n");
     122                }
     123
     124                _printString_("\nThree vertices:" << "\n");
    125125                for(i=0;i<3;i++){
    126126                        if (vertices[i]){
    … …  
    128128                        }
    129129                        else{
    130                                 _printLine_("   vertex " << i+1 << " does not exist");
     130                                _printString_("   vertex " << i+1 << " does not exist" << "\n");
    131131                        }
    132132                }

  • issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp

    r15012 r15099  
    4242void SpcDynamic::Echo(void){
    4343
    44         _printLine_("SpcDynamic:");
    45         _printLine_("   sid: " << sid);
    46         _printLine_("   nodeid: " << nodeid);
    47         _printLine_("   dof: " << dof);
    48         _printLine_("   value: " << value);
    49         _printLine_("   isset: " <<(isset?"true":"false"));
    50         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     44        _printString_("SpcDynamic:" << "\n");
     45        _printString_("   sid: " << sid << "\n");
     46        _printString_("   nodeid: " << nodeid << "\n");
     47        _printString_("   dof: " << dof << "\n");
     48        _printString_("   value: " << value << "\n");
     49        _printString_("   isset: " <<(isset?"true":"false") << "\n");
     50        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    5151        return;
    5252}

  • issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp

    r15012 r15099  
    4141void SpcStatic::Echo(void){
    4242
    43         _printLine_("SpcStatic:");
    44         _printLine_("   sid: " << sid);
    45         _printLine_("   nodeid: " << nodeid);
    46         _printLine_("   dof: " << dof);
    47         _printLine_("   value: " << value);
    48         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     43        _printString_("SpcStatic:" << "\n");
     44        _printString_("   sid: " << sid << "\n");
     45        _printString_("   nodeid: " << nodeid << "\n");
     46        _printString_("   dof: " << dof << "\n");
     47        _printString_("   value: " << value << "\n");
     48        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    4949        return;
    5050}
    … …  
    5353void SpcStatic::DeepEcho(void){
    5454
    55         _printLine_("SpcStatic:");
    56         _printLine_("   sid: " << sid);
    57         _printLine_("   nodeid: " << nodeid);
    58         _printLine_("   dof: " << dof);
    59         _printLine_("   value: " << value);
    60         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     55        _printString_("SpcStatic:" << "\n");
     56        _printString_("   sid: " << sid << "\n");
     57        _printString_("   nodeid: " << nodeid << "\n");
     58        _printString_("   dof: " << dof << "\n");
     59        _printString_("   value: " << value << "\n");
     60        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    6161        return;
    6262}               

  • issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp

    r15012 r15099  
    5656
    5757        int i;
    58         _printLine_("SpcTransient:");
    59         _printLine_("   sid: " << sid);
    60         _printLine_("   nodeid: " << nodeid);
    61         _printLine_("   dof: " << dof);
    62         _printLine_("   nsteps: " << nsteps);
    63         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
    64         _printLine_("   steps|times|values");
     58        _printString_("SpcTransient:" << "\n");
     59        _printString_("   sid: " << sid << "\n");
     60        _printString_("   nodeid: " << nodeid << "\n");
     61        _printString_("   dof: " << dof << "\n");
     62        _printString_("   nsteps: " << nsteps << "\n");
     63        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
     64        _printString_("   steps|times|values" << "\n");
    6565        for(i=0;i<nsteps;i++){
    66                 _printLine_(i << "-" << times[i] << ":" << values[i]);
     66                _printString_(i << "-" << times[i] << ":" << values[i] << "\n");
    6767        }
    6868        return;

  • issm/trunk-jpl/src/c/classes/Contour.h

    r15067 r15099  
    5757                /*FUNCTION Echo(){{{*/
    5858                void Echo(void){
    59                         _printLine_(" Contour: " << id);
    60                         _printLine_("    nods: " << nods);
    61                         _printLine_("  closed: " << (closed?"true":"false"));
     59                        _printString_(" Contour: " << id << "\n");
     60                        _printString_("    nods: " << nods << "\n");
     61                        _printString_("  closed: " << (closed?"true":"false") << "\n");
    6262                        if(nods){
    63                                 _printLine_("   x , y:");
     63                                _printString_("   x , y:" << "\n");
    6464                                for(int i=0;i<nods;i++){
    65                                         _printLine_(i << ": " << x[i] << " | " << y[i]);
     65                                        _printString_(i << ": " << x[i] << " | " << y[i] << "\n");
    6666                                }
    6767                        }

  • issm/trunk-jpl/src/c/classes/DependentObject.cpp

    r15012 r15099  
    4040void DependentObject::Echo(void){
    4141
    42         _printLine_("DependentObject:");
    43         _printLine_("   name: " << EnumToStringx(this->name));
     42        _printString_("DependentObject:" << "\n");
     43        _printString_("   name: " << EnumToStringx(this->name) << "\n");
    4444        if(this->type==0)
    45                 _printLine_("   type: scalar");
     45                _printString_("   type: scalar" << "\n");
    4646        else if(this->type==1)
    47                 _printLine_("   type: vertex");
     47                _printString_("   type: vertex" << "\n");
    4848        else
    4949                _error_(" unknown type: " << this->type);
    50         if(this->index>=0) _printLine_("   index: " << this->index);
     50        if(this->index>=0) _printString_("   index: " << this->index << "\n");
    5151}
    5252/*}}}*/

  • issm/trunk-jpl/src/c/classes/DofIndexing.cpp

    r14960 r15099  
    163163void DofIndexing::Echo(void){
    164164
    165         _printLine_("DofIndexing:");
    166         _printLine_("   gsize: " << gsize);
    167         _printLine_("   clone: " << clone);
     165        _printString_("DofIndexing:" << "\n");
     166        _printString_("   gsize: " << gsize << "\n");
     167        _printString_("   clone: " << clone << "\n");
    168168}
    169169/*}}}*/
    … …  
    173173        int i;
    174174
    175         _printLine_("DofIndexing:");
    176         _printLine_("   gsize: " << gsize);
    177         _printLine_("   fsize: " << fsize);
    178         _printLine_("   ssize: " << ssize);
    179         _printLine_("   clone: " << clone);
    180 
    181         _printLine_("   set membership: f,s sets ");
     175        _printString_("DofIndexing:" << "\n");
     176        _printString_("   gsize: " << gsize << "\n");
     177        _printString_("   fsize: " << fsize << "\n");
     178        _printString_("   ssize: " << ssize << "\n");
     179        _printString_("   clone: " << clone << "\n");
     180
     181        _printString_("   set membership: f,s sets " << "\n");
    182182        for(i=0;i<gsize;i++){
    183                 _printLine_("      dof " << i << ": " <<(f_set[i]?"true":"false")<< " " <<(s_set[i]?"true":"false"));
     183                _printString_("      dof " << i << ": " <<(f_set[i]?"true":"false")<< " " <<(s_set[i]?"true":"false") << "\n");
    184184        }
    185185
    … …  
    188188                if(this->s_set[i])_printString_(" " << svalues[i] << " |");
    189189        }
    190         _printLine_("");
     190        _printString_("" << "\n");
    191191
    192192        if(doftype){
    … …  
    195195                        _printString_(" " << doftype[i] << " |");
    196196                }
    197                 _printLine_("");
    198         }
    199         else _printLine_("   doftype: NULL");
     197                _printString_("" << "\n");
     198        }
     199        else _printString_("   doftype: NULL" << "\n");
    200200
    201201        _printString_("   g_doflist (" << this->gsize << "): |");
    … …  
    203203                _printString_(" " << gdoflist[i] << " |");
    204204        }
    205         _printLine_("");
     205        _printString_("" << "\n");
    206206
    207207        _printString_("   f_doflist (" << this->fsize << "): |");
    … …  
    209209                _printString_(" " << fdoflist[i] << " |");
    210210        }
    211         _printLine_("");
     211        _printString_("" << "\n");
    212212
    213213        _printString_("   s_doflist (" << this->ssize << "): |");
    … …  
    215215                _printString_(" " << sdoflist[i] << " |");
    216216        }
    217         _printLine_("");
     217        _printString_("" << "\n");
    218218}               
    219219/*}}}*/

  • issm/trunk-jpl/src/c/classes/ElementResults/BoolElementResult.cpp

    r15012 r15099  
    4242void BoolElementResult::DeepEcho(void){
    4343
    44         _printLine_("BoolElementResult:");
    45         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    46         _printLine_("   value: "<<(this->value?"true":"false"));
    47         _printLine_("   step: " << this->step);
    48         _printLine_("   time: " << this->time);
     44        _printString_("BoolElementResult:" << "\n");
     45        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     46        _printString_("   value: "<<(this->value?"true":"false") << "\n");
     47        _printString_("   step: " << this->step << "\n");
     48        _printString_("   time: " << this->time << "\n");
    4949}
    5050/*}}}*/

  • issm/trunk-jpl/src/c/classes/ElementResults/DoubleElementResult.cpp

    r15012 r15099  
    4242void DoubleElementResult::DeepEcho(void){
    4343
    44         _printLine_("DoubleElementResult:");
    45         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    46         _printLine_("   value: " << this->value);
    47         _printLine_("   step: " << this->step);
    48         _printLine_("   time: " << this->time);
     44        _printString_("DoubleElementResult:" << "\n");
     45        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     46        _printString_("   value: " << this->value << "\n");
     47        _printString_("   step: " << this->step << "\n");
     48        _printString_("   time: " << this->time << "\n");
    4949}
    5050/*}}}*/

  • issm/trunk-jpl/src/c/classes/ElementResults/PentaP1ElementResult.cpp

    r15012 r15099  
    4444void PentaP1ElementResult::DeepEcho(void){
    4545
    46         _printLine_("PentaP1ElementResult:");
    47         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    48         _printLine_("   values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << " " << this->values[3] << " " << this->values[4] << " " << this->values[5] << "]");
    49         _printLine_("   step: " << this->step);
    50         _printLine_("   time: " << this->time);
     46        _printString_("PentaP1ElementResult:" << "\n");
     47        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     48        _printString_("   values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << " " << this->values[3] << " " << this->values[4] << " " << this->values[5] << "]" << "\n");
     49        _printString_("   step: " << this->step << "\n");
     50        _printString_("   time: " << this->time << "\n");
    5151
    5252}

  • issm/trunk-jpl/src/c/classes/ElementResults/TriaP1ElementResult.cpp

    r15012 r15099  
    4444void TriaP1ElementResult::DeepEcho(void){
    4545
    46         _printLine_("TriaP1ElementResult:");
    47         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    48         _printLine_("   values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << "]");
    49         _printLine_("   step: " << this->step);
    50         _printLine_("   time: " << this->time);
     46        _printString_("TriaP1ElementResult:" << "\n");
     47        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     48        _printString_("   values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << "]" << "\n");
     49        _printString_("   step: " << this->step << "\n");
     50        _printString_("   time: " << this->time << "\n");
    5151}
    5252/*}}}*/

  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r15082 r15099  
    668668void Penta::DeepEcho(void){
    669669
    670         _printLine_("Penta:");
    671         _printLine_("   id: " << id);
     670        _printString_("Penta:" << "\n");
     671        _printString_("   id: " << id << "\n");
    672672        nodes[0]->DeepEcho();
    673673        nodes[1]->DeepEcho();
    … …  
    678678        material->DeepEcho();
    679679        matpar->DeepEcho();
    680         _printLine_("   neighbor ids: " << verticalneighbors[0]->Id() << "-" << verticalneighbors[1]->Id());
    681         _printLine_("   parameters");
     680        _printString_("   neighbor ids: " << verticalneighbors[0]->Id() << "-" << verticalneighbors[1]->Id() << "\n");
     681        _printString_("   parameters" << "\n");
    682682        parameters->DeepEcho();
    683         _printLine_("   inputs");
     683        _printString_("   inputs" << "\n");
    684684        inputs->DeepEcho();
    685         _printLine_("   results");
     685        _printString_("   results" << "\n");
    686686        results->DeepEcho();
    687         _printLine_("neighboor sids: ");
    688         _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]);
     687        _printString_("neighboor sids: " << "\n");
     688        _printString_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2] << "\n");
    689689}
    690690/*}}}*/
    … …  
    13351335        }
    13361336        else{
    1337                 _printLine_("Interpolation " << EnumToStringx(interp) << " not supported");
     1337                _printString_("Interpolation " << EnumToStringx(interp) << " not supported" << "\n");
    13381338        }
    13391339}
    … …  
    45604560                /*Check solution*/
    45614561                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
    4562                 //if(values[i]<0)      _printLine_("temperature < 0°K found in solution vector");
    4563                 //if(values[i]>275)    _printLine_("temperature > 275°K found in solution vector (Paterson's rheology associated is negative)");
     4562                //if(values[i]<0)      _printString_("temperature < 0°K found in solution vector" << "\n");
     4563                //if(values[i]>275)    _printString_("temperature > 275°K found in solution vector (Paterson's rheology associated is negative)" << "\n");
    45644564        }
    45654565

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r15082 r15099  
    935935void Tria::DeepEcho(void){
    936936
    937         _printLine_("Tria:");
    938         _printLine_("   id: " << id);
     937        _printString_("Tria:" << "\n");
     938        _printString_("   id: " << id << "\n");
    939939        if(nodes){
    940940                nodes[0]->DeepEcho();
    … …  
    942942                nodes[2]->DeepEcho();
    943943        }
    944         else _printLine_("nodes = NULL");
     944        else _printString_("nodes = NULL" << "\n");
    945945
    946946        if (material) material->DeepEcho();
    947         else _printLine_("material = NULL");
     947        else _printString_("material = NULL" << "\n");
    948948
    949949        if (matpar) matpar->DeepEcho();
    950         else _printLine_("matpar = NULL");
    951 
    952         _printLine_("   parameters");
     950        else _printString_("matpar = NULL" << "\n");
     951
     952        _printString_("   parameters" << "\n");
    953953        if (parameters) parameters->DeepEcho();
    954         else _printLine_("parameters = NULL");
    955 
    956         _printLine_("   inputs");
     954        else _printString_("parameters = NULL" << "\n");
     955
     956        _printString_("   inputs" << "\n");
    957957        if (inputs) inputs->DeepEcho();
    958         else _printLine_("inputs=NULL");
     958        else _printString_("inputs=NULL" << "\n");
    959959
    960960        if (results) results->DeepEcho();
    961         else _printLine_("results=NULL");
    962 
    963         _printLine_("neighboor sids: ");
    964         _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]);
     961        else _printString_("results=NULL" << "\n");
     962
     963        _printString_("neighboor sids: " << "\n");
     964        _printString_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2] << "\n");
    965965
    966966        return;
    … …  
    10471047/*FUNCTION Tria::Echo{{{*/
    10481048void Tria::Echo(void){
    1049         _printLine_("Tria:");
    1050         _printLine_("   id: " << id);
     1049        _printString_("Tria:" << "\n");
     1050        _printString_("   id: " << id << "\n");
    10511051        if(nodes){
    10521052                nodes[0]->Echo();
    … …  
    10541054                nodes[2]->Echo();
    10551055        }
    1056         else _printLine_("nodes = NULL");
     1056        else _printString_("nodes = NULL" << "\n");
    10571057
    10581058        if (material) material->Echo();
    1059         else _printLine_("material = NULL");
     1059        else _printString_("material = NULL" << "\n");
    10601060
    10611061        if (matpar) matpar->Echo();
    1062         else _printLine_("matpar = NULL");
    1063 
    1064         _printLine_("   parameters");
     1062        else _printString_("matpar = NULL" << "\n");
     1063
     1064        _printString_("   parameters" << "\n");
    10651065        if (parameters) parameters->Echo();
    1066         else _printLine_("parameters = NULL");
    1067 
    1068         _printLine_("   inputs");
     1066        else _printString_("parameters = NULL" << "\n");
     1067
     1068        _printString_("   inputs" << "\n");
    10691069        if (inputs) inputs->Echo();
    1070         else _printLine_("inputs=NULL");
     1070        else _printString_("inputs=NULL" << "\n");
    10711071
    10721072        if (results) results->Echo();
    1073         else _printLine_("results=NULL");
    1074 
    1075         _printLine_("neighboor sids: ");
    1076         _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]);
     1073        else _printString_("results=NULL" << "\n");
     1074
     1075        _printString_("neighboor sids: " << "\n");
     1076        _printString_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2] << "\n");
    10771077}
    10781078/*}}}*/
    … …  
    15591559        }
    15601560        else{
    1561                 _printLine_("Interpolation " << EnumToStringx(interp) << " not supported");
     1561                _printString_("Interpolation " << EnumToStringx(interp) << " not supported" << "\n");
    15621562        }
    15631563}

  • issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

    r15012 r15099  
    3333                /*Diverse: must be in front, as it is used in what follows*/
    3434                void GenericEcho(void){/*{{{*/
    35                         _printLine_("   id: " << this->id);
    36                         _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    37                         _printLine_("   step: " << this->step);
    38                         _printLine_("   time: " << this->time);
     35                        _printString_("   id: " << this->id << "\n");
     36                        _printString_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     37                        _printString_("   step: " << this->step << "\n");
     38                        _printString_("   time: " << this->time << "\n");
    3939                }
    4040                /*}}}*/
    … …  
    143143template <> inline void GenericExternalResult<bool>::DeepEcho(void){ /*{{{*/
    144144
    145         _printLine_("GenericExternalResult<bool>:");
    146         this->GenericEcho();
    147         _printLine_("   value: " <<(this->value?"true":"false"));
     145        _printString_("GenericExternalResult<bool>:" << "\n");
     146        this->GenericEcho();
     147        _printString_("   value: " <<(this->value?"true":"false") << "\n");
    148148
    149149} /*}}}*/
    … …  
    155155template <> inline void GenericExternalResult<int>::DeepEcho(void){ /*{{{*/
    156156
    157         _printLine_("GenericExternalResult<int>:");
    158         this->GenericEcho();
    159         _printLine_("   value: " << this->value);
     157        _printString_("GenericExternalResult<int>:" << "\n");
     158        this->GenericEcho();
     159        _printString_("   value: " << this->value << "\n");
    160160
    161161} /*}}}*/
    … …  
    167167template <> inline void GenericExternalResult<double>::DeepEcho(void){ /*{{{*/
    168168
    169         _printLine_("GenericExternalResult<double>:");
    170         this->GenericEcho();
    171         _printLine_("   value: " << this->value);
     169        _printString_("GenericExternalResult<double>:" << "\n");
     170        this->GenericEcho();
     171        _printString_("   value: " << this->value << "\n");
    172172
    173173} /*}}}*/
    … …  
    192192template <> inline void GenericExternalResult<char*>::DeepEcho(void){ /*{{{*/
    193193
    194         _printLine_("GenericExternalResult<char*>:");
    195         this->GenericEcho();
    196         _printLine_("   value: " << this->value);
     194        _printString_("GenericExternalResult<char*>:" << "\n");
     195        this->GenericEcho();
     196        _printString_("   value: " << this->value << "\n");
    197197
    198198} /*}}}*/
    … …  
    252252template <> inline void GenericExternalResult<IssmPDouble*>::Echo(void){ /*{{{*/
    253253
    254         _printLine_("GenericExternalResult<IssmPDouble*>:");
    255         this->GenericEcho();
    256         _printLine_("   matrix size: " << this->M << "-" << this->N);
     254        _printString_("GenericExternalResult<IssmPDouble*>:" << "\n");
     255        this->GenericEcho();
     256        _printString_("   matrix size: " << this->M << "-" << this->N << "\n");
    257257
    258258} /*}}}*/
    … …  
    261261        int i,j;
    262262
    263         _printLine_("GenericExternalResult<IssmPDouble*>:");
    264         this->GenericEcho();
    265 
    266         _printLine_("   matrix size: " << this->M << "-" << this->N);
     263        _printString_("GenericExternalResult<IssmPDouble*>:" << "\n");
     264        this->GenericEcho();
     265
     266        _printString_("   matrix size: " << this->M << "-" << this->N << "\n");
    267267        for (i=0;i<this->M;i++){ 
    268268                _printString_("   [ ");
    … …  
    270270                        _printString_( " " << setw(11) << setprecision (5) << this->value[i*this->N+j]);
    271271                } 
    272                 _printLine_(" ]");
     272                _printString_(" ]" << "\n");
    273273        } 
    274274

  • issm/trunk-jpl/src/c/classes/FemModel.cpp

    r15075 r15099  
    118118        this->parameters->FindParam(&lockfilename,LockFileNameEnum);
    119119        if (waitonlock>0){
    120                 _pprintLine_("write lock file:");
     120                _pprintString_("write lock file:" << "\n");
    121121                WriteLockFile(lockfilename);
    122122        }
    … …  
    137137        /*Before we delete the profiler, report statistics for this run: */
    138138        profiler->Tag(Finish);  //final tagging
    139         _pprintLine_("");
    140         _pprintLine_("   "<<setw(40)<<left<<"FemModel initialization elapsed time:"<<profiler->DeltaTime(StartInit,FinishInit));
    141         _pprintLine_("   "<<setw(40)<<left<<"Core solution elapsed time:"<<profiler->DeltaTime(StartCore,FinishCore));
    142         _pprintLine_("");
    143         _pprintLine_("   Total elapsed time:"
     139        _pprintString_("" << "\n");
     140        _pprintString_("   "<<setw(40)<<left<<"FemModel initialization elapsed time:"<<profiler->DeltaTime(StartInit,FinishInit) << "\n");
     141        _pprintString_("   "<<setw(40)<<left<<"Core solution elapsed time:"<<profiler->DeltaTime(StartCore,FinishCore) << "\n");
     142        _pprintString_("" << "\n");
     143        _pprintString_("   Total elapsed time:"
    144144                        <<profiler->DeltaTimeModHour(Start,Finish)<<" hrs "
    145145                        <<profiler->DeltaTimeModMin(Start,Finish)<<" min "
    146146                        <<profiler->DeltaTimeModSec(Start,Finish)<<" sec"
    147147                        );
    148         _pprintLine_("");
     148        _pprintString_("" << "\n");
    149149
    150150        /*Now delete: */
    … …  
    153153        /*Finalize PETSC for this model: */
    154154        #ifdef _HAVE_PETSC_
    155         _pprintLine_("closing Petsc");
     155        _pprintString_("closing Petsc" << "\n");
    156156        PetscFinalize();
    157157        #endif
    … …  
    164164void FemModel::Echo(void){
    165165
    166         _printLine_("FemModel echo: ");
    167         _printLine_("   number of fem models: " << nummodels);
    168         _printLine_("   analysis_type_list: ");
    169         for(int i=0;i<nummodels;i++)_printLine_("     " << i << ": " << EnumToStringx(analysis_type_list[i]));
    170         _printLine_("   current analysis_type: ");
    171         _printLine_("     " << analysis_counter << ": " << EnumToStringx(analysis_type_list[analysis_counter]));
     166        _printString_("FemModel echo: " << "\n");
     167        _printString_("   number of fem models: " << nummodels << "\n");
     168        _printString_("   analysis_type_list: " << "\n");
     169        for(int i=0;i<nummodels;i++)_printString_("     " << i << ": " << EnumToStringx(analysis_type_list[i]) << "\n");
     170        _printString_("   current analysis_type: " << "\n");
     171        _printString_("     " << analysis_counter << ": " << EnumToStringx(analysis_type_list[analysis_counter]) << "\n");
    172172
    173173}
    … …  
    208208        for(i=0;i<nummodels;i++){
    209209
    210                 if(VerboseMProcessor()) _pprintLine_("   Processing finite element model of analysis " << EnumToStringx(analysis_type_list[i]) << ":");
     210                if(VerboseMProcessor()) _pprintString_("   Processing finite element model of analysis " << EnumToStringx(analysis_type_list[i]) << ":" << "\n");
    211211                analysis_type=analysis_type_list[i];
    212212                this->SetCurrentConfiguration(analysis_type);
    213213
    214214                if(i==0){
    215                         if(VerboseMProcessor()) _pprintLine_("      creating vertex degrees of freedom");
     215                        if(VerboseMProcessor()) _pprintString_("      creating vertex degrees of freedom" << "\n");
    216216                        VerticesDofx(vertices,parameters); //only call once, we only have one set of vertices
    217217                }
    218218
    219                 if(VerboseMProcessor()) _pprintLine_("      resolving node constraints");
     219                if(VerboseMProcessor()) _pprintString_("      resolving node constraints" << "\n");
    220220                SpcNodesx(nodes,constraints,parameters,analysis_type);
    221221
    222                 if(VerboseMProcessor()) _pprintLine_("      creating nodal degrees of freedom");
     222                if(VerboseMProcessor()) _pprintString_("      creating nodal degrees of freedom" << "\n");
    223223                NodesDofx(nodes,parameters,analysis_type);
    224224
    225                 if(VerboseMProcessor()) _pprintLine_("      configuring element and loads");
     225                if(VerboseMProcessor()) _pprintString_("      configuring element and loads" << "\n");
    226226                ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters);
    227227        }
    … …  
    247247void FemModel::OutputResults(void){
    248248
    249         _pprintLine_("write results to disk:");
     249        _pprintString_("write results to disk:" << "\n");
    250250
    251251        /*Just call the OutputResultsx module: */
    … …  
    294294        if(this->parameters->Exist(ToolkitsOptionsStringsEnum)){
    295295                ToolkitsOptionsFromAnalysis(this->parameters,analysis_type);
    296                 if(VerboseSolver()) _pprintLine_("      toolkits Options set for analysis type: " << EnumToStringx(analysis_type));
     296                if(VerboseSolver()) _pprintString_("      toolkits Options set for analysis type: " << EnumToStringx(analysis_type) << "\n");
    297297        }
    298298
    … …  
    317317        void (*solutioncore)(FemModel*)=NULL; //core solution function pointer
    318318
    319         _pprintLine_("call computational core:");
     319        _pprintString_("call computational core:" << "\n");
    320320
    321321        /*Retrieve solution_type from parameters: */
    … …  
    343343                solution_memory=profiler->Memory(FinishCore);
    344344
    345                 _pprintLine_("Solution elapsed time  : " << solution_time << "  Seconds");
    346                 _pprintLine_("Solution elapsed flops : " << solution_flops << "  Flops");
    347                 _pprintLine_("Solution memory used   : " << solution_memory << "  Bytes");
     345                _pprintString_("Solution elapsed time  : " << solution_time << "  Seconds" << "\n");
     346                _pprintString_("Solution elapsed flops : " << solution_flops << "  Flops" << "\n");
     347                _pprintString_("Solution memory used   : " << solution_memory << "  Bytes" << "\n");
    348348
    349349                /*Add to results: */
    … …  
    676676
    677677        /*start module: */
    678         if(VerboseModule()) _pprintLine_("   Updating constraints for time: " << time);
     678        if(VerboseModule()) _pprintString_("   Updating constraints for time: " << time << "\n");
    679679
    680680        /*First, update dof constraints in nodes, using constraints: */
    … …  
    829829
    830830        /*Display message*/
    831         if(VerboseModule()) _pprintLine_("   Generating matrices");
     831        if(VerboseModule()) _pprintString_("   Generating matrices" << "\n");
    832832
    833833        /*retrive parameters: */
    … …  
    15511551                for(i=0;i<d_numresponses-1;i++)_printString_(d_responses[i] << "|");
    15521552                _printString_(d_responses[d_numresponses-1]);
    1553                 _printLine_("");
     1553                _printString_("" << "\n");
    15541554        }
    15551555        /*}}}*/

  • issm/trunk-jpl/src/c/classes/Hook.cpp

    r14996 r15099  
    6666        int i;
    6767        if (num){
    68                 _printLine_("   Hook: ");
    69                 _printLine_("      num=" << this->num);
     68                _printString_("   Hook: " << "\n");
     69                _printString_("      num=" << this->num << "\n");
    7070                _printString_("      ids: ");
    7171                for (i=0;i<this->num;i++) _printString_(this->ids[i] << " ");
    72                 _printLine_("");
     72                _printString_("" << "\n");
    7373                _printString_("      offsets: ");
    7474                for (i=0;i<this->num;i++) _printString_(this->offsets[i] << " ");
    75                 _printLine_("");
     75                _printString_("" << "\n");
    7676        }
    7777        else{
    78                 _printLine_("   Hook: num=0 ");
     78                _printString_("   Hook: num=0 " << "\n");
    7979        }
    8080}
    … …  
    8585        int i;
    8686        if (num){
    87                 _printLine_("   Hook: ");
    88                 _printLine_("      num=" << this->num);
     87                _printString_("   Hook: " << "\n");
     88                _printString_("      num=" << this->num << "\n");
    8989                _printString_("      ids: ");
    9090                for (i=0;i<this->num;i++) _printString_(this->ids[i] << " ");
    91                 _printLine_("");
     91                _printString_("" << "\n");
    9292                _printString_("      offsets: ");
    9393                for (i=0;i<this->num;i++) _printString_(this->offsets[i] << " ");
    94                 _printLine_("");
    95                 if (!objects) _printLine_("      warning: object not hooked yet");
     94                _printString_("" << "\n");
     95                if (!objects) _printString_("      warning: object not hooked yet" << "\n");
    9696                else{
    9797                        _printString_("      objects:\n   ");
    9898                        for (i=0;i<this->num;i++){
    99                                 _printLine_("         object " << i);
     99                                _printString_("         object " << i << "\n");
    100100                                if(objects[i]) objects[i]->DeepEcho();
    101                                 else           _printLine_("            no object hooked yet (not configured)");
     101                                else           _printString_("            no object hooked yet (not configured)" << "\n");
    102102                        }
    103103                }
    104104        }
    105105        else{
    106                 _printLine_("   Hook: num=0 ");
     106                _printString_("   Hook: num=0 " << "\n");
    107107        }
    108108}

  • issm/trunk-jpl/src/c/classes/IndependentObject.cpp

    r15012 r15099  
    4141void IndependentObject::Echo(void){
    4242
    43         _printLine_("IndependentObject:");
    44         _printLine_("   name: " << EnumToStringx(this->name));
     43        _printString_("IndependentObject:" << "\n");
     44        _printString_("   name: " << EnumToStringx(this->name) << "\n");
    4545        if(this->type==0)
    46                 _printLine_("   type: scalar");
     46                _printString_("   type: scalar" << "\n");
    4747        else if(this->type==1)
    48                 _printLine_("   type: vertex");
     48                _printString_("   type: vertex" << "\n");
    4949        else
    5050                _error_(" unknown type: " << this->type);
    51         _printLine_("   numberofvertices: " << this->numberofvertices);
     51        _printString_("   numberofvertices: " << this->numberofvertices << "\n");
    5252}
    5353/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp

    r15082 r15099  
    4040void BoolInput::DeepEcho(void){
    4141
    42         _printLine_("BoolInput:");
    43         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    44         _printLine_("   value: " <<(value?"true":"false"));
     42        _printString_("BoolInput:" << "\n");
     43        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     44        _printString_("   value: " <<(value?"true":"false") << "\n");
    4545}
    4646/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/ControlInput.cpp

    r15012 r15099  
    6767void ControlInput::DeepEcho(void){
    6868
    69         _printLine_("ControlInput:");
    70         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    71         _printLine_("---values: ");     if (values)      values->Echo();
    72         _printLine_("---savedvalues: ");if (savedvalues) savedvalues->Echo();
    73         _printLine_("---minvalues: ");  if (minvalues)   minvalues->Echo();
    74         _printLine_("---maxvalues: ");  if (maxvalues)   maxvalues->Echo();
    75         _printLine_("---gradient: ");   if (gradient)    gradient->Echo();
     69        _printString_("ControlInput:" << "\n");
     70        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     71        _printString_("---values: " << "\n");     if (values)      values->Echo();
     72        _printString_("---savedvalues: " << "\n");if (savedvalues) savedvalues->Echo();
     73        _printString_("---minvalues: " << "\n");  if (minvalues)   minvalues->Echo();
     74        _printString_("---maxvalues: " << "\n");  if (maxvalues)   maxvalues->Echo();
     75        _printString_("---gradient: " << "\n");   if (gradient)    gradient->Echo();
    7676}
    7777/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.cpp

    r15012 r15099  
    4242void DatasetInput::DeepEcho(void){
    4343
    44         _printLine_("DatasetInput:");
    45         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    46         _printLine_("---inputs: "); inputs->Echo();
     44        _printString_("DatasetInput:" << "\n");
     45        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     46        _printString_("---inputs: " << "\n"); inputs->Echo();
    4747}
    4848/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp

    r15082 r15099  
    4040void DoubleInput::DeepEcho(void){
    4141
    42         _printLine_("DoubleInput:");
    43         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    44         _printLine_("   value: " << this->value);
     42        _printString_("DoubleInput:" << "\n");
     43        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     44        _printString_("   value: " << this->value << "\n");
    4545}
    4646/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp

    r15082 r15099  
    3535void IntInput::DeepEcho(void){
    3636
    37         _printLine_("IntInput:");
    38         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    39         _printLine_("   value: " << (int)this->value);
     37        _printString_("IntInput:" << "\n");
     38        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     39        _printString_("   value: " << (int)this->value << "\n");
    4040}
    4141/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/PentaP1Input.cpp

    r15082 r15099  
    5151void PentaP1Input::DeepEcho(void){
    5252
    53         _printLine_("PentaP1Input:");
    54         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    55         _printLine_("   values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << " " << this->values[3] << " " << this->values[4] << " " << this->values[5] << "]");
     53        _printString_("PentaP1Input:" << "\n");
     54        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     55        _printString_("   values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << " " << this->values[3] << " " << this->values[4] << " " << this->values[5] << "]" << "\n");
    5656}
    5757/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp

    r15012 r15099  
    6161        int i;
    6262
    63         _printLine_("TransientInput:");
    64         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    65         _printLine_("   numtimesteps: " << this->numtimesteps);
    66         _printLine_("---inputs: ");
     63        _printString_("TransientInput:" << "\n");
     64        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     65        _printString_("   numtimesteps: " << this->numtimesteps << "\n");
     66        _printString_("---inputs: " << "\n");
    6767        for(i=0;i<this->numtimesteps;i++){
    68                 _printLine_("   time: " << this->timesteps[i] << "  ");
     68                _printString_("   time: " << this->timesteps[i] << "  " << "\n");
    6969                ((Input*)this->inputs->GetObjectByOffset(i))->Echo();
    7070        }

  • issm/trunk-jpl/src/c/classes/Inputs/TriaP1Input.cpp

    r15082 r15099  
    5151void TriaP1Input::DeepEcho(void){
    5252
    53         _printLine_("TriaP1Input:");
    54         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    55         _printLine_("   values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << "]");
     53        _printString_("TriaP1Input:" << "\n");
     54        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     55        _printString_("   values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << "]" << "\n");
    5656}
    5757/*}}}*/

  • issm/trunk-jpl/src/c/classes/IoModel.cpp

    r14996 r15099  
    8484                for(int i=0;i<MaximumNumberOfEnums;i++){
    8585                        if(this->data[i]){
    86                                 _pprintLine_("Info: previous pointer of " << EnumToStringx(i) << " has not been freed (DeleteData has not been called)");
     86                                _pprintString_("Info: previous pointer of " << EnumToStringx(i) << " has not been freed (DeleteData has not been called)" << "\n");
    8787                        }
    8888                }
    … …  
    125125                else{
    126126                        if(record_enum!=MaximumNumberOfEnums){
    127                                 _pprintLine_("");
    128                                 _pprintLine_("=========================================================================");
    129                                 _pprintLine_(" Enums in marshalled file are not compatible with compiled code          ");
    130                                 _pprintLine_("                                                                         ");
    131                                 _pprintLine_("   * If you are running ISSM on a remote cluster:                        ");
    132                                 _pprintLine_("     make sure that you are using the same version of ISSM on your local ");
    133                                 _pprintLine_("     machine and remote cluster (you might need to run svn update)       ");
    134                                 _pprintLine_("   * If you are running ISSM on your local machine:                      ");
    135                                 _pprintLine_("     make sure that all the code is compiled (modules and executables)   ");
    136                                 _pprintLine_("   * If you are a developer and just added a new Enum:                   ");
    137                                 _pprintLine_("     you might need to run ./Synchronize.sh in src/c/EnumDefinitions     ");
    138                                 _pprintLine_("     and recompile                                                       ");
    139                                 _pprintLine_("=========================================================================");
    140                                 _pprintLine_("");
     127                                _pprintString_("" << "\n");
     128                                _pprintString_("=========================================================================" << "\n");
     129                                _pprintString_(" Enums in marshalled file are not compatible with compiled code          " << "\n");
     130                                _pprintString_("                                                                         " << "\n");
     131                                _pprintString_("   * If you are running ISSM on a remote cluster:                        " << "\n");
     132                                _pprintString_("     make sure that you are using the same version of ISSM on your local " << "\n");
     133                                _pprintString_("     machine and remote cluster (you might need to run svn update)       " << "\n");
     134                                _pprintString_("   * If you are running ISSM on your local machine:                      " << "\n");
     135                                _pprintString_("     make sure that all the code is compiled (modules and executables)   " << "\n");
     136                                _pprintString_("   * If you are a developer and just added a new Enum:                   " << "\n");
     137                                _pprintString_("     you might need to run ./Synchronize.sh in src/c/EnumDefinitions     " << "\n");
     138                                _pprintString_("     and recompile                                                       " << "\n");
     139                                _pprintString_("=========================================================================" << "\n");
     140                                _pprintString_("" << "\n");
    141141                                _error_("Enums not consistent (See error message above)");
    142142                        }

  • issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

    r15012 r15099  
    4343/*FUNCTION Friction::Echo {{{*/
    4444void Friction::Echo(void){
    45         _printLine_("Friction:");
    46         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
    47         _printLine_("   element_type: " << this->element_type);
     45        _printString_("Friction:" << "\n");
     46        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
     47        _printString_("   element_type: " << this->element_type << "\n");
    4848        inputs->Echo();
    4949        matpar->Echo();

  • issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp

    r15012 r15099  
    134134/*FUNCTION Icefront::Echo {{{*/
    135135void Icefront::Echo(void){
    136         _printLine_("Icefront:");
    137         _printLine_("   id: " << id);
    138         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     136        _printString_("Icefront:" << "\n");
     137        _printString_("   id: " << id << "\n");
     138        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    139139        hnodes->Echo();
    140140        hvertices->Echo();
    141141        helement->Echo();
    142142        hmatpar->Echo();
    143         _printLine_("   parameters: " << parameters);
     143        _printString_("   parameters: " << parameters << "\n");
    144144        if(parameters)parameters->Echo();
    145         _printLine_("   inputs: " << inputs);
     145        _printString_("   inputs: " << inputs << "\n");
    146146        if(inputs)inputs->Echo();
    147147}
    … …  
    150150void Icefront::DeepEcho(void){
    151151
    152         _printLine_("Icefront:");
    153         _printLine_("   id: " << id);
    154         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     152        _printString_("Icefront:" << "\n");
     153        _printString_("   id: " << id << "\n");
     154        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    155155        hnodes->DeepEcho();
    156156        hvertices->DeepEcho();
    157157        helement->DeepEcho();
    158158        hmatpar->DeepEcho();
    159         _printLine_("   parameters: " << parameters);
     159        _printString_("   parameters: " << parameters << "\n");
    160160        if(parameters)parameters->DeepEcho();
    161         _printLine_("   inputs: " << inputs);
     161        _printString_("   inputs: " << inputs << "\n");
    162162        if(inputs)inputs->DeepEcho();
    163163}

  • issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp

    r15012 r15099  
    155155/*FUNCTION Numericalflux::Echo {{{*/
    156156void Numericalflux::Echo(void){
    157         _printLine_("Numericalflux:");
    158         _printLine_("   id: " << id);
    159         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     157        _printString_("Numericalflux:" << "\n");
     158        _printString_("   id: " << id << "\n");
     159        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    160160        hnodes->Echo();
    161161        hvertices->Echo();
    162162        helement->Echo();
    163         _printLine_("   parameters: " << parameters);
    164         _printLine_("   inputs: " << inputs);
     163        _printString_("   parameters: " << parameters << "\n");
     164        _printString_("   inputs: " << inputs << "\n");
    165165}
    166166/*}}}*/
    … …  
    168168void Numericalflux::DeepEcho(void){
    169169
    170         _printLine_("Numericalflux:");
    171         _printLine_("   id: " << id);
    172         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     170        _printString_("Numericalflux:" << "\n");
     171        _printString_("   id: " << id << "\n");
     172        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    173173        hnodes->DeepEcho();
    174174        hvertices->DeepEcho();
    175175        helement->DeepEcho();
    176         _printLine_("   parameters");
     176        _printString_("   parameters" << "\n");
    177177        if(parameters)
    178178         parameters->DeepEcho();
    179179        else
    180          _printLine_("      NULL");
    181         _printLine_("   inputs");
     180         _printString_("      NULL" << "\n");
     181        _printString_("   inputs" << "\n");
    182182        inputs->DeepEcho();
    183183

  • issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp

    r15020 r15099  
    103103void Pengrid::DeepEcho(void){
    104104
    105         _printLine_("Pengrid:");
    106         _printLine_("   id: " << id);
    107         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     105        _printString_("Pengrid:" << "\n");
     106        _printString_("   id: " << id << "\n");
     107        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    108108        hnode->DeepEcho();
    109109        helement->DeepEcho();
    110110        hmatpar->DeepEcho();
    111         _printLine_("   active " << this->active);
    112         _printLine_("   zigzag_counter " << this->zigzag_counter);
    113         _printLine_("   parameters");
     111        _printString_("   active " << this->active << "\n");
     112        _printString_("   zigzag_counter " << this->zigzag_counter << "\n");
     113        _printString_("   parameters" << "\n");
    114114        parameters->DeepEcho();
    115         _printLine_("   inputs");
     115        _printString_("   inputs" << "\n");
    116116        inputs->DeepEcho();
    117117}

  • issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp

    r15012 r15099  
    5151void Penpair::Echo(void){
    5252
    53         _printLine_("Penpair:");
    54         _printLine_("   id: " << id);
    55         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     53        _printString_("Penpair:" << "\n");
     54        _printString_("   id: " << id << "\n");
     55        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    5656        hnodes->Echo();
    5757
    … …  
    6262void Penpair::DeepEcho(void){
    6363
    64         _printLine_("Penpair:");
    65         _printLine_("   id: " << id);
    66         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     64        _printString_("Penpair:" << "\n");
     65        _printString_("   id: " << id << "\n");
     66        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    6767        hnodes->DeepEcho();
    6868

  • issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp

    r15012 r15099  
    138138        input=(Input*)this->inputs->GetInput(FractionIncrementEnum); input->GetInputValue(&fractionincrement);
    139139
    140         _printLine_("Riftfront:");
    141         _printLine_("   id: " << id);
    142         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
    143         _printLine_("   hnodes: " << hnodes);
    144         _printLine_("   helements: " << helements);
    145         _printLine_("   hmatpar: " << hmatpar);
    146         _printLine_("   parameters: " << parameters);
    147         _printLine_("   inputs: " << inputs);
    148         _printLine_("   internal parameters: ");
    149         _printLine_("   normal: " << normal[0] << "|" << normal[1]);
    150         _printLine_("   length: " << length);
    151         _printLine_("   penalty_lock: " << penalty_lock);
    152         _printLine_("   active: " <<(active ? "true":"false"));
    153         _printLine_("   counter: " << counter);
    154         _printLine_("   prestable: " << (prestable ? "true":"false"));
    155         _printLine_("   material_converged: " << (material_converged ? "true":"false"));
    156         _printLine_("   fill: " << fill);
    157         _printLine_("   friction: " << friction);
    158         _printLine_("   fraction: " << fraction);
    159         _printLine_("   fractionincrement: " << fractionincrement);
    160         _printLine_("   state: " << state);
    161         _printLine_("   frozen: " << (frozen ? "true":"false"));
     140        _printString_("Riftfront:" << "\n");
     141        _printString_("   id: " << id << "\n");
     142        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
     143        _printString_("   hnodes: " << hnodes << "\n");
     144        _printString_("   helements: " << helements << "\n");
     145        _printString_("   hmatpar: " << hmatpar << "\n");
     146        _printString_("   parameters: " << parameters << "\n");
     147        _printString_("   inputs: " << inputs << "\n");
     148        _printString_("   internal parameters: " << "\n");
     149        _printString_("   normal: " << normal[0] << "|" << normal[1] << "\n");
     150        _printString_("   length: " << length << "\n");
     151        _printString_("   penalty_lock: " << penalty_lock << "\n");
     152        _printString_("   active: " <<(active ? "true":"false") << "\n");
     153        _printString_("   counter: " << counter << "\n");
     154        _printString_("   prestable: " << (prestable ? "true":"false") << "\n");
     155        _printString_("   material_converged: " << (material_converged ? "true":"false") << "\n");
     156        _printString_("   fill: " << fill << "\n");
     157        _printString_("   friction: " << friction << "\n");
     158        _printString_("   fraction: " << fraction << "\n");
     159        _printString_("   fractionincrement: " << fractionincrement << "\n");
     160        _printString_("   state: " << state << "\n");
     161        _printString_("   frozen: " << (frozen ? "true":"false") << "\n");
    162162
    163163}
    … …  
    166166void Riftfront::DeepEcho(void){
    167167
    168         _printLine_("Riftfront:");
    169         _printLine_("   id: " << id);
    170         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     168        _printString_("Riftfront:" << "\n");
     169        _printString_("   id: " << id << "\n");
     170        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    171171        hnodes->DeepEcho();
    172172        helements->DeepEcho();
    173173        hmatpar->DeepEcho();
    174         _printLine_("   parameters");
     174        _printString_("   parameters" << "\n");
    175175        if(parameters)parameters->DeepEcho();
    176         _printLine_("   inputs");
     176        _printString_("   inputs" << "\n");
    177177        if(inputs)inputs->DeepEcho();
    178178}
    … …  
    687687                this->fraction+=fractionincrement;
    688688                if (this->fraction>1)this->fraction=(IssmDouble)1.0;
    689                 //_printLine_("riftfront " << this->Id() << " fraction: " << this->fraction);
     689                //_printString_("riftfront " << this->Id() << " fraction: " << this->fraction << "\n");
    690690        }
    691691
    … …  
    702702        this->active=activate;
    703703
    704         //if ((penetration>0) && (this->active==1))_printLine_("Riftfront " << Id() << " wants to be released");
     704        //if ((penetration>0) && (this->active==1))_printString_("Riftfront " << Id() << " wants to be released" << "\n");
    705705
    706706        /*assign output pointer: */

  • issm/trunk-jpl/src/c/classes/Materials/Matdamageice.cpp

    r15040 r15099  
    5555void Matdamageice::Echo(void){
    5656
    57         _printLine_("Matdamageice:");
    58         _printLine_("   mid: " << mid);
    59         _printLine_("   inputs:");
     57        _printString_("Matdamageice:" << "\n");
     58        _printString_("   mid: " << mid << "\n");
     59        _printString_("   inputs:" << "\n");
    6060        inputs->Echo();
    61         _printLine_("   element:");
     61        _printString_("   element:" << "\n");
    6262        helement->Echo();
    6363}
    … …  
    6666void Matdamageice::DeepEcho(void){
    6767
    68         _printLine_("Matdamageice:");
    69         _printLine_("   mid: " << mid);
    70         _printLine_("   inputs:");
     68        _printString_("Matdamageice:" << "\n");
     69        _printString_("   mid: " << mid << "\n");
     70        _printString_("   inputs:" << "\n");
    7171        inputs->DeepEcho();
    72         _printLine_("   element:");
     72        _printString_("   element:" << "\n");
    7373        helement->Echo();
    7474}               

  • issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

    r15040 r15099  
    6969void Matice::Echo(void){
    7070
    71         _printLine_("Matice:");
    72         _printLine_("   mid: " << mid);
    73         _printLine_("   inputs:");
     71        _printString_("Matice:" << "\n");
     72        _printString_("   mid: " << mid << "\n");
     73        _printString_("   inputs:" << "\n");
    7474        inputs->Echo();
    75         _printLine_("   element:");
     75        _printString_("   element:" << "\n");
    7676        helement->Echo();
    7777}
    … …  
    8080void Matice::DeepEcho(void){
    8181
    82         _printLine_("Matice:");
    83         _printLine_("   mid: " << mid);
    84         _printLine_("   inputs:");
     82        _printString_("Matice:" << "\n");
     83        _printString_("   mid: " << mid << "\n");
     84        _printString_("   inputs:" << "\n");
    8585        inputs->DeepEcho();
    86         _printLine_("   element:");
     86        _printString_("   element:" << "\n");
    8787        helement->Echo();
    8888}               

  • issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

    r15015 r15099  
    9595void Matpar::Echo(void){
    9696
    97         _printLine_("Matpar:");
    98         _printLine_("   mid: " << mid);
    99         _printLine_("   rho_ice: " << rho_ice);
    100         _printLine_("   rho_water: " << rho_water);
    101         _printLine_("   rho_freshwater: " << rho_freshwater);
    102         _printLine_("   mu_water: " << mu_water);
    103         _printLine_("   heatcapacity: " << heatcapacity);
    104         _printLine_("   thermalconductivity: " << thermalconductivity);
    105         _printLine_("   latentheat: " << latentheat);
    106         _printLine_("   beta: " << beta);
    107         _printLine_("   meltingpoint: " << meltingpoint);
    108         _printLine_("   referencetemperature: " << referencetemperature);
    109         _printLine_("   mixed_layer_capacity: " << mixed_layer_capacity);
    110         _printLine_("   thermal_exchange_velocity: " << thermal_exchange_velocity);
    111         _printLine_("   g: " << g);
    112         _printLine_("   desfac: " << desfac);
    113         _printLine_("   s0p: " << s0p);
     97        _printString_("Matpar:" << "\n");
     98        _printString_("   mid: " << mid << "\n");
     99        _printString_("   rho_ice: " << rho_ice << "\n");
     100        _printString_("   rho_water: " << rho_water << "\n");
     101        _printString_("   rho_freshwater: " << rho_freshwater << "\n");
     102        _printString_("   mu_water: " << mu_water << "\n");
     103        _printString_("   heatcapacity: " << heatcapacity << "\n");
     104        _printString_("   thermalconductivity: " << thermalconductivity << "\n");
     105        _printString_("   latentheat: " << latentheat << "\n");
     106        _printString_("   beta: " << beta << "\n");
     107        _printString_("   meltingpoint: " << meltingpoint << "\n");
     108        _printString_("   referencetemperature: " << referencetemperature << "\n");
     109        _printString_("   mixed_layer_capacity: " << mixed_layer_capacity << "\n");
     110        _printString_("   thermal_exchange_velocity: " << thermal_exchange_velocity << "\n");
     111        _printString_("   g: " << g << "\n");
     112        _printString_("   desfac: " << desfac << "\n");
     113        _printString_("   s0p: " << s0p << "\n");
    114114        return;
    115115}

  • issm/trunk-jpl/src/c/classes/Node.cpp

    r15040 r15099  
    155155void Node::Echo(void){
    156156
    157         _printLine_("Node:");
    158         _printLine_("   id: " << id);
    159         _printLine_("   sid: " << sid);
    160         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     157        _printString_("Node:" << "\n");
     158        _printString_("   id: " << id << "\n");
     159        _printString_("   sid: " << sid << "\n");
     160        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    161161        indexing.Echo();
    162         _printLine_("   hvertex:     not displayed");
    163         _printLine_("   inputs:      " << inputs);
     162        _printString_("   hvertex:     not displayed" << "\n");
     163        _printString_("   inputs:      " << inputs << "\n");
    164164
    165165}
    … …  
    168168void Node::DeepEcho(void){
    169169
    170         _printLine_("Node:");
    171         _printLine_("   id: " << id);
    172         _printLine_("   sid: " << sid);
    173         _printLine_("   analysis_type: " << EnumToStringx(analysis_type));
     170        _printString_("Node:" << "\n");
     171        _printString_("   id: " << id << "\n");
     172        _printString_("   sid: " << sid << "\n");
     173        _printString_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
    174174        indexing.DeepEcho();
    175         _printLine_("Vertex:");
     175        _printString_("Vertex:" << "\n");
    176176        hvertex->DeepEcho();
    177         _printLine_("   inputs");
     177        _printString_("   inputs" << "\n");
    178178
    179179}

  • issm/trunk-jpl/src/c/classes/Options/GenericOption.h

    r15067 r15099  
    6464                        bool  flag=true;
    6565
    66                         if(flag) _pprintLine_(indent << "         name: \"" << name << "\"");
    67                         if(flag) _pprintLine_(indent << "         numel: " << numel);
    68                         if(flag) _pprintLine_(indent << "         ndims: " << ndims);
     66                        if(flag) _pprintString_(indent << "         name: \"" << name << "\"" << "\n");
     67                        if(flag) _pprintString_(indent << "         numel: " << numel << "\n");
     68                        if(flag) _pprintString_(indent << "         ndims: " << ndims << "\n");
    6969                        if(size){
    7070                                StringFromSize(cstr,size,ndims);
    71                                 if(flag) _pprintLine_(indent << "          size: " << cstr);
     71                                if(flag) _pprintString_(indent << "          size: " << cstr << "\n");
    7272                        }
    73                         else if(flag) _pprintLine_(indent << "          size: [empty]");
    74                         _printLine_(indent << "         value: " << value);;
     73                        else if(flag) _pprintString_(indent << "          size: [empty]" << "\n");
     74                        _printString_(indent << "         value: " << value << "\n");;
    7575                } /*}}}*/
    7676                int  Id(){/*{{{*/

  • issm/trunk-jpl/src/c/classes/Options/Options.h

    r15067 r15099  
    6464                        }
    6565                        else{
    66                                 if(GetOption(name)) _printLine_("WARNING: option "<<name<<" found but fetched format not consistent, defaulting...");
     66                                if(GetOption(name)) _printString_("WARNING: option "<<name<<" found but fetched format not consistent, defaulting..." << "\n");
    6767                                *pvalue=default_value;
    6868                        }

  • issm/trunk-jpl/src/c/classes/Params/BoolParam.cpp

    r15012 r15099  
    4343void BoolParam::DeepEcho(void){
    4444
    45         _printLine_("BoolParam:");
    46         _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    47         _printLine_("   value: " <<(this->value?"true":"false"));
     45        _printString_("BoolParam:" << "\n");
     46        _printString_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     47        _printString_("   value: " <<(this->value?"true":"false") << "\n");
    4848}
    4949/*}}}*/

  • issm/trunk-jpl/src/c/classes/Params/DataSetParam.cpp

    r15012 r15099  
    4444void DataSetParam::DeepEcho(void){
    4545
    46         _printLine_("DataSetParam:");
    47         _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     46        _printString_("DataSetParam:" << "\n");
     47        _printString_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
    4848        this->value->Echo();
    4949}

  • issm/trunk-jpl/src/c/classes/Params/DoubleMatArrayParam.cpp

    r15012 r15099  
    8282void DoubleMatArrayParam::Echo(void){
    8383
    84         _printLine_("DoubleMatArrayParam:");
    85         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    86         _printLine_("   array size: " << this->M);
    87         _printLine_("   array pointer: " << this->array);
     84        _printString_("DoubleMatArrayParam:" << "\n");
     85        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     86        _printString_("   array size: " << this->M << "\n");
     87        _printString_("   array pointer: " << this->array << "\n");
    8888
    8989}
    … …  
    9696        IssmDouble* matrix=NULL;
    9797
    98         _printLine_("DoubleMatArrayParam:");
    99         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    100         _printLine_("   array size: " << this->M);
    101         for(i=0;i<M;i++){
    102                 _printLine_("   array " << i << " (" << mdim_array[i] << "x" << ndim_array[i] << "):");
     98        _printString_("DoubleMatArrayParam:" << "\n");
     99        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     100        _printString_("   array size: " << this->M << "\n");
     101        for(i=0;i<M;i++){
     102                _printString_("   array " << i << " (" << mdim_array[i] << "x" << ndim_array[i] << "):" << "\n");
    103103                matrix=array[i];
    104104                m=mdim_array[i];
    … …  
    108108                        _printString_("   ");
    109109                        for(k=0;k<n;k++)_printString_(*(matrix+n*j+k) << " ");
    110                         _printLine_("");
     110                        _printString_("" << "\n");
    111111                }
    112112        }

  • issm/trunk-jpl/src/c/classes/Params/DoubleMatParam.cpp

    r15012 r15099  
    4343void DoubleMatParam::Echo(void){
    4444
    45         _printLine_("DoubleMatParam:");
    46         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    47         _printLine_("   matrix size: " << this->M << "x" << this->N);
     45        _printString_("DoubleMatParam:" << "\n");
     46        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     47        _printString_("   matrix size: " << this->M << "x" << this->N << "\n");
    4848
    4949}
    … …  
    5454        int i,j;
    5555
    56         _printLine_("DoubleMatParam:");
    57         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    58         _printLine_("   matrix size: " << this->M << "x" << this->N);
     56        _printString_("DoubleMatParam:" << "\n");
     57        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     58        _printString_("   matrix size: " << this->M << "x" << this->N << "\n");
    5959        for(i=0;i<this->M;i++){
    6060                for(i=0;i<this->N;i++){
    61                         _printLine_(i << " " << j << " " << *(this->value+N*i+j));
     61                        _printString_(i << " " << j << " " << *(this->value+N*i+j) << "\n");
    6262                }
    6363        }

  • issm/trunk-jpl/src/c/classes/Params/DoubleParam.cpp

    r15012 r15099  
    4040void DoubleParam::DeepEcho(void){
    4141
    42         _printLine_("DoubleParam:");
    43         _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    44         _printLine_("   value: " << this->value);
     42        _printString_("DoubleParam:" << "\n");
     43        _printString_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     44        _printString_("   value: " << this->value << "\n");
    4545}
    4646/*}}}*/

  • issm/trunk-jpl/src/c/classes/Params/DoubleVecParam.cpp

    r15012 r15099  
    4242void DoubleVecParam::Echo(void){
    4343
    44         _printLine_("DoubleVecParam:");
    45         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    46         _printLine_("   vector size: " << this->M);
     44        _printString_("DoubleVecParam:" << "\n");
     45        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     46        _printString_("   vector size: " << this->M << "\n");
    4747
    4848}
    … …  
    5353        int i;
    5454
    55         _printLine_("DoubleVecParam:");
    56         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    57         _printLine_("   vector size: " << this->M);
     55        _printString_("DoubleVecParam:" << "\n");
     56        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     57        _printString_("   vector size: " << this->M << "\n");
    5858        for(i=0;i<this->M;i++){
    59                 _printLine_(i << " " << this->values[i]);
     59                _printString_(i << " " << this->values[i] << "\n");
    6060        }
    6161}

  • issm/trunk-jpl/src/c/classes/Params/FileParam.cpp

    r15012 r15099  
    4343void FileParam::DeepEcho(void){
    4444
    45         _printLine_("FileParam:");
    46         _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    47         _printLine_("   value: " << this->value);
     45        _printString_("FileParam:" << "\n");
     46        _printString_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     47        _printString_("   value: " << this->value << "\n");
    4848}
    4949/*}}}*/

  • issm/trunk-jpl/src/c/classes/Params/GenericParam.h

    r15012 r15099  
    3939                // that any structured P must provide the friend << operator
    4040                void  DeepEcho() {
    41                   _printLine_("GenericParam:");
    42                   _printLine_("   enum:  " << myEnumVal << " (" << EnumToStringx(myEnumVal) << ")");
    43                   _printLine_("   value: " << myP);;
     41                  _printString_("GenericParam:" << "\n");
     42                  _printString_("   enum:  " << myEnumVal << " (" << EnumToStringx(myEnumVal) << ")" << "\n");
     43                  _printString_("   value: " << myP << "\n");;
    4444                }
    4545                void  Echo() {DeepEcho();};

  • issm/trunk-jpl/src/c/classes/Params/IntMatParam.cpp

    r15012 r15099  
    4343void IntMatParam::Echo(void){
    4444
    45         _printLine_("IntMatParam:");
    46         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    47         _printLine_("   matrix size: " << this->M << "x" << this->N);
     45        _printString_("IntMatParam:" << "\n");
     46        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     47        _printString_("   matrix size: " << this->M << "x" << this->N << "\n");
    4848
    4949}
    … …  
    5454        int i,j;
    5555
    56         _printLine_("IntMatParam:");
    57         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    58         _printLine_("   matrix size: " << this->M << "x" << this->N);
     56        _printString_("IntMatParam:" << "\n");
     57        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     58        _printString_("   matrix size: " << this->M << "x" << this->N << "\n");
    5959        for(i=0;i<this->M;i++){
    6060                for(i=0;i<this->N;i++){
    61                         _printLine_("(" << i << "," << j << ") " << *(this->value+N*i+j));
     61                        _printString_("(" << i << "," << j << ") " << *(this->value+N*i+j) << "\n");
    6262                }
    6363        }

  • issm/trunk-jpl/src/c/classes/Params/IntParam.cpp

    r15012 r15099  
    4343void IntParam::DeepEcho(void){
    4444
    45         _printLine_("IntParam:");
    46         _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    47         _printLine_("   value: " << this->value);
     45        _printString_("IntParam:" << "\n");
     46        _printString_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     47        _printString_("   value: " << this->value << "\n");
    4848}
    4949/*}}}*/

  • issm/trunk-jpl/src/c/classes/Params/IntVecParam.cpp

    r15012 r15099  
    5858void IntVecParam::Echo(void){
    5959
    60         _printLine_("IntVecParam:");
    61         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    62         _printLine_("   vector size: " << this->M);
     60        _printString_("IntVecParam:" << "\n");
     61        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     62        _printString_("   vector size: " << this->M << "\n");
    6363
    6464}
    … …  
    6969        int i;
    7070
    71         _printLine_("IntVecParam:");
    72         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    73         _printLine_("   vector size: " << this->M);
     71        _printString_("IntVecParam:" << "\n");
     72        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     73        _printString_("   vector size: " << this->M << "\n");
    7474        for(i=0;i<this->M;i++){
    75                 _printLine_(i << " " << this->values[i]);
     75                _printString_(i << " " << this->values[i] << "\n");
    7676        }
    7777}

  • issm/trunk-jpl/src/c/classes/Params/MatrixParam.cpp

    r15012 r15099  
    4242void MatrixParam::Echo(void){
    4343
    44         _printLine_("MatrixParam:");
    45         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     44        _printString_("MatrixParam:" << "\n");
     45        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
    4646
    4747}
    … …  
    5050void MatrixParam::DeepEcho(void){
    5151
    52         _printLine_("MatrixParam:");
    53         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     52        _printString_("MatrixParam:" << "\n");
     53        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
    5454        this->value->Echo();
    5555}

  • issm/trunk-jpl/src/c/classes/Params/StringArrayParam.cpp

    r15012 r15099  
    7070        char* string=NULL;
    7171
    72         _printLine_("StringArrayParam:");
    73         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     72        _printString_("StringArrayParam:" << "\n");
     73        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
    7474        for(i=0;i<this->numstrings;i++){
    7575                string=this->value[i];
    76                 _printLine_("   " << i << ": " << string);
     76                _printString_("   " << i << ": " << string << "\n");
    7777        }
    7878}

  • issm/trunk-jpl/src/c/classes/Params/StringParam.cpp

    r15012 r15099  
    4444/*FUNCTION StringParam::DeepEcho{{{*/
    4545void StringParam::DeepEcho(void){
    46         _printLine_("StringParam:");
    47         _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    48         _printLine_("   value: " << this->value);
     46        _printString_("StringParam:" << "\n");
     47        _printString_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     48        _printString_("   value: " << this->value << "\n");
    4949}
    5050/*}}}*/

  • issm/trunk-jpl/src/c/classes/Params/TransientParam.cpp

    r15012 r15099  
    4747void TransientParam::Echo(void){
    4848
    49         _printLine_("TransientParam:");
    50         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    51         _printLine_("   size: " << this->N);
     49        _printString_("TransientParam:" << "\n");
     50        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     51        _printString_("   size: " << this->N << "\n");
    5252
    5353}
    … …  
    5656void TransientParam::DeepEcho(void){
    5757
    58         _printLine_("TransientParam:");
    59         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
    60         _printLine_("   size: " << this->N);
     58        _printString_("TransientParam:" << "\n");
     59        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
     60        _printString_("   size: " << this->N << "\n");
    6161        for(int i=0;i<this->N;i++){
    62                 _printLine_(   "time: " << this->timesteps[i] << " value: " << this->values[i]);
     62                _printString_(   "time: " << this->timesteps[i] << " value: " << this->values[i] << "\n");
    6363        }
    6464}

  • issm/trunk-jpl/src/c/classes/Params/VectorParam.cpp

    r15012 r15099  
    4444void VectorParam::Echo(void){
    4545
    46         _printLine_("VectorParam:");
    47         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     46        _printString_("VectorParam:" << "\n");
     47        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
    4848
    4949}
    … …  
    5252void VectorParam::DeepEcho(void){
    5353
    54         _printLine_("VectorParam:");
    55         _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     54        _printString_("VectorParam:" << "\n");
     55        _printString_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")" << "\n");
    5656        value->Echo();
    5757}

  • issm/trunk-jpl/src/c/classes/Profiler.cpp

    r15012 r15099  
    3636void Profiler::Echo(void){
    3737
    38         _printLine_("Profiler:");
    39         _printLine_("   time tags: ");
     38        _printString_("Profiler:" << "\n");
     39        _printString_("   time tags: " << "\n");
    4040        this->time->Echo();
    4141
    … …  
    4545void Profiler::DeepEcho(void){
    4646
    47         _printLine_("Profiler:");
    48         _printLine_("   time tags: ");
     47        _printString_("Profiler:" << "\n");
     48        _printString_("   time tags: " << "\n");
    4949        this->time->DeepEcho();
    5050

  • issm/trunk-jpl/src/c/classes/Segment.h

    r15067 r15099  
    5252                void Echo(void){
    5353
    54                         _printLine_("Segment:");
    55                         _printLine_("   eid: " << eid);
    56                         _printLine_("   node 1: " << this->x1 << "|" << this->y1);
    57                         _printLine_("   node 2: " << this->x2 << "|" << this->y2);
     54                        _printString_("Segment:" << "\n");
     55                        _printString_("   eid: " << eid << "\n");
     56                        _printString_("   node 1: " << this->x1 << "|" << this->y1 << "\n");
     57                        _printString_("   node 2: " << this->x2 << "|" << this->y2 << "\n");
    5858
    5959                }

  • issm/trunk-jpl/src/c/classes/Vertex.cpp

    r15040 r15099  
    6262void Vertex::Echo(void){
    6363
    64         _printLine_("Vertex:");
    65         _printLine_("   id: " << id);
    66         _printLine_("   sid: " << sid);
    67         _printLine_("   pid: " << pid);
    68         _printLine_("   x: " << x);
    69         _printLine_("   y: " << y);
    70         _printLine_("   z: " << z);
    71         _printLine_("   sigma: " << sigma);
    72         _printLine_("   connectivity: " << connectivity);
    73         _printLine_("   clone: " << clone);
     64        _printString_("Vertex:" << "\n");
     65        _printString_("   id: " << id << "\n");
     66        _printString_("   sid: " << sid << "\n");
     67        _printString_("   pid: " << pid << "\n");
     68        _printString_("   x: " << x << "\n");
     69        _printString_("   y: " << y << "\n");
     70        _printString_("   z: " << z << "\n");
     71        _printString_("   sigma: " << sigma << "\n");
     72        _printString_("   connectivity: " << connectivity << "\n");
     73        _printString_("   clone: " << clone << "\n");
    7474
    7575        return;

  • issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp

    r15071 r15099  
    251251void GaussPenta::Echo(void){
    252252
    253         _printLine_("GaussPenta:");
    254         _printLine_("   numgauss: " << numgauss);
     253        _printString_("GaussPenta:" << "\n");
     254        _printString_("   numgauss: " << numgauss << "\n");
    255255
    256256        if (weights){
    257257         _printString_("   weights = [");
    258          for(int i=0;i<numgauss;i++) _printLine_(" " << weights[i]);
    259          _printLine_("]");
    260         }
    261         else _printLine_("weights = NULL");
     258         for(int i=0;i<numgauss;i++) _printString_(" " << weights[i] << "\n");
     259         _printString_("]" << "\n");
     260        }
     261        else _printString_("weights = NULL" << "\n");
    262262        if (coords1){
    263263         _printString_("   coords1 = [");
    264          for(int i=0;i<numgauss;i++) _printLine_(" " << coords1[i]);
    265          _printLine_("]");
    266         }
    267         else _printLine_("coords1 = NULL");
     264         for(int i=0;i<numgauss;i++) _printString_(" " << coords1[i] << "\n");
     265         _printString_("]" << "\n");
     266        }
     267        else _printString_("coords1 = NULL" << "\n");
    268268        if (coords2){
    269269         _printString_("   coords2 = [");
    270          for(int i=0;i<numgauss;i++) _printLine_(" " << coords2[i]);
    271          _printLine_("]");
    272         }
    273         else _printLine_("coords2 = NULL");
     270         for(int i=0;i<numgauss;i++) _printString_(" " << coords2[i] << "\n");
     271         _printString_("]" << "\n");
     272        }
     273        else _printString_("coords2 = NULL" << "\n");
    274274        if (coords3){
    275275         _printString_("   coords3 = [");
    276          for(int i=0;i<numgauss;i++) _printLine_(" " << coords3[i]);
    277          _printLine_("]");
    278         }
    279         else _printLine_("coords3 = NULL");
     276         for(int i=0;i<numgauss;i++) _printString_(" " << coords3[i] << "\n");
     277         _printString_("]" << "\n");
     278        }
     279        else _printString_("coords3 = NULL" << "\n");
    280280        if (coords4){
    281281                _printString_("   coords4 = [");
    282                 for(int i=0;i<numgauss;i++) _printLine_(" " << coords4[i]);
    283                 _printLine_("]");
    284         }
    285         else _printLine_("coords4 = NULL");
    286 
    287         _printLine_("   weight = " << weight);
    288         _printLine_("   coord1 = " << coord1);
    289         _printLine_("   coord2 = " << coord2);
    290         _printLine_("   coord3 = " << coord3);
    291         _printLine_("   coord4 = " << coord4);
     282                for(int i=0;i<numgauss;i++) _printString_(" " << coords4[i] << "\n");
     283                _printString_("]" << "\n");
     284        }
     285        else _printString_("coords4 = NULL" << "\n");
     286
     287        _printString_("   weight = " << weight << "\n");
     288        _printString_("   coord1 = " << coord1 << "\n");
     289        _printString_("   coord2 = " << coord2 << "\n");
     290        _printString_("   coord3 = " << coord3 << "\n");
     291        _printString_("   coord4 = " << coord4 << "\n");
    292292
    293293}

  • issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp

    r15071 r15099  
    263263void GaussTria::Echo(void){
    264264
    265         _printLine_("GaussTria:");
    266         _printLine_("   numgauss: " << numgauss);
     265        _printString_("GaussTria:" << "\n");
     266        _printString_("   numgauss: " << numgauss << "\n");
    267267
    268268        if (weights){
    269269         _printString_("   weights = [");
    270          for(int i=0;i<numgauss;i++) _printLine_(" " << weights[i]);
    271          _printLine_("]");
    272         }
    273         else _printLine_("weights = NULL");
     270         for(int i=0;i<numgauss;i++) _printString_(" " << weights[i] << "\n");
     271         _printString_("]" << "\n");
     272        }
     273        else _printString_("weights = NULL" << "\n");
    274274        if (coords1){
    275275         _printString_("   coords1 = [");
    276          for(int i=0;i<numgauss;i++) _printLine_(" " << coords1[i]);
    277          _printLine_("]");
    278         }
    279         else _printLine_("coords1 = NULL");
     276         for(int i=0;i<numgauss;i++) _printString_(" " << coords1[i] << "\n");
     277         _printString_("]" << "\n");
     278        }
     279        else _printString_("coords1 = NULL" << "\n");
    280280        if (coords2){
    281281         _printString_("   coords2 = [");
    282          for(int i=0;i<numgauss;i++) _printLine_(" " << coords2[i]);
    283          _printLine_("]");
    284         }
    285         else _printLine_("coords2 = NULL");
     282         for(int i=0;i<numgauss;i++) _printString_(" " << coords2[i] << "\n");
     283         _printString_("]" << "\n");
     284        }
     285        else _printString_("coords2 = NULL" << "\n");
    286286        if (coords3){
    287287         _printString_("   coords3 = [");
    288          for(int i=0;i<numgauss;i++) _printLine_(" " << coords3[i]);
    289          _printLine_("]");
    290         }
    291         else _printLine_("coords3 = NULL");
    292 
    293         _printLine_("   weight = " << weight);
    294         _printLine_("   coord1 = " << coord1);
    295         _printLine_("   coord2 = " << coord2);
    296         _printLine_("   coord3 = " << coord3);
     288         for(int i=0;i<numgauss;i++) _printString_(" " << coords3[i] << "\n");
     289         _printString_("]" << "\n");
     290        }
     291        else _printString_("coords3 = NULL" << "\n");
     292
     293        _printString_("   weight = " << weight << "\n");
     294        _printString_("   coord1 = " << coord1 << "\n");
     295        _printString_("   coord2 = " << coord2 << "\n");
     296        _printString_("   coord3 = " << coord3 << "\n");
    297297
    298298}

  • issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp

    r15012 r15099  
    4747/*FUNCTION ExponentialVariogram::Echo {{{*/
    4848void ExponentialVariogram::Echo(void){
    49         _printLine_("ExponentialVariogram");
    50         _printLine_("   nugget: " << this->nugget);
    51         _printLine_("   sill  : " << this->sill);
    52         _printLine_("   range : " << this->range);
     49        _printString_("ExponentialVariogram" << "\n");
     50        _printString_("   nugget: " << this->nugget << "\n");
     51        _printString_("   sill  : " << this->sill << "\n");
     52        _printString_("   range : " << this->range << "\n");
    5353}
    5454/*}}}*/

  • issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp

    r15012 r15099  
    4747/*FUNCTION GaussianVariogram::Echo {{{*/
    4848void GaussianVariogram::Echo(void){
    49         _printLine_("GaussianVariogram");
    50         _printLine_("   nugget: " << this->nugget);
    51         _printLine_("   sill  : " << this->sill);
    52         _printLine_("   range : " << this->range);
     49        _printString_("GaussianVariogram" << "\n");
     50        _printString_("   nugget: " << this->nugget << "\n");
     51        _printString_("   sill  : " << this->sill << "\n");
     52        _printString_("   range : " << this->range << "\n");
    5353}
    5454/*}}}*/
    … …  
    8989        gamma = (sill-nugget)*(1.-exp(-h2/(a*range*range))) + nugget;
    9090
    91         //if(h2>1000*1000) _printLine_("gamma = " << gamma << " h= " << sqrt(h2));
    92         _printLine_("h = " << sqrt(h2) << " gamma = " << gamma);
     91        //if(h2>1000*1000) _printString_("gamma = " << gamma << " h= " << sqrt(h2) << "\n");
     92        _printString_("h = " << sqrt(h2) << " gamma = " << gamma << "\n");
    9393        return gamma;
    9494}

  • issm/trunk-jpl/src/c/classes/kriging/Observation.cpp

    r15012 r15099  
    3535void Observation::Echo(void){
    3636
    37         _printLine_("Observation");
    38         _printLine_("   index : " << this->index);
    39         _printLine_("   x     : " << this->x);
    40         _printLine_("   y     : " << this->y);
    41         _printLine_("   xi    : "); printbinary(this->xi); _printLine_("");
    42         _printLine_("   yi    : "); printbinary(this->yi); _printLine_("");
    43         _printLine_("   weight: " << this->weight);
    44         _printLine_("   value : " << this->value);
     37        _printString_("Observation" << "\n");
     38        _printString_("   index : " << this->index << "\n");
     39        _printString_("   x     : " << this->x << "\n");
     40        _printString_("   y     : " << this->y << "\n");
     41        _printString_("   xi    : " << "\n"); printbinary(this->xi); _printString_("\n");
     42        _printString_("   yi    : " << "\n"); printbinary(this->yi); _printString_("\n");
     43        _printString_("   weight: " << this->weight << "\n");
     44        _printString_("   value : " << this->value << "\n");
    4545}
    4646/*}}}*/

  • issm/trunk-jpl/src/c/classes/kriging/Observations.cpp

    r15067 r15099  
    107107                }
    108108        }
    109         _pprintLine_("done");
    110         _pprintLine_("Initial number of observations: " << n);
    111         _pprintLine_("  Final number of observations: " << this->quadtree->NbObs);
     109        _pprintString_("done" << "\n");
     110        _pprintString_("Initial number of observations: " << n << "\n");
     111        _pprintString_("  Final number of observations: " << this->quadtree->NbObs << "\n");
    112112}
    113113/*}}}*/

  • issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp

    r15012 r15099  
    4848/*FUNCTION PowerVariogram::Echo {{{*/
    4949void PowerVariogram::Echo(void){
    50         _printLine_("PowerVariogram");
    51         _printLine_("   nugget: " << this->nugget);
    52         _printLine_("   slope : " << this->slope);
    53         _printLine_("   power : " << this->power);
     50        _printString_("PowerVariogram" << "\n");
     51        _printString_("   nugget: " << this->nugget << "\n");
     52        _printString_("   slope : " << this->slope << "\n");
     53        _printString_("   power : " << this->power << "\n");
    5454}
    5555/*}}}*/
    … …  
    8585        gamma = this->nugget + this->slope*pow(h,this->power);
    8686
    87         //if(h>1000) _printLine_("gamma = " << gamma << " h=" << h);
     87        //if(h>1000) _printString_("gamma = " << gamma << " h=" << h << "\n");
    8888        return gamma;
    8989}

  • issm/trunk-jpl/src/c/classes/kriging/Quadtree.cpp

    r15012 r15099  
    297297void  Quadtree::Echo(void){
    298298
    299         _printLine_("Quadtree:");
    300         _printLine_("   MaxDepth      = " << this->MaxDepth);
    301         _printLine_("   NbQuadtreeBox = " << this->NbQuadtreeBox);
    302         _printLine_("   NbObs         = " << this->NbObs);
    303         _printLine_("   root          = " << this->root);
     299        _printString_("Quadtree:" << "\n");
     300        _printString_("   MaxDepth      = " << this->MaxDepth << "\n");
     301        _printString_("   NbQuadtreeBox = " << this->NbQuadtreeBox << "\n");
     302        _printString_("   NbObs         = " << this->NbObs << "\n");
     303        _printString_("   root          = " << this->root << "\n");
    304304
    305305}/*}}}*/
    … …  
    307307void  Quadtree::DeepEcho(void){
    308308
    309         _printLine_("Quadtree:");
    310         _printLine_("   MaxDepth      = " << this->MaxDepth);
    311         _printLine_("   NbQuadtreeBox = " << this->NbQuadtreeBox);
    312         _printLine_("   NbObs         = " << this->NbObs);
    313         _printLine_("   root          = " << this->root);
     309        _printString_("Quadtree:" << "\n");
     310        _printString_("   MaxDepth      = " << this->MaxDepth << "\n");
     311        _printString_("   NbQuadtreeBox = " << this->NbQuadtreeBox << "\n");
     312        _printString_("   NbObs         = " << this->NbObs << "\n");
     313        _printString_("   root          = " << this->root << "\n");
    314314        boxcontainer->Echo();
    315315
    … …  
    512512void  Quadtree::QuadtreeBox::Echo(void){
    513513
    514         _printLine_("QuadtreeBox:");
    515         _printLine_("   nbitems = " << this->nbitems);
    516         _printLine_("   xcenter = " << this->xcenter);
    517         _printLine_("   ycenter = " << this->ycenter);
    518         _printLine_("   length  = " << this->length);
     514        _printString_("QuadtreeBox:" << "\n");
     515        _printString_("   nbitems = " << this->nbitems << "\n");
     516        _printString_("   xcenter = " << this->xcenter << "\n");
     517        _printString_("   ycenter = " << this->ycenter << "\n");
     518        _printString_("   length  = " << this->length << "\n");
    519519
    520520}/*}}}*/

  • issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp

    r15012 r15099  
    4747/*FUNCTION SphericalVariogram::Echo {{{*/
    4848void SphericalVariogram::Echo(void){
    49         _printLine_("SphericalVariogram");
    50         _printLine_("   nugget: " << this->nugget);
    51         _printLine_("   sill  : " << this->sill);
    52         _printLine_("   range : " << this->range);
     49        _printString_("SphericalVariogram" << "\n");
     50        _printString_("   nugget: " << this->nugget << "\n");
     51        _printString_("   sill  : " << this->sill << "\n");
     52        _printString_("   range : " << this->range << "\n");
    5353}
    5454/*}}}*/

  • issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.cpp

    r14996 r15099  
    377377
    378378        int i,j;
    379         _printLine_("Element Matrix echo:");
    380         _printLine_("   nrows: " << this->nrows);
    381         _printLine_("   ncols: " << this->ncols);
    382         _printLine_("   dofsymmetrical: " << (dofsymmetrical?"true":"false"));
    383 
    384         _printLine_("   values:");
     379        _printString_("Element Matrix echo:" << "\n");
     380        _printString_("   nrows: " << this->nrows << "\n");
     381        _printString_("   ncols: " << this->ncols << "\n");
     382        _printString_("   dofsymmetrical: " << (dofsymmetrical?"true":"false") << "\n");
     383
     384        _printString_("   values:" << "\n");
    385385        for(i=0;i<nrows;i++){
    386386                _printString_(setw(4) << right << i << ": ");
    387387                for(j=0;j<ncols;j++) _printString_( " " << setw(11) << setprecision (5) << right << values[i*ncols+j]);
    388                 _printLine_("");
     388                _printString_("" << "\n");
    389389        }
    390390
    391391        _printString_("   gglobaldoflist (" << gglobaldoflist << "): ");
    392         if(gglobaldoflist) for(i=0;i<nrows;i++) _printString_(" " << gglobaldoflist[i]); _printLine_("");
    393 
    394         _printLine_("   row_fsize: " << row_fsize);
     392        if(gglobaldoflist) for(i=0;i<nrows;i++) _printString_(" " << gglobaldoflist[i] << "\n"); _printString_("" << "\n");
     393
     394        _printString_("   row_fsize: " << row_fsize << "\n");
    395395        _printString_("   row_flocaldoflist  (" << row_flocaldoflist << "): ");
    396         if(row_flocaldoflist) for(i=0;i<row_fsize;i++) _printString_(" " << row_flocaldoflist[i]); _printLine_(" ");
     396        if(row_flocaldoflist) for(i=0;i<row_fsize;i++) _printString_(" " << row_flocaldoflist[i] << "\n"); _printString_(" " << "\n");
    397397        _printString_("   row_fglobaldoflist  (" << row_fglobaldoflist << "): ");
    398         if(row_fglobaldoflist) for(i=0;i<row_fsize;i++) _printString_(" " << row_fglobaldoflist[i]); _printLine_(" ");
    399 
    400         _printLine_("   row_ssize: " << row_ssize);
     398        if(row_fglobaldoflist) for(i=0;i<row_fsize;i++) _printString_(" " << row_fglobaldoflist[i] << "\n"); _printString_(" " << "\n");
     399
     400        _printString_("   row_ssize: " << row_ssize << "\n");
    401401        _printString_("   row_slocaldoflist  (" << row_slocaldoflist << "): ");
    402         if(row_slocaldoflist) for(i=0;i<row_ssize;i++) _printString_(" " << row_slocaldoflist[i]); _printLine_(" ");
     402        if(row_slocaldoflist) for(i=0;i<row_ssize;i++) _printString_(" " << row_slocaldoflist[i] << "\n"); _printString_(" " << "\n");
    403403        _printString_("   row_sglobaldoflist  (" << row_sglobaldoflist << "): ");
    404         if(row_sglobaldoflist) for(i=0;i<row_ssize;i++) _printString_(" " << row_sglobaldoflist[i]); _printLine_(" ");
     404        if(row_sglobaldoflist) for(i=0;i<row_ssize;i++) _printString_(" " << row_sglobaldoflist[i] << "\n"); _printString_(" " << "\n");
    405405
    406406        if(!dofsymmetrical){
    407                 _printLine_("   col_fsize: " << col_fsize);
     407                _printString_("   col_fsize: " << col_fsize << "\n");
    408408                _printString_("   col_flocaldoflist  (" << col_flocaldoflist << "): ");
    409                 if(col_flocaldoflist) for(i=0;i<col_fsize;i++) _printString_(" " << col_flocaldoflist[i]); _printLine_(" ");
     409                if(col_flocaldoflist) for(i=0;i<col_fsize;i++) _printString_(" " << col_flocaldoflist[i] << "\n"); _printString_(" " << "\n");
    410410                _printString_("   col_fglobaldoflist  (" << col_fglobaldoflist << "): ");
    411                 if(col_fglobaldoflist) for(i=0;i<col_fsize;i++) _printString_(" " << col_fglobaldoflist[i]); _printLine_(" ");
    412 
    413                 _printLine_("   col_ssize: " << col_ssize);
     411                if(col_fglobaldoflist) for(i=0;i<col_fsize;i++) _printString_(" " << col_fglobaldoflist[i] << "\n"); _printString_(" " << "\n");
     412
     413                _printString_("   col_ssize: " << col_ssize << "\n");
    414414                _printString_("   col_slocaldoflist  (" << col_slocaldoflist << "): ");
    415                 if(col_slocaldoflist) for(i=0;i<col_ssize;i++) _printString_(" " << col_slocaldoflist[i]); _printLine_(" ");
     415                if(col_slocaldoflist) for(i=0;i<col_ssize;i++) _printString_(" " << col_slocaldoflist[i] << "\n"); _printString_(" " << "\n");
    416416                _printString_("   col_sglobaldoflist  (" << col_sglobaldoflist << "): ");
    417                 if(col_sglobaldoflist) for(i=0;i<col_ssize;i++) _printString_(" " << col_sglobaldoflist[i]); _printLine_(" ");
     417                if(col_sglobaldoflist) for(i=0;i<col_ssize;i++) _printString_(" " << col_sglobaldoflist[i] << "\n"); _printString_(" " << "\n");
    418418        }
    419419}

  • issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp

    r14996 r15099  
    219219        int i;
    220220
    221         _printLine_("Element Vector echo:");
    222         _printLine_("   nrows: " << nrows);
    223         _printLine_("   values:");
     221        _printString_("Element Vector echo:" << "\n");
     222        _printString_("   nrows: " << nrows << "\n");
     223        _printString_("   values:" << "\n");
    224224        for(i=0;i<nrows;i++){
    225                 _printLine_(setw(4) << right << i << ": " << setw(10) << values[i]);
     225                _printString_(setw(4) << right << i << ": " << setw(10) << values[i] << "\n");
    226226        }
    227227
    228228        _printString_("   gglobaldoflist (" << gglobaldoflist << "): ");
    229229        if(gglobaldoflist) for(i=0;i<nrows;i++) _printString_(" " << gglobaldoflist[i] );
    230         _printLine_(" ");
    231 
    232         _printLine_("   fsize: " << fsize);
     230        _printString_(" " << "\n");
     231
     232        _printString_("   fsize: " << fsize << "\n");
    233233        _printString_("   flocaldoflist  (" << flocaldoflist << "): ");
    234234        if(flocaldoflist) for(i=0;i<fsize;i++) _printString_(" " << flocaldoflist[i] );
    235         _printLine_(" ");
     235        _printString_(" " << "\n");
    236236        _printString_("   fglobaldoflist (" << fglobaldoflist << "): ");
    237237        if(fglobaldoflist) for(i=0;i<fsize;i++) _printString_(" " << fglobaldoflist[i] );
    238         _printLine_(" ");
     238        _printString_(" " << "\n");
    239239}
    240240/*}}}*/

  • issm/trunk-jpl/src/c/datastructures/DataSet.cpp

    r15067 r15099  
    130130        if(this==NULL)_error_("trying to echo a NULL dataset");
    131131
    132         _pprintLine_("DataSet echo: " << objects.size() << " objects");
     132        _pprintString_("DataSet echo: " << objects.size() << " objects" << "\n");
    133133
    134134        for ( object=objects.begin() ; object < objects.end(); object++ ){
    … …  
    147147        if(this==NULL)_error_("trying to echo a NULL dataset");
    148148
    149         _pprintLine_("DataSet echo: " << objects.size() << " objects");
     149        _pprintString_("DataSet echo: " << objects.size() << " objects" << "\n");
    150150
    151151        for ( object=objects.begin() ; object < objects.end(); object++ ){

  • issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp

    r15069 r15099  
    133133
    134134//      if      (itag)
    135 //              _pprintLine_("tag buffer (length=" << ibuf << "):");
     135//              _pprintString_("tag buffer (length=" << ibuf << "):" << "\n");
    136136//      else if (ifield)
    137 //              _pprintLine_("field buffer (length=" << ibuf << "):");
    138 //      _pprintLine_(buffer);
     137//              _pprintString_("field buffer (length=" << ibuf << "):" << "\n");
     138//      _pprintString_(buffer << "\n");
    139139
    140140        if (!ibuf)
    … …  
    199199                }
    200200
    201 //      _pprintLine_("comment buffer (length=" << ibuf << "):");
    202 //      _pprintLine_(buffer);
     201//      _pprintString_("comment buffer (length=" << ibuf << "):" << "\n");
     202//      _pprintString_(buffer << "\n");
    203203
    204204        if (!ibuf)
    … …  
    265265
    266266        ktokn=strtok(ktagi,"< >");
    267 //      _pprintLine_("KMLFileTagName -- initial token=\"" << ktokn << "\".");
     267//      _pprintString_("KMLFileTagName -- initial token=\"" << ktokn << "\"." << "\n");
    268268
    269269        if (!pname) {
    … …  
    275275
    276276        if (maxlen && (maxlen < strlen(ktokn))) {
    277                 _pprintLine_("KMLFileTagName -- string field too short for " << ktag << ".");
    278                 _pprintLine_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters.");
     277                _pprintString_("KMLFileTagName -- string field too short for " << ktag << "." << "\n");
     278                _pprintString_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters." << "\n");
    279279                strncpy(pname,ktokn,maxlen);
    280280        }
    … …  
    311311        /*  return first non blank and move past subsequent blank  */
    312312        ktokn=strtok(ktagi," ");
    313 //      _pprintLine_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\".");
     313//      _pprintString_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\"." << "\n");
    314314
    315315        /*  return next non " =?/>" and move past subsequent " =?/>"  */
    … …  
    318318                /*  return next non quote and move past subsequent quote  */
    319319                ktokv=strtok(NULL,quote);
    320 //              _pprintLine_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\".");
     320//              _pprintString_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\"." << "\n");
    321321
    322322/*  add the attribute to the dataset  */
    … …  
    334334                (!strncmp(&ktag[0],"<"        ,1) && !strncmp(&ktag[strlen(ktag)-2],"/>",2)))
    335335                isolo=1;
    336 //      _pprintLine_("KMLFileTagAttrib -- isolo=" << isolo << ".");
     336//      _pprintString_("KMLFileTagAttrib -- isolo=" << isolo << "." << "\n");
    337337
    338338        return(isolo);
    … …  
    368368                        xDelete<char>(kstr);
    369369
    370 //      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pival << ".");
     370//      _pprintString_("KMLFileTokenParse -- " << ktag << "=" << *pival << "." << "\n");
    371371
    372372        return(0);
    … …  
    402402                        xDelete<char>(kstr);
    403403
    404 //      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << ".");
     404//      _pprintString_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << "." << "\n");
    405405
    406406        return(0);
    … …  
    439439
    440440        if (maxlen && (maxlen < strlen(kstr))) {
    441                 _pprintLine_("KMLFileTokenParse -- string field too short for " << ktag << ".");
    442                 _pprintLine_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters.");
     441                _pprintString_("KMLFileTokenParse -- string field too short for " << ktag << "." << "\n");
     442                _pprintString_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters." << "\n");
    443443                strncpy(pstr,kstr,maxlen);
    444444        }
    … …  
    463463                        xDelete<char>(kstr);
    464464
    465 //      _pprintLine_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\".");
     465//      _pprintString_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\"." << "\n");
    466466
    467467        return(pstr);
    … …  
    497497                        xDelete<char>(kstr);
    498498
    499 //      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pfval << ".");
     499//      _pprintString_("KMLFileTokenParse -- " << ktag << "=" << *pfval << "." << "\n");
    500500
    501501        return(0);
    … …  
    531531                        xDelete<char>(kstr);
    532532
    533 //      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pdval << ".");
     533//      _pprintString_("KMLFileTokenParse -- " << ktag << "=" << *pdval << "." << "\n");
    534534
    535535        return(0);
    … …  
    595595                        xDelete<char>(kstr);
    596596
    597 //      _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
     597//      _pprintString_("KMLFileTokenParse -- " << ktag << "=..." << "\n");
    598598//      for (j=0; j<=i; j++)
    599 //              _pprintLine_("   [" << j << "]: " << (*pdval)[j] << "g");
     599//              _pprintString_("   [" << j << "]: " << (*pdval)[j] << "g" << "\n");
    600600
    601601        return(0);
    … …  
    651651
    652652        if ((i+1) % n)
    653                 _pprintLine_("KMLFileTokenParse -- Double [m x n] field for " << ktag << " does not have multiple of n values.");
     653                _pprintString_("KMLFileTokenParse -- Double [m x n] field for " << ktag << " does not have multiple of n values." << "\n");
    654654
    655655/*  get additional token and compare to closing tag  */
    … …  
    665665                        xDelete<char>(kstr);
    666666
    667 //      _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
     667//      _pprintString_("KMLFileTokenParse -- " << ktag << "=..." << "\n");
    668668//      for (j=0; j<=i; j++)
    669 //              _pprintLine_("   [" << j << "]: " << (*pdval)[j] << "g");
     669//              _pprintString_("   [" << j << "]: " << (*pdval)[j] << "g" << "\n");
    670670
    671671        return(0);
    … …  
    681681        opening tag, must find corresponding closing tag  */
    682682
    683         _pprintLine_("KMLFileTagSkip -- input tag " << ktag << ".");
     683        _pprintString_("KMLFileTagSkip -- input tag " << ktag << "." << "\n");
    684684
    685685/*  if next token is a closing tag, compare to input  */
    … …  
    690690                                 (kstr[1] == '/') &&
    691691                                 (!strncmp(&(kstr[2]),&(ktag[1]),(strcspn(ktag," >")-1)/sizeof(char)))) {
    692                         _pprintLine_("KMLFileTagSkip -- closing tag " << kstr << ".");
     692                        _pprintString_("KMLFileTagSkip -- closing tag " << kstr << "." << "\n");
    693693                        xDelete<char>(kstr);
    694694                        return(0);
    … …  
    699699                else if ((kstr[0] == '<') &&
    700700                                 (kstr[1] != '/')) {
    701                         _pprintLine_("KMLFileTagSkip -- opening tag " << kstr << ".");
     701                        _pprintString_("KMLFileTagSkip -- opening tag " << kstr << "." << "\n");
    702702                        KMLFileTagSkip(kstr,
    703703                                                   fid);

  • issm/trunk-jpl/src/c/kml/KML_Attribute.cpp

    r15068 r15099  
    4343        for (i=0;i<10-strlen(name);i++)
    4444                if(flag) _pprintString_(" ");
    45         if(flag) _pprintLine_(name << ": \"" << value << "\"");
     45        if(flag) _pprintString_(name << ": \"" << value << "\"" << "\n");
    4646
    4747        return;
    … …  
    6767        for (i=0;i<10-strlen(name);i++)
    6868                if(flag) _pprintString_(" ");
    69         if(flag) _pprintLine_(name << ": \"" << value << "\"");
     69        if(flag) _pprintString_(name << ": \"" << value << "\"" << "\n");
    7070
    7171        return;

  • issm/trunk-jpl/src/c/kml/KML_ColorStyle.cpp

    r15068 r15099  
    4242        KML_SubStyle::Echo();
    4343
    44         if(flag) _pprintLine_("         color: " << color);
    45         if(flag) _pprintLine_("     colormode: " << colormode);
     44        if(flag) _pprintString_("         color: " << color << "\n");
     45        if(flag) _pprintString_("     colormode: " << colormode << "\n");
    4646
    4747        return;
    … …  
    6565        KML_SubStyle::DeepEcho(indent);
    6666
    67         if(flag) _pprintLine_(indent << "         color: " << color);
    68         if(flag) _pprintLine_(indent << "     colormode: " << colormode);
     67        if(flag) _pprintString_(indent << "         color: " << color << "\n");
     68        if(flag) _pprintString_(indent << "     colormode: " << colormode << "\n");
    6969}
    7070/*}}}*/

  • issm/trunk-jpl/src/c/kml/KML_Comment.cpp

    r15068 r15099  
    3838
    3939        if(flag) _pprintString_("    ");
    40         if(flag) _pprintLine_(value);
     40        if(flag) _pprintString_(value << "\n");
    4141
    4242        return;
    … …  
    5959
    6060        if(flag) _pprintString_(indent << "    ");
    61         if(flag) _pprintLine_(value);
     61        if(flag) _pprintString_(value << "\n");
    6262
    6363        return;

  • issm/trunk-jpl/src/c/kml/KML_Container.cpp

    r15068 r15099  
    4747        KML_Feature::Echo();
    4848
    49         if(flag) _pprintLine_("       feature: (size=" << feature->Size() << ")");
     49        if(flag) _pprintString_("       feature: (size=" << feature->Size() << ")" << "\n");
    5050
    5151        return;
    … …  
    7878        if (feature->Size())
    7979                for (i=0; i<feature->Size(); i++) {
    80                         if(flag) _pprintLine_(indent << "       feature: -------- begin [" << i << "] --------");
     80                        if(flag) _pprintString_(indent << "       feature: -------- begin [" << i << "] --------" << "\n");
    8181                        ((KML_Feature *)feature->GetObjectByOffset(i))->DeepEcho(indent2);
    82                         if(flag) _pprintLine_(indent << "       feature: --------  end  [" << i << "] --------");
     82                        if(flag) _pprintString_(indent << "       feature: --------  end  [" << i << "] --------" << "\n");
    8383                }
    8484        else
    85                 if(flag) _pprintLine_(indent << "       feature: [empty]");
     85                if(flag) _pprintString_(indent << "       feature: [empty]" << "\n");
    8686
    8787        return;

  • issm/trunk-jpl/src/c/kml/KML_Document.cpp

    r15068 r15099  
    3838        bool  flag=true;
    3939
    40         if(flag) _pprintLine_("KML_Document:");
     40        if(flag) _pprintString_("KML_Document:" << "\n");
    4141        KML_Container::Echo();
    4242
    … …  
    5959        bool  flag=true;
    6060
    61         if(flag) _pprintLine_(indent << "KML_Document:");
     61        if(flag) _pprintString_(indent << "KML_Document:" << "\n");
    6262        KML_Container::DeepEcho(indent);
    6363

  • issm/trunk-jpl/src/c/kml/KML_Feature.cpp

    r15068 r15099  
    6060        KML_Object::Echo();
    6161
    62         if(flag) _pprintLine_("          name: \"" << name << "\"");
    63         if(flag) _pprintLine_("    visibility: " << (visibility ? "true" : "false"));
    64         if(flag) _pprintLine_("          open: " << (open ? "true" : "false"));
    65         if(flag) _pprintLine_("       snippet: \"" << snippet << "\"");
    66         if(flag) _pprintLine_("      descript: \"" << descript << "\"");
    67         if(flag) _pprintLine_("      styleurl: \"" << styleurl << "\"");
    68         if(flag) _pprintLine_("         style: (size=" << style->Size() << ")");
     62        if(flag) _pprintString_("          name: \"" << name << "\"" << "\n");
     63        if(flag) _pprintString_("    visibility: " << (visibility ? "true" : "false") << "\n");
     64        if(flag) _pprintString_("          open: " << (open ? "true" : "false") << "\n");
     65        if(flag) _pprintString_("       snippet: \"" << snippet << "\"" << "\n");
     66        if(flag) _pprintString_("      descript: \"" << descript << "\"" << "\n");
     67        if(flag) _pprintString_("      styleurl: \"" << styleurl << "\"" << "\n");
     68        if(flag) _pprintString_("         style: (size=" << style->Size() << ")" << "\n");
    6969
    7070        return;
    … …  
    9090        KML_Object::DeepEcho(indent);
    9191
    92         if(flag) _pprintLine_(indent << "          name: \"" << name << "\"");
    93         if(flag) _pprintLine_(indent << "    visibility: " << (visibility ? "true" : "false"));
    94         if(flag) _pprintLine_(indent << "          open: " << (open ? "true" : "false"));
    95         if(flag) _pprintLine_(indent << "       snippet: \"" << snippet << "\"");
    96         if(flag) _pprintLine_(indent << "      descript: \"" << descript << "\"");
    97         if(flag) _pprintLine_(indent << "      styleurl: \"" << styleurl << "\"");
     92        if(flag) _pprintString_(indent << "          name: \"" << name << "\"" << "\n");
     93        if(flag) _pprintString_(indent << "    visibility: " << (visibility ? "true" : "false") << "\n");
     94        if(flag) _pprintString_(indent << "          open: " << (open ? "true" : "false") << "\n");
     95        if(flag) _pprintString_(indent << "       snippet: \"" << snippet << "\"" << "\n");
     96        if(flag) _pprintString_(indent << "      descript: \"" << descript << "\"" << "\n");
     97        if(flag) _pprintString_(indent << "      styleurl: \"" << styleurl << "\"" << "\n");
    9898
    9999/*  loop over any styles for the feature  */
    … …  
    104104        if (style->Size())
    105105                for (i=0; i<style->Size(); i++) {
    106                         if(flag) _pprintLine_(indent << "         style: -------- begin [" << i << "] --------");
     106                        if(flag) _pprintString_(indent << "         style: -------- begin [" << i << "] --------" << "\n");
    107107                        ((KML_Style *)style->GetObjectByOffset(i))->DeepEcho(indent2);
    108                         if(flag) _pprintLine_(indent << "         style: --------  end  [" << i << "] --------");
     108                        if(flag) _pprintString_(indent << "         style: --------  end  [" << i << "] --------" << "\n");
    109109                }
    110110        else
    111                 if(flag) _pprintLine_(indent << "         style: [empty]");
     111                if(flag) _pprintString_(indent << "         style: [empty]" << "\n");
    112112
    113113        return;

  • issm/trunk-jpl/src/c/kml/KML_File.cpp

    r15068 r15099  
    3939        bool  flag=true;
    4040
    41         if(flag) _pprintLine_("KML_File:");
     41        if(flag) _pprintString_("KML_File:" << "\n");
    4242        KML_Object::Echo();
    4343
    … …  
    6060        bool  flag=true;
    6161
    62         if(flag) _pprintLine_(indent << "KML_File:");
     62        if(flag) _pprintString_(indent << "KML_File:" << "\n");
    6363        KML_Object::DeepEcho(indent);
    6464

  • issm/trunk-jpl/src/c/kml/KML_Folder.cpp

    r15068 r15099  
    3838        bool  flag=true;
    3939
    40         if(flag) _pprintLine_("KML_Folder:");
     40        if(flag) _pprintString_("KML_Folder:" << "\n");
    4141        KML_Container::Echo();
    4242
    … …  
    5959        bool  flag=true;
    6060
    61         if(flag) _pprintLine_(indent << "KML_Folder:");
     61        if(flag) _pprintString_(indent << "KML_Folder:" << "\n");
    6262        KML_Container::DeepEcho(indent);
    6363

  • issm/trunk-jpl/src/c/kml/KML_GroundOverlay.cpp

    r15068 r15099  
    4444void  KML_GroundOverlay::Echo(){
    4545
    46         _printLine_("KML_GroundOverlay:");
     46        _printString_("KML_GroundOverlay:" << "\n");
    4747        KML_Overlay::Echo();
    4848
    49         _printLine_("         altitude: " << altitude);
    50         _printLine_("          altmode: " << altmode);
    51         _printLine_("            llbox: " << llbox);
     49        _printString_("         altitude: " << altitude << "\n");
     50        _printString_("          altmode: " << altmode << "\n");
     51        _printString_("            llbox: " << llbox << "\n");
    5252}
    5353/*}}}*/
    … …  
    6767        char  indent2[81];
    6868
    69         _printLine_(indent << "KML_GroundOverlay:");
     69        _printString_(indent << "KML_GroundOverlay:" << "\n");
    7070        KML_Overlay::DeepEcho(indent);
    7171
    … …  
    7373        strcat(indent2,"  ");
    7474
    75         _printLine_(indent<<"      altitude: " << altitude);
    76         _printLine_(indent<<"       altmode: " << altmode);
     75        _printString_(indent<<"      altitude: " << altitude << "\n");
     76        _printString_(indent<<"       altmode: " << altmode << "\n");
    7777        if (llbox)
    7878         llbox->DeepEcho(indent2);
    7979        else
    80          _printLine_(indent<<"         llbox: " << llbox);
     80         _printString_(indent<<"         llbox: " << llbox << "\n");
    8181}
    8282/*}}}*/

  • issm/trunk-jpl/src/c/kml/KML_Icon.cpp

    r15068 r15099  
    4545        bool  flag=true;
    4646
    47         if(flag) _pprintLine_("KML_Icon:");
     47        if(flag) _pprintString_("KML_Icon:" << "\n");
    4848        KML_Object::Echo();
    4949
    50         if(flag) _pprintLine_("          href: \"" << href << "\"");
    51         if(flag) _pprintLine_("       refmode: \"" << refmode << "\"");
    52         if(flag) _pprintLine_("        refint: " << refint);
    53         if(flag) _pprintLine_("      vrefmode: \"" << vrefmode << "\"");
    54         if(flag) _pprintLine_("      vreftime: " << vreftime);
    55         if(flag) _pprintLine_("      vboundsc: " << vboundsc);
    56         if(flag) _pprintLine_("       vformat: \"" << vformat << "\"");
    57         if(flag) _pprintLine_("        hquery: \"" << hquery << "\"");
     50        if(flag) _pprintString_("          href: \"" << href << "\"" << "\n");
     51        if(flag) _pprintString_("       refmode: \"" << refmode << "\"" << "\n");
     52        if(flag) _pprintString_("        refint: " << refint << "\n");
     53        if(flag) _pprintString_("      vrefmode: \"" << vrefmode << "\"" << "\n");
     54        if(flag) _pprintString_("      vreftime: " << vreftime << "\n");
     55        if(flag) _pprintString_("      vboundsc: " << vboundsc << "\n");
     56        if(flag) _pprintString_("       vformat: \"" << vformat << "\"" << "\n");
     57        if(flag) _pprintString_("        hquery: \"" << hquery << "\"" << "\n");
    5858
    5959        return;
    … …  
    7575        bool  flag=true;
    7676
    77         if(flag) _pprintLine_(indent << "KML_Icon:");
     77        if(flag) _pprintString_(indent << "KML_Icon:" << "\n");
    7878        KML_Object::DeepEcho(indent);
    7979
    80         if(flag) _pprintLine_(indent << "          href: \"" << href << "\"");
    81         if(flag) _pprintLine_(indent << "       refmode: \"" << refmode << "\"");
    82         if(flag) _pprintLine_(indent << "        refint: " << refint);
    83         if(flag) _pprintLine_(indent << "      vrefmode: \"" << vrefmode << "\"");
    84         if(flag) _pprintLine_(indent << "      vreftime: " << vreftime);
    85         if(flag) _pprintLine_(indent << "      vboundsc: " << vboundsc);
    86         if(flag) _pprintLine_(indent << "       vformat: \"" << vformat << "\"");
    87         if(flag) _pprintLine_(indent << "        hquery: \"" << hquery << "\"");
     80        if(flag) _pprintString_(indent << "          href: \"" << href << "\"" << "\n");
     81        if(flag) _pprintString_(indent << "       refmode: \"" << refmode << "\"" << "\n");
     82        if(flag) _pprintString_(indent << "        refint: " << refint << "\n");
     83        if(flag) _pprintString_(indent << "      vrefmode: \"" << vrefmode << "\"" << "\n");
     84        if(flag) _pprintString_(indent << "      vreftime: " << vreftime << "\n");
     85        if(flag) _pprintString_(indent << "      vboundsc: " << vboundsc << "\n");
     86        if(flag) _pprintString_(indent << "       vformat: \"" << vformat << "\"" << "\n");
     87        if(flag) _pprintString_(indent << "        hquery: \"" << hquery << "\"" << "\n");
    8888
    8989        return;

  • issm/trunk-jpl/src/c/kml/KML_LatLonBox.cpp

    r15068 r15099  
    4040void  KML_LatLonBox::Echo(){
    4141
    42         _printLine_("KML_LatLonBox:");
     42        _printString_("KML_LatLonBox:" << "\n");
    4343        KML_Object::Echo();
    4444
    45         _printLine_("         north: " << north);
    46         _printLine_("         south: " << south);
    47         _printLine_("          east: " << east);
    48         _printLine_("          west: " << west);
    49         _printLine_("      rotation: " << rotation);
     45        _printString_("         north: " << north << "\n");
     46        _printString_("         south: " << south << "\n");
     47        _printString_("          east: " << east << "\n");
     48        _printString_("          west: " << west << "\n");
     49        _printString_("      rotation: " << rotation << "\n");
    5050}
    5151/*}}}*/
    … …  
    6363void  KML_LatLonBox::DeepEcho(const char* indent){
    6464
    65         _printLine_(indent << "KML_LatLonBox:");
     65        _printString_(indent << "KML_LatLonBox:" << "\n");
    6666        KML_Object::DeepEcho(indent);
    6767
    68         _printLine_("         north: " << north);
    69         _printLine_("         south: " << south);
    70         _printLine_("          east: " << east);
    71         _printLine_("          west: " << west);
    72         _printLine_("      rotation: " << rotation);
     68        _printString_("         north: " << north << "\n");
     69        _printString_("         south: " << south << "\n");
     70        _printString_("          east: " << east << "\n");
     71        _printString_("          west: " << west << "\n");
     72        _printString_("      rotation: " << rotation << "\n");
    7373}
    7474/*}}}*/

  • issm/trunk-jpl/src/c/kml/KML_LineString.cpp

    r15069 r15099  
    4646        bool  flag=true;
    4747
    48         if(flag) _pprintLine_("KML_LineString:");
     48        if(flag) _pprintString_("KML_LineString:" << "\n");
    4949        KML_Geometry::Echo();
    5050
    51         if(flag) _pprintLine_("       extrude: " << (extrude ? "true" : "false"));
    52         if(flag) _pprintLine_("    tessellate: " << (tessellate ? "true" : "false"));
    53         if(flag) _pprintLine_("       altmode: \"" << altmode << "\"");
    54         if(flag) _pprintLine_("        coords: (ncoord=" << ncoord << ")");
     51        if(flag) _pprintString_("       extrude: " << (extrude ? "true" : "false") << "\n");
     52        if(flag) _pprintString_("    tessellate: " << (tessellate ? "true" : "false") << "\n");
     53        if(flag) _pprintString_("       altmode: \"" << altmode << "\"" << "\n");
     54        if(flag) _pprintString_("        coords: (ncoord=" << ncoord << ")" << "\n");
    5555
    5656        return;
    … …  
    7373        bool  flag=true;
    7474
    75         if(flag) _pprintLine_(indent << "KML_LineString:");
     75        if(flag) _pprintString_(indent << "KML_LineString:" << "\n");
    7676        KML_Geometry::DeepEcho(indent);
    7777
    78         if(flag) _pprintLine_(indent << "       extrude: " << (extrude ? "true" : "false"));
    79         if(flag) _pprintLine_(indent << "    tessellate: " << (tessellate ? "true" : "false"));
    80         if(flag) _pprintLine_(indent << "       altmode: \"" << altmode << "\"");
    81         if(flag) _pprintLine_(indent << "        coords: (ncoord=" << ncoord << ")");
     78        if(flag) _pprintString_(indent << "       extrude: " << (extrude ? "true" : "false") << "\n");
     79        if(flag) _pprintString_(indent << "    tessellate: " << (tessellate ? "true" : "false") << "\n");
     80        if(flag) _pprintString_(indent << "       altmode: \"" << altmode << "\"" << "\n");
     81        if(flag) _pprintString_(indent << "        coords: (ncoord=" << ncoord << ")" << "\n");
    8282        for (i=0; i<ncoord; i++)
    83                 if(flag) _pprintLine_(indent << "                (" << coords[3*i+0] << "," << coords[3*i+1] << "," << coords[3*i+2] << ")");
     83                if(flag) _pprintString_(indent << "                (" << coords[3*i+0] << "," << coords[3*i+1] << "," << coords[3*i+2] << ")" << "\n");
    8484
    8585        return;

  • issm/trunk-jpl/src/c/kml/KML_LineStyle.cpp

    r15068 r15099  
    3838        bool  flag=true;
    3939
    40         if(flag) _pprintLine_("KML_LineStyle:");
     40        if(flag) _pprintString_("KML_LineStyle:" << "\n");
    4141        KML_ColorStyle::Echo();
    4242
    43         if(flag) _pprintLine_("         width: " << width);
     43        if(flag) _pprintString_("         width: " << width << "\n");
    4444
    4545        return;
    … …  
    6161        bool  flag=true;
    6262
    63         if(flag) _pprintLine_(indent << "KML_LineStyle:");
     63        if(flag) _pprintString_(indent << "KML_LineStyle:" << "\n");
    6464        KML_ColorStyle::DeepEcho(indent);
    6565
    66         if(flag) _pprintLine_(indent << "         width: " << width);
     66        if(flag) _pprintString_(indent << "         width: " << width << "\n");
    6767
    6868        return;

  • issm/trunk-jpl/src/c/kml/KML_LinearRing.cpp

    r15097 r15099  
    4646        bool  flag=true;
    4747
    48         if(flag) _pprintLine_("KML_LinearRing:");
     48        if(flag) _pprintString_("KML_LinearRing:" << "\n");
    4949        KML_Geometry::Echo();
    5050
    51         if(flag) _pprintLine_("       extrude: " << (extrude ? "true" : "false"));
    52         if(flag) _pprintLine_("    tessellate: " << (tessellate ? "true" : "false"));
    53         if(flag) _pprintLine_("       altmode: \"" << altmode << "\"");
    54         if(flag) _pprintLine_("        coords: (ncoord=" << ncoord << ")");
     51        if(flag) _pprintString_("       extrude: " << (extrude ? "true" : "false") << "\n");
     52        if(flag) _pprintString_("    tessellate: " << (tessellate ? "true" : "false") << "\n");
     53        if(flag) _pprintString_("       altmode: \"" << altmode << "\"" << "\n");
     54        if(flag) _pprintString_("        coords: (ncoord=" << ncoord << ")" << "\n");
    5555
    5656        return;
    … …  
    7373        bool  flag=true;
    7474
    75         if(flag) _pprintLine_(indent << "KML_LinearRing:");
     75        if(flag) _pprintString_(indent << "KML_LinearRing:" << "\n");
    7676        KML_Geometry::DeepEcho(indent);
    7777
    78         if(flag) _pprintLine_(indent << "       extrude: " << (extrude ? "true" : "false"));
    79         if(flag) _pprintLine_(indent << "    tessellate: " << (tessellate ? "true" : "false"));
    80         if(flag) _pprintLine_(indent << "       altmode: \"" << altmode << "\"");
    81         if(flag) _pprintLine_(indent << "        coords: (ncoord=" << ncoord << ")");
     78        if(flag) _pprintString_(indent << "       extrude: " << (extrude ? "true" : "false") << "\n");
     79        if(flag) _pprintString_(indent << "    tessellate: " << (tessellate ? "true" : "false") << "\n");
     80        if(flag) _pprintString_(indent << "       altmode: \"" << altmode << "\"" << "\n");
     81        if(flag) _pprintString_(indent << "        coords: (ncoord=" << ncoord << ")" << "\n");
    8282        for (i=0; i<ncoord; i++)
    83                 if(flag)_printLine_(indent << "                (" <<coords[3*i+0] << "," <<coords[3*i+1] << "," <<coords[3*i+2] << ")\n");
     83                if(flag)_printString_(indent << "                (" <<coords[3*i+0] << "," <<coords[3*i+1] << "," <<coords[3*i+2] << ")\n" << "\n");
    8484
    8585        return;

  • issm/trunk-jpl/src/c/kml/KML_MultiGeometry.cpp

    r15068 r15099  
    4646        bool  flag=true;
    4747
    48         if(flag) _pprintLine_("KML_Multigeometry:");
     48        if(flag) _pprintString_("KML_Multigeometry:" << "\n");
    4949        KML_Geometry::Echo();
    5050
    51         if(flag) _pprintLine_("      geometry: (size=" << geometry->Size() << ")");
     51        if(flag) _pprintString_("      geometry: (size=" << geometry->Size() << ")" << "\n");
    5252
    5353        return;
    … …  
    7171        bool  flag=true;
    7272
    73         if(flag) _pprintLine_(indent << "KML_Multigeometry:");
     73        if(flag) _pprintString_(indent << "KML_Multigeometry:" << "\n");
    7474        KML_Geometry::DeepEcho(indent);
    7575
    … …  
    8181        if (geometry->Size())
    8282                for (i=0; i<geometry->Size(); i++) {
    83                         if(flag) _pprintLine_(indent << "      geometry: -------- begin [" << i << "] --------");
     83                        if(flag) _pprintString_(indent << "      geometry: -------- begin [" << i << "] --------" << "\n");
    8484                        ((KML_Geometry *)geometry->GetObjectByOffset(i))->DeepEcho(indent2);
    85                         if(flag) _pprintLine_(indent << "      geometry: --------  end  [" << i << "] --------");
     85                        if(flag) _pprintString_(indent << "      geometry: --------  end  [" << i << "] --------" << "\n");
    8686                }
    8787        else
    88                 if(flag) _pprintLine_(indent << "      geometry: [empty]");
     88                if(flag) _pprintString_(indent << "      geometry: [empty]" << "\n");
    8989
    9090        return;

  • issm/trunk-jpl/src/c/kml/KML_Object.cpp

    r15068 r15099  
    6666        bool  flag=true;
    6767
    68         if(flag) _pprintLine_("        attrib: (size=" << attrib->Size() << ")");
    69         if(flag) _pprintLine_("        commnt: (size=" << commnt->Size() << ")");
    70         if(flag) _pprintLine_("        kmlobj: (size=" << kmlobj->Size() << ")");
     68        if(flag) _pprintString_("        attrib: (size=" << attrib->Size() << ")" << "\n");
     69        if(flag) _pprintString_("        commnt: (size=" << commnt->Size() << ")" << "\n");
     70        if(flag) _pprintString_("        kmlobj: (size=" << kmlobj->Size() << ")" << "\n");
    7171
    7272        return;
    … …  
    9797                }
    9898        else
    99                 if(flag) _pprintLine_(indent << "        attrib: [empty]");
     99                if(flag) _pprintString_(indent << "        attrib: [empty]" << "\n");
    100100
    101101/*  loop over the comments for the object  */
    … …  
    106106                }
    107107        else
    108                 if(flag) _pprintLine_(indent << "        commnt: [empty]");
     108                if(flag) _pprintString_(indent << "        commnt: [empty]" << "\n");
    109109
    110110/*  loop over the unknown objects for the object  */
    … …  
    115115        if (kmlobj->Size())
    116116                for (i=0; i<kmlobj->Size(); i++) {
    117             if(flag) _pprintLine_(indent << "        kmlobj: -------- begin [" << i << "] --------");
     117            if(flag) _pprintString_(indent << "        kmlobj: -------- begin [" << i << "] --------" << "\n");
    118118                        ((KML_Unknown *)kmlobj->GetObjectByOffset(i))->DeepEcho(indent2);
    119             if(flag) _pprintLine_(indent << "        kmlobj: --------  end  [" << i << "] --------");
     119            if(flag) _pprintString_(indent << "        kmlobj: --------  end  [" << i << "] --------" << "\n");
    120120                }
    121121        else
    122                 if(flag) _pprintLine_(indent << "        kmlobj: [empty]");
     122                if(flag) _pprintString_(indent << "        kmlobj: [empty]" << "\n");
    123123
    124124        return;
    … …  
    264264
    265265        else if (!strncmp(kstr,"<",1)) {
    266                 _pprintLine_("KML_Object::Read -- Unrecognized opening tag " << kstr << ".");
     266                _pprintString_("KML_Object::Read -- Unrecognized opening tag " << kstr << "." << "\n");
    267267//              KMLFileTagSkip(kstr,
    268268//                                         fid);

  • issm/trunk-jpl/src/c/kml/KML_Overlay.cpp

    r15068 r15099  
    4545
    4646        KML_Feature::Echo();
    47         _pprintLine_("         color: \"" << color << "\"");
    48         _pprintLine_("       draword: " << draword);
    49         _pprintLine_("          icon: " << icon);
     47        _pprintString_("         color: \"" << color << "\"" << "\n");
     48        _pprintString_("       draword: " << draword << "\n");
     49        _pprintString_("          icon: " << icon << "\n");
    5050}
    5151/*}}}*/
    … …  
    6969        strcat(indent2,"  ");
    7070
    71         _pprintLine_(indent << "         color: " << color);
    72         _pprintLine_(indent << "       draword: " << draword);
     71        _pprintString_(indent << "         color: " << color << "\n");
     72        _pprintString_(indent << "       draword: " << draword << "\n");
    7373        if (icon)
    7474                icon->DeepEcho(indent2);
    7575        else
    76                 _pprintLine_(indent << "          icon: " << icon);
     76                _pprintString_(indent << "          icon: " << icon << "\n");
    7777}
    7878/*}}}*/

  • issm/trunk-jpl/src/c/kml/KML_Placemark.cpp

    r15068 r15099  
    4747        bool  flag=true;
    4848
    49         if(flag) _pprintLine_("KML_Placemark:");
     49        if(flag) _pprintString_("KML_Placemark:" << "\n");
    5050        KML_Feature::Echo();
    5151
    52         if(flag) _pprintLine_("      geometry: (size=" << geometry->Size() << ")");
     52        if(flag) _pprintString_("      geometry: (size=" << geometry->Size() << ")" << "\n");
    5353
    5454        return;
    … …  
    7272        bool  flag=true;
    7373
    74         if(flag) _pprintLine_(indent << "KML_Placemark:");
     74        if(flag) _pprintString_(indent << "KML_Placemark:" << "\n");
    7575        KML_Feature::DeepEcho(indent);
    7676
    … …  
    8282        if (geometry->Size())
    8383                for (i=0; i<geometry->Size(); i++) {
    84                         if(flag) _pprintLine_(indent << "      geometry: -------- begin [" << i << "] --------");
     84                        if(flag) _pprintString_(indent << "      geometry: -------- begin [" << i << "] --------" << "\n");
    8585                        ((KML_Geometry *)geometry->GetObjectByOffset(i))->DeepEcho(indent2);
    86                         if(flag) _pprintLine_(indent << "      geometry: --------  end  [" << i << "] --------");
     86                        if(flag) _pprintString_(indent << "      geometry: --------  end  [" << i << "] --------" << "\n");
    8787                }
    8888        else
    89                 if(flag) _pprintLine_(indent << "      geometry: [empty]");
     89                if(flag) _pprintString_(indent << "      geometry: [empty]" << "\n");
    9090
    9191        return;

  • issm/trunk-jpl/src/c/kml/KML_Point.cpp

    r15069 r15099  
    4343        bool  flag=true;
    4444
    45         if(flag) _pprintLine_("KML_Point:");
     45        if(flag) _pprintString_("KML_Point:" << "\n");
    4646        KML_Geometry::Echo();
    4747
    48         if(flag) _pprintLine_("       extrude: " << (extrude ? "true" : "false"));
    49         if(flag) _pprintLine_("       altmode: \"" << altmode << "\"");
    50         if(flag) _pprintLine_("        coords: (" << coords[0] << "," << coords[1] << "," << coords[2] << ")");
     48        if(flag) _pprintString_("       extrude: " << (extrude ? "true" : "false") << "\n");
     49        if(flag) _pprintString_("       altmode: \"" << altmode << "\"" << "\n");
     50        if(flag) _pprintString_("        coords: (" << coords[0] << "," << coords[1] << "," << coords[2] << ")" << "\n");
    5151
    5252        return;
    … …  
    6868        bool  flag=true;
    6969
    70         if(flag) _pprintLine_(indent << "KML_Point:");
     70        if(flag) _pprintString_(indent << "KML_Point:" << "\n");
    7171        KML_Geometry::DeepEcho(indent);
    7272
    73         if(flag) _pprintLine_(indent << "       extrude: " << (extrude ? "true" : "false"));
    74         if(flag) _pprintLine_(indent << "       altmode: \"" << altmode << "\"");
    75         if(flag) _pprintLine_(indent << "        coords: (" << coords[0] << "," << coords[1] << "," << coords[2] << ")");
     73        if(flag) _pprintString_(indent << "       extrude: " << (extrude ? "true" : "false") << "\n");
     74        if(flag) _pprintString_(indent << "       altmode: \"" << altmode << "\"" << "\n");
     75        if(flag) _pprintString_(indent << "        coords: (" << coords[0] << "," << coords[1] << "," << coords[2] << ")" << "\n");
    7676
    7777        return;

  • issm/trunk-jpl/src/c/kml/KML_PolyStyle.cpp

    r15068 r15099  
    4141        bool  flag=true;
    4242
    43         if(flag) _pprintLine_("KML_PolyStyle:");
     43        if(flag) _pprintString_("KML_PolyStyle:" << "\n");
    4444        KML_ColorStyle::Echo();
    4545
    46         if(flag) _pprintLine_("          fill: " << fill);
    47         if(flag) _pprintLine_("       outline: " << outline);
     46        if(flag) _pprintString_("          fill: " << fill << "\n");
     47        if(flag) _pprintString_("       outline: " << outline << "\n");
    4848
    4949        return;
    … …  
    6565        bool  flag=true;
    6666
    67         if(flag) _pprintLine_(indent << "KML_PolyStyle:");
     67        if(flag) _pprintString_(indent << "KML_PolyStyle:" << "\n");
    6868        KML_ColorStyle::DeepEcho(indent);
    6969
    70         if(flag) _pprintLine_(indent << "          fill: " << fill);
    71         if(flag) _pprintLine_(indent << "       outline: " << outline);
     70        if(flag) _pprintString_(indent << "          fill: " << fill << "\n");
     71        if(flag) _pprintString_(indent << "       outline: " << outline << "\n");
    7272
    7373        return;

  • issm/trunk-jpl/src/c/kml/KML_Polygon.cpp

    r15068 r15099  
    5252        bool  flag=true;
    5353
    54         if(flag) _pprintLine_("KML_Polygon:");
     54        if(flag) _pprintString_("KML_Polygon:" << "\n");
    5555        KML_Geometry::Echo();
    5656
    57         if(flag) _pprintLine_("       extrude: " << (extrude ? "true" : "false"));
    58         if(flag) _pprintLine_("    tessellate: " << (tessellate ? "true" : "false"));
    59         if(flag) _pprintLine_("       altmode: \"" << altmode << "\"");
    60         if(flag) _pprintLine_("         outer: (size=" << outer->Size() << ")");
    61         if(flag) _pprintLine_("         inner: (size=" << inner->Size() << ")");
     57        if(flag) _pprintString_("       extrude: " << (extrude ? "true" : "false") << "\n");
     58        if(flag) _pprintString_("    tessellate: " << (tessellate ? "true" : "false") << "\n");
     59        if(flag) _pprintString_("       altmode: \"" << altmode << "\"" << "\n");
     60        if(flag) _pprintString_("         outer: (size=" << outer->Size() << ")" << "\n");
     61        if(flag) _pprintString_("         inner: (size=" << inner->Size() << ")" << "\n");
    6262
    6363        return;
    … …  
    8181        bool  flag=true;
    8282
    83         if(flag) _pprintLine_(indent << "KML_Polygon:");
     83        if(flag) _pprintString_(indent << "KML_Polygon:" << "\n");
    8484        KML_Geometry::DeepEcho(indent);
    8585
    86         if(flag) _pprintLine_(indent << "       extrude: " << (extrude ? "true" : "false"));
    87         if(flag) _pprintLine_(indent << "    tessellate: " << (tessellate ? "true" : "false"));
    88         if(flag) _pprintLine_(indent << "       altmode: \"" << altmode << "\"");
     86        if(flag) _pprintString_(indent << "       extrude: " << (extrude ? "true" : "false") << "\n");
     87        if(flag) _pprintString_(indent << "    tessellate: " << (tessellate ? "true" : "false") << "\n");
     88        if(flag) _pprintString_(indent << "       altmode: \"" << altmode << "\"" << "\n");
    8989
    9090        memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char));
    … …  
    9393        if (outer->Size())
    9494                for (i=0; i<outer->Size(); i++) {
    95                         if(flag) _pprintLine_(indent << "         outer: -------- begin [" << i << "] --------");
     95                        if(flag) _pprintString_(indent << "         outer: -------- begin [" << i << "] --------" << "\n");
    9696                        ((KML_LinearRing *)outer->GetObjectByOffset(i))->DeepEcho(indent2);
    97                         if(flag) _pprintLine_(indent << "         outer: --------  end  [" << i << "] --------");
     97                        if(flag) _pprintString_(indent << "         outer: --------  end  [" << i << "] --------" << "\n");
    9898                }
    9999        else
    100                 if(flag) _pprintLine_(indent << "         outer: [empty]");
     100                if(flag) _pprintString_(indent << "         outer: [empty]" << "\n");
    101101
    102102        if (inner->Size())
    103103                for (i=0; i<inner->Size(); i++) {
    104                         if(flag) _pprintLine_(indent << "         inner: -------- begin [" << i << "] --------");
     104                        if(flag) _pprintString_(indent << "         inner: -------- begin [" << i << "] --------" << "\n");
    105105                        ((KML_LinearRing *)inner->GetObjectByOffset(i))->DeepEcho(indent2);
    106                         if(flag) _pprintLine_(indent << "         inner: --------  end  [" << i << "] --------");
     106                        if(flag) _pprintString_(indent << "         inner: --------  end  [" << i << "] --------" << "\n");
    107107                }
    108108        else
    109                 if(flag) _pprintLine_(indent << "         inner: [empty]");
     109                if(flag) _pprintString_(indent << "         inner: [empty]" << "\n");
    110110
    111111        return;

  • issm/trunk-jpl/src/c/kml/KML_Style.cpp

    r15068 r15099  
    6868        bool  flag=true;
    6969
    70         if(flag) _pprintLine_("KML_Style:");
     70        if(flag) _pprintString_("KML_Style:" << "\n");
    7171        KML_StyleSelector::Echo();
    7272
    73         if(flag) _pprintLine_("          icon: " << icon);
    74         if(flag) _pprintLine_("         label: " << label);
    75         if(flag) _pprintLine_("          line: " << line);
    76         if(flag) _pprintLine_("          poly: " << poly);
    77         if(flag) _pprintLine_("       balloon: " << balloon);
    78         if(flag) _pprintLine_("          list: " << list);
     73        if(flag) _pprintString_("          icon: " << icon << "\n");
     74        if(flag) _pprintString_("         label: " << label << "\n");
     75        if(flag) _pprintString_("          line: " << line << "\n");
     76        if(flag) _pprintString_("          poly: " << poly << "\n");
     77        if(flag) _pprintString_("       balloon: " << balloon << "\n");
     78        if(flag) _pprintString_("          list: " << list << "\n");
    7979
    8080        return;
    … …  
    9797        bool  flag=true;
    9898
    99         if(flag) _pprintLine_(indent << "KML_Style:");
     99        if(flag) _pprintString_(indent << "KML_Style:" << "\n");
    100100        KML_StyleSelector::DeepEcho(indent);
    101101
    … …  
    106106//              icon->DeepEcho(indent2);
    107107//      else
    108                 if(flag) _pprintLine_(indent << "          icon: " << icon);
     108                if(flag) _pprintString_(indent << "          icon: " << icon << "\n");
    109109//      if (label)
    110110//              label->DeepEcho(indent2);
    111111//      else
    112                 if(flag) _pprintLine_(indent << "         label: " << label);
     112                if(flag) _pprintString_(indent << "         label: " << label << "\n");
    113113        if (line)
    114114                line->DeepEcho(indent2);
    115115        else
    116                 if(flag) _pprintLine_(indent << "          line: " << line);
     116                if(flag) _pprintString_(indent << "          line: " << line << "\n");
    117117        if (poly)
    118118                poly->DeepEcho(indent2);
    119119        else
    120                 if(flag) _pprintLine_(indent << "          poly: " << poly);
     120                if(flag) _pprintString_(indent << "          poly: " << poly << "\n");
    121121//      if (balloon)
    122122//              balloon->DeepEcho(indent2);
    123123//      else
    124                 if(flag) _pprintLine_(indent << "       balloon: " << balloon);
     124                if(flag) _pprintString_(indent << "       balloon: " << balloon << "\n");
    125125//      if (list)
    126126//              list->DeepEcho(indent2);
    127127//      else
    128                 if(flag) _pprintLine_(indent << "          list: " << list);
     128                if(flag) _pprintString_(indent << "          list: " << list << "\n");
    129129
    130130        return;

  • issm/trunk-jpl/src/c/kml/KML_Unknown.cpp

    r15068 r15099  
    4040        bool  flag=true;
    4141
    42         if(flag) _pprintLine_("KML_Unknown " << name << ":");
     42        if(flag) _pprintString_("KML_Unknown " << name << ":" << "\n");
    4343        KML_Object::Echo();
    4444
    4545        if (value     )
    46                 if(flag) _pprintLine_("         value: \"" << value << "\"");
     46                if(flag) _pprintString_("         value: \"" << value << "\"" << "\n");
    4747    else
    48         if(flag) _pprintLine_("         value: [none]");
     48        if(flag) _pprintString_("         value: [none]" << "\n");
    4949
    5050        return;
    … …  
    6969        bool         flag=true;
    7070
    71         if(flag) _pprintLine_(indent << "KML_Unknown " << name << ":");
     71        if(flag) _pprintString_(indent << "KML_Unknown " << name << ":" << "\n");
    7272        KML_Object::DeepEcho(indent);
    7373
    … …  
    8181                while (vtoken=strtok(NULL,nl))
    8282                        if(flag) _pprintString_("\n" << indent << "                 " << vtoken);
    83                 if(flag) _pprintLine_("\"");
     83                if(flag) _pprintString_("\"" << "\n");
    8484
    8585                xDelete<char>(valuei);
    8686        }
    8787    else
    88         if(flag) _pprintLine_(indent << "         value: [none]");
     88        if(flag) _pprintString_(indent << "         value: [none]" << "\n");
    8989
    9090        return;
    … …  
    136136        name=KMLFileTagName(NULL,
    137137                                                kstr);
    138 //      _pprintLine_("KML_Unknown::Read -- opening name=" << name << ".");
     138//      _pprintString_("KML_Unknown::Read -- opening name=" << name << "." << "\n");
    139139
    140140/*  get object attributes and check for solo tag  */
    … …  
    148148        while (kstri=KMLFileToken(fid,
    149149                                                          &ncom,&pcom)) {
    150 //              _pprintLine_("KML_Unknown::Read -- kstri=" << kstri << ".");
     150//              _pprintString_("KML_Unknown::Read -- kstri=" << kstri << "." << "\n");
    151151                if      (!strncmp(&kstri[0],"</", 2) &&
    152152                                 !strncmp(&kstri[2],name,strlen(name))) {
    153 //                      _pprintLine_("KML_Unknown::Read -- closing name=" << name << ".");
     153//                      _pprintString_("KML_Unknown::Read -- closing name=" << name << "." << "\n");
    154154                        xDelete<char>(kstri);
    155155                        break;

  • issm/trunk-jpl/src/c/main/kriging.cpp

    r14921 r15099  
    5151        pfclose(input_fid,binfilename);
    5252
    53         _pprintLine_("call computational core:");
     53        _pprintString_("call computational core:" << "\n");
    5454        pKrigingx(&predictions,&error,x,y,data,nobs,x_interp,y_interp,ninterp,options);
    5555
    56         _pprintLine_("write results to disk:");
     56        _pprintString_("write results to disk:" << "\n");
    5757        Results *results = new Results();
    5858        if(IssmComm::GetRank()==0){
    … …  
    6868
    6969        /*Close output and toolkits options file and write lock file if requested*/
    70         _pprintLine_("write lock file:");
     70        _pprintString_("write lock file:" << "\n");
    7171        WriteLockFile(lockfilename);
    7272

  • issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp

    r15061 r15099  
    4040
    4141                //Step1: generate geometry Gh
    42                 if (verbosity>0) _printLine_("Construction of a mesh from a given geometry");
    43                 if (verbosity>1) _printLine_("   Processing geometry...");
     42                if (verbosity>0) _printString_("Construction of a mesh from a given geometry" << "\n");
     43                if (verbosity>1) _printString_("   Processing geometry..." << "\n");
    4444                Geometry Gh(bamggeom_in,bamgopts);
    4545
    … …  
    4949
    5050                //build metric using geometry
    51                 if (verbosity>1) _printLine_("   Generating Metric...");
     51                if (verbosity>1) _printString_("   Generating Metric..." << "\n");
    5252                for(i=0;i<Gh.nbv;i++){
    5353                        Metric M=Gh[i];
    … …  
    5959
    6060                //generate mesh
    61                 if (verbosity>1) _printLine_("   Generating Mesh...");
     61                if (verbosity>1) _printString_("   Generating Mesh..." << "\n");
    6262                Mesh Th(maxnbv,Gh,bamgopts);
    6363
    … …  
    7272
    7373                //Build output
    74                 if (verbosity>1) _printLine_("   Write Mesh...");
     74                if (verbosity>1) _printString_("   Write Mesh..." << "\n");
    7575                Th.WriteMesh(bamgmesh_out,bamgopts);
    76                 if (verbosity>1) _printLine_("   Write Geometry...");
     76                if (verbosity>1) _printString_("   Write Geometry..." << "\n");
    7777                Gh.WriteGeometry(bamggeom_out,bamgopts);
    7878
    … …  
    8686
    8787                // read background mesh
    88                 if (verbosity>0) _printLine_("Anisotropic mesh adaptation");
    89                 if (verbosity>1) _printLine_("   Processing initial mesh and geometry...");
     88                if (verbosity>0) _printString_("Anisotropic mesh adaptation" << "\n");
     89                if (verbosity>1) _printString_("   Processing initial mesh and geometry..." << "\n");
    9090                Mesh BTh(bamggeom_in,bamgmesh_in,bamgopts);
    9191
    … …  
    9999                //Generate initial metric
    100100                if (bamgopts->metric){
    101                         if (verbosity>1) _printLine_("   Processing Metric...");
     101                        if (verbosity>1) _printString_("   Processing Metric..." << "\n");
    102102                        BTh.ReadMetric(bamgopts);
    103103                }
    104104                else {
    105                         if (verbosity>1) _printLine_("   Generating initial Metric...");
     105                        if (verbosity>1) _printString_("   Generating initial Metric..." << "\n");
    106106                        Metric Mhmax(bamgopts->hmax);
    107107                        for (int iv=0;iv<BTh.nbv;iv++) BTh[iv].m = Mhmax;
    … …  
    110110                //use present fields to generate metric if present
    111111                if (bamgopts->field){
    112                         if (verbosity>1) _printLine_("   Merge metric with field provided...");
     112                        if (verbosity>1) _printString_("   Merge metric with field provided..." << "\n");
    113113                        BTh.AddMetric(bamgopts);
    114114                }
    … …  
    116116                // change using hVertices if provided
    117117                if(bamgopts->hVertices && bamgopts->hVerticesSize[0]==BTh.nbv){
    118                         if (verbosity>1) _printLine_("   Merging Metric with hVertices...");
     118                        if (verbosity>1) _printString_("   Merging Metric with hVertices..." << "\n");
    119119                        for (i=0;i<BTh.nbv;i++){
    120120                                if (!xIsNan<IssmPDouble>(bamgopts->hVertices[i])){
    … …  
    126126                // change using hminVertices if provided
    127127                if (bamgopts->hminVertices){
    128                         if (verbosity>1) _printLine_("   Merging Metric with hminVertices...");
     128                        if (verbosity>1) _printString_("   Merging Metric with hminVertices..." << "\n");
    129129                        for (i=0;i<BTh.nbv;i++){
    130130                                if (!xIsNan<IssmPDouble>(bamgopts->hminVertices[i])){
    … …  
    139139                // change using hmaxVertices if provided
    140140                if (bamgopts->hmaxVertices){
    141                         if (verbosity>1) _printLine_("   Merging Metric with hmaxVertices...");
     141                        if (verbosity>1) _printString_("   Merging Metric with hmaxVertices..." << "\n");
    142142                        for (i=0;i<BTh.nbv;i++){
    143143                                if (!xIsNan<IssmPDouble>(bamgopts->hmaxVertices[i])){
    … …  
    163163
    164164                //Build new mesh
    165                 if (verbosity>1) _printLine_("   Generating Mesh...");
     165                if (verbosity>1) _printString_("   Generating Mesh..." << "\n");
    166166                Thr=&BTh,Thb=0;
    167167                Mesh & Th( *(0 ?  new Mesh(*Thr,&Thr->Gh,Thb,maxnbv) :  new Mesh(maxnbv,BTh,bamgopts,bamgopts->KeepVertices)));
    … …  
    184184                if(verbosity>0) {
    185185                        if (Th.nbt-Th.nbtout-Th.nbq*2){
    186                                 _printLine_("   new number of triangles = " << (Th.nbt-Th.nbtout-Th.nbq*2));
     186                                _printString_("   new number of triangles = " << (Th.nbt-Th.nbtout-Th.nbq*2) << "\n");
    187187                        }
    188188                        if (Th.nbq ){
    189                                 _printLine_("   new number of quads = " << Th.nbq);
     189                                _printString_("   new number of quads = " << Th.nbq << "\n");
    190190                        }
    191191                }
    192192
    193193                //Build output
    194                 if (verbosity>1) _printLine_("   Write Mesh...");
     194                if (verbosity>1) _printString_("   Write Mesh..." << "\n");
    195195                Th.WriteMesh(bamgmesh_out,bamgopts);
    196                 if (verbosity>1) _printLine_("   Write Geometry...");
     196                if (verbosity>1) _printString_("   Write Geometry..." << "\n");
    197197                Th.Gh.WriteGeometry(bamggeom_out,bamgopts);
    198                 if (verbosity>1) _printLine_("   Write Metric...");
     198                if (verbosity>1) _printString_("   Write Metric..." << "\n");
    199199                BTh.WriteMetric(bamgopts);
    200200
    … …  
    206206
    207207        /*No error return*/
    208         if (verbosity>1) _printLine_("   Exiting Bamg.");
     208        if (verbosity>1) _printString_("   Exiting Bamg." << "\n");
    209209        return noerr;
    210210

  • issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp

    r14644 r15099  
    6363
    6464        if (DEBUG_TRACE > 0) {
    65                 _printLine_("<Entering main>");
     65                _printString_("<Entering main>" << "\n");
    6666        }
    6767
    6868        if (PRINT_HEADERS) {
    69                 _printLine_("\n                    Chaco 2.0");
    70                 _printLine_("          Sandia National Laboratories\n");
     69                _printString_("\n                    Chaco 2.0" << "\n");
     70                _printString_("          Sandia National Laboratories\n" << "\n");
    7171        }
    7272
    … …  
    166166
    167167        if (DEBUG_MEMORY > 0) {
    168                 _printLine_("");
     168                _printString_("" << "\n");
    169169                smalloc_stats();
    170170        }
    … …  
    174174
    175175        if (DEBUG_TRACE > 1) {
    176                 _printLine_("<Leaving main>");
     176                _printString_("<Leaving main>" << "\n");
    177177        }
    178178

  • issm/trunk-jpl/src/c/modules/Chacox/input_parse.cpp

    r14634 r15099  
    3737
    3838        if (DEBUG_TRACE > 0) {
    39                 _printLine_("<Entering input_parse>");
     39                _printString_("<Entering input_parse>" << "\n");
    4040        }
    4141
    4242        if (PROMPT) {
    43                 _printLine_("Parallel machine architecture:");
    44                 _printLine_("  (0) Hypercube");
    45                 _printLine_("  (1) One-dimensional mesh");
    46                 _printLine_("  (2) Two-dimensional mesh");
    47                 _printLine_("  (3) Three-dimensional mesh");
     43                _printString_("Parallel machine architecture:" << "\n");
     44                _printString_("  (0) Hypercube" << "\n");
     45                _printString_("  (1) One-dimensional mesh" << "\n");
     46                _printString_("  (2) Two-dimensional mesh" << "\n");
     47                _printString_("  (3) Three-dimensional mesh" << "\n");
    4848        }
    4949        *architecture = (int)options[OPT_ARCH];
    … …  
    7373        else {
    7474                if (PROMPT) {
    75                         _printLine_("Global partitioning method:");
    76                         _printLine_("  (1) Multilevel-KL");
    77                         _printLine_("  (2) Spectral");
    78                         _printLine_("  (3) Inertial");
    79                         _printLine_("  (4) Linear");
    80                         _printLine_("  (5) Random");
    81                         _printLine_("  (6) Scattered");
    82                         _printLine_("  (7) Read-from-file");
     75                        _printString_("Global partitioning method:" << "\n");
     76                        _printString_("  (1) Multilevel-KL" << "\n");
     77                        _printString_("  (2) Spectral" << "\n");
     78                        _printString_("  (3) Inertial" << "\n");
     79                        _printString_("  (4) Linear" << "\n");
     80                        _printString_("  (5) Random" << "\n");
     81                        _printString_("  (6) Scattered" << "\n");
     82                        _printString_("  (7) Read-from-file" << "\n");
    8383                }
    8484                *global_method = (int)options[OPT_GLOBAL];
    … …  
    101101        else if (*global_method == 2) {
    102102                if (PROMPT) {
    103                         _printLine_("Eigensolver:");
    104                         _printLine_("  (1) Multilevel RQI/Symmlq");
    105                         _printLine_("  (2) Lanczos");
     103                        _printString_("Eigensolver:" << "\n");
     104                        _printString_("  (1) Multilevel RQI/Symmlq" << "\n");
     105                        _printString_("  (2) Lanczos" << "\n");
    106106                }
    107107                eigensolver = (int)options[OPT_RQI];
    … …  
    162162        else {
    163163                if (PROMPT) {
    164                         _printLine_("Local refinement method:");
    165                         _printLine_("  (1) Kernighan-Lin");
    166                         _printLine_("  (2) None");
     164                        _printString_("Local refinement method:" << "\n");
     165                        _printString_("  (1) Kernighan-Lin" << "\n");
     166                        _printString_("  (2) None" << "\n");
    167167                }
    168168                *local_method = (int)options[OPT_LOCAL];
    … …  
    181181                *ndims_tot = nparts[0];
    182182                if (*ndims_tot < 1) {
    183                         _printLine_(" Number of divisions must be at least 1");
     183                        _printString_(" Number of divisions must be at least 1" << "\n");
    184184                        printf("%s -- Number of divisions %d must be at least 1.\n",
    185185                                   __FUNCT__,nparts[0]);
    … …  
    220220        else if (*nprocs <= 7) {
    221221                if (PROMPT) {
    222                         _printLine_("Partitioning dimension: ");
    223                         _printLine_("  (1) Bisection");
    224                         _printLine_("  (2) Quadrisection");
     222                        _printString_("Partitioning dimension: " << "\n");
     223                        _printString_("  (1) Bisection" << "\n");
     224                        _printString_("  (2) Quadrisection" << "\n");
    225225                }
    226226                *ndims = (int)options[OPT_NDIMS];
    … …  
    232232        else {
    233233                if (PROMPT) {
    234                         _printLine_("Partitioning dimension: ");
    235                         _printLine_("  (1) Bisection");
    236                         _printLine_("  (2) Quadrisection");
    237                         _printLine_("  (3) Octasection");
     234                        _printString_("Partitioning dimension: " << "\n");
     235                        _printString_("  (1) Bisection" << "\n");
     236                        _printString_("  (2) Quadrisection" << "\n");
     237                        _printString_("  (3) Octasection" << "\n");
    238238                }
    239239                *ndims = (int)options[OPT_NDIMS];

  • issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp

    r14999 r15099  
    2323        parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
    2424
    25         if(VerboseMProcessor()) _pprintLine_("      Configuring elements...");
     25        if(VerboseMProcessor()) _pprintString_("      Configuring elements..." << "\n");
    2626        for (i=0;i<elements->Size();i++){
    2727                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
    2828                element->Configure(elements,loads,nodes,vertices,materials,parameters);
    2929        }
    30         if(VerboseMProcessor()) _pprintLine_("      Configuring loads...");
     30        if(VerboseMProcessor()) _pprintString_("      Configuring loads..." << "\n");
    3131        for (i=0;i<loads->Size();i++){
    3232                load=(Load*)loads->GetObjectByOffset(i);
    … …  
    3535                }
    3636        }
    37         if(VerboseMProcessor()) _pprintLine_("      Configuring nodes...");
     37        if(VerboseMProcessor()) _pprintString_("      Configuring nodes..." << "\n");
    3838        for (i=0;i<nodes->Size();i++){
    3939                node=(Node*)nodes->GetObjectByOffset(i);
    … …  
    4343        }
    4444
    45         if(VerboseMProcessor()) _pprintLine_("      Configuring materials...");
     45        if(VerboseMProcessor()) _pprintString_("      Configuring materials..." << "\n");
    4646        for (i=0;i<materials->Size();i++){
    4747                material=(Material*)materials->GetObjectByOffset(i);

  • issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp

    r14999 r15099  
    1717
    1818        /*Display message*/
    19         if(VerboseModule()) _pprintLine_("   Constraining penalties");
     19        if(VerboseModule()) _pprintString_("   Constraining penalties" << "\n");
    2020
    2121        /*recover parameters: */

  • issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp

    r14999 r15099  
    5151        }
    5252        else if(num_unstable_constraints<=min_mechanical_constraints){
    53                 if(VerboseModule()) _pprintLine_("   freezing constraints");
     53                if(VerboseModule()) _pprintString_("   freezing constraints" << "\n");
    5454                RiftFreezeConstraints(loads,configuration_type);
    5555        }

  • issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp

    r14999 r15099  
    1717        int slocalsize;
    1818
    19         if(VerboseModule()) _pprintLine_("   Create nodal constraints");
     19        if(VerboseModule()) _pprintString_("   Create nodal constraints" << "\n");
    2020
    2121        /*figure out how many dofs we have: */

  • issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp

    r15097 r15099  
    5353        if (!ExpRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp))
    5454                _error_("Error reading exp file.");
    55         _pprintLine_("Exp2Kmlx -- Reading " << nprof << " exp profiles from file \"" << filexp << "\".");
     55        _pprintString_("Exp2Kmlx -- Reading " << nprof << " exp profiles from file \"" << filexp << "\"." << "\n");
    5656//      for (i=0; i<nprof; i++)
    57 //              _printLine_("i=" << i << "; nvert=" << pnvert[i] << ", closed=" << closed[i]);
     57//              _printString_("i=" << i << "; nvert=" << pnvert[i] << ", closed=" << closed[i] << "\n");
    5858
    5959/*  construct kml file  */
    … …  
    118118
    119119        if (holes && nprof && (pnvert[0] <= 1 || pprofx[0][pnvert[0]-1] != pprofx[0][0] || pprofy[0][pnvert[0]-1] != pprofy[0][0])) {
    120                 _pprintLine_("Warning -- Outer profile is not closed, so \"holes\" option will be ignored.");
     120                _pprintString_("Warning -- Outer profile is not closed, so \"holes\" option will be ignored." << "\n");
    121121                holes=false;
    122122        }
    … …  
    150150                for (i=1; i<nprof; i++) {
    151151                        if (pnvert[i] <= 1 || pprofx[i][pnvert[i]-1] != pprofx[i][0] || pprofy[i][pnvert[i]-1] != pprofy[i][0]) {
    152                                 _pprintLine_("Warning -- Inner profile " << i+1 << " is not closed with \"holes\" specified, so it will be ignored.");
     152                                _pprintString_("Warning -- Inner profile " << i+1 << " is not closed with \"holes\" specified, so it will be ignored." << "\n");
    153153                                continue;
    154154                        }
    … …  
    272272/*  write kml file  */
    273273
    274         _pprintLine_("Exp2Kmlx -- Writing kml document to file \"" << filkml << "\".");
     274        _pprintString_("Exp2Kmlx -- Writing kml document to file \"" << filkml << "\"." << "\n");
    275275        fid=fopen(filkml,"w");
    276276        fprintf(fid,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
    … …  
    287287        clock1=clock();
    288288        time1 =time(NULL);
    289         _printLine_("Exp2Kmlx Module -- " <<((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " <<difftime(time1,time0) << " elapsed seconds.\n\n");
     289        _printString_("Exp2Kmlx Module -- " <<((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " <<difftime(time1,time0) << " elapsed seconds.\n\n" << "\n");
    290290
    291291        return(iret);

  • issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp

    r14999 r15099  
    1919        Vector<IssmDouble>* solution=NULL;
    2020
    21         if(VerboseModule()) _pprintLine_("   Get solution from inputs");
     21        if(VerboseModule()) _pprintString_("   Get solution from inputs" << "\n");
    2222
    2323        /*retrive parameters: */

  • issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

    r14999 r15099  
    1717        Element            *element                          = NULL;
    1818
    19         if(VerboseModule()) _pprintLine_("   Migrating grounding line");
     19        if(VerboseModule()) _pprintString_("   Migrating grounding line" << "\n");
    2020
    2121        /*retrieve parameters: */
    … …  
    162162                #ifdef _HAVE_MPI_
    163163                MPI_Allreduce(&local_nflipped,&nflipped,1,MPI_INT,MPI_SUM,IssmComm::GetComm());
    164                 if(VerboseConvergence()) _pprintLine_("   Additional number of vertices allowed to unground: " << nflipped);
     164                if(VerboseConvergence()) _pprintString_("   Additional number of vertices allowed to unground: " << nflipped << "\n");
    165165                #else
    166166                nflipped=local_nflipped;

  • issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp

    r13787 r15099  
    6969                        }
    7070                }
    71                 _printLine_( "" );
     71                _printString_( ""  << "\n");
    7272                _printString_("Number of zeroes remaining: " << lines*samps-counter);
    7373                fflush( stdout );
    … …  
    268268
    269269                        #ifdef _DEBUG2_
    270                                 //_printLine_(temp << " " << elev << " " << range << " ");
     270                                //_printString_(temp << " " << elev << " " << range << " " << "\n");
    271271                        #endif
    272272
    … …  
    338338        #ifdef _DEBUG2_
    339339                _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" );
    340                 _printLine_("Number of zeroes remaining:          0\n");
     340                _printString_("Number of zeroes remaining:          0\n" << "\n");
    341341                printf ( "\n");
    342342        #endif

  • issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp

    r14999 r15099  
    1010
    1111        int i;
    12         if(VerboseModule()) _pprintLine_("   Input updates from constant");
     12        if(VerboseModule()) _pprintString_("   Input updates from constant" << "\n");
    1313
    1414        /*Elements and loads drive the update: */
    … …  
    3131
    3232        int i;
    33         if(VerboseModule()) _pprintLine_("   Input updates from constant");
     33        if(VerboseModule()) _pprintString_("   Input updates from constant" << "\n");
    3434
    3535        /*Elements and loads drive the update: */
    … …  
    5252
    5353        int i;
    54         if(VerboseModule()) _pprintLine_("   Input updates from constant");
     54        if(VerboseModule()) _pprintString_("   Input updates from constant" << "\n");
    5555
    5656        /*Elements and loads drive the update: */

  • issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp

    r14950 r15099  
    8787        /*launch the thread manager with InterpFromGridToMeshxt as a core: */
    8888        LaunchThread(InterpFromGridToMeshxt,(void*)&gate,num);
    89         _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     89        _printString_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    9090
    9191        /*Assign output pointers:*/
    … …  
    176176                                        break;
    177177                                default:
    178                                         _printLine_("Interpolation " << EnumToStringx(interpenum) << " not supported yet");
     178                                        _printString_("Interpolation " << EnumToStringx(interpenum) << " not supported yet" << "\n");
    179179                                        return NULL; /*WARNING: no error because it would blow up the multithreading!*/
    180180                        }

  • issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp

    r14656 r15099  
    9999        }
    100100        if(debug && my_thread==0)
    101          _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     101         _printString_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    102102        return NULL;
    103103}

  • issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp

    r14917 r15099  
    168168        }
    169169        if (debug)
    170          _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     170         _printString_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    171171
    172172        /*Assign output pointers:*/

  • issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

    r15065 r15099  
    142142                }
    143143        }
    144         //if(N_interp>=100) _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     144        //if(N_interp>=100) _printString_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    145145
    146146        /*clean-up and return*/

  • issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp

    r14917 r15099  
    132132        }
    133133        if (debug)
    134          _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     134         _printString_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    135135
    136136        /*Assign output pointers:*/

  • issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp

    r15097 r15099  
    4040                }
    4141
    42 //              _pprintLine_(kstr);
     42//              _pprintString_(kstr << "\n");
    4343                xDelete<char>(kstr);
    4444        }
    4545
    4646        if (kxml) {
    47                 _pprintLine_("XML declaration:");
     47                _pprintString_("XML declaration:" << "\n");
    4848                kxml->DeepEcho("  ");
    4949                delete kxml;
    5050        }
    5151        if (kdtd) {
    52                 _pprintLine_("DTD declaration (not yet implemented):");
     52                _pprintString_("DTD declaration (not yet implemented):" << "\n");
    5353                kdtd->DeepEcho("  ");
    5454                delete kdtd;
    … …  
    5757        clock1=clock();
    5858        time1 =time(NULL);
    59         _printLine_("KMLFileReadx Module -- " <<((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " <<difftime(time1,time0) << " elapsed seconds.\n\n");
     59        _printString_("KMLFileReadx Module -- " <<((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " <<difftime(time1,time0) << " elapsed seconds.\n\n" << "\n");
    6060
    6161        return(kfil);

  • issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp

    r15097 r15099  
    8080
    8181        if (cmap) {
    82                 _pprintLine_("Writing " << mcmap << " Matlab colors as KML style templates.");
     82                _pprintString_("Writing " << mcmap << " Matlab colors as KML style templates." << "\n");
    8383                ipt=0;
    8484                for (i=0; i<mcmap; i++) {
    … …  
    115115
    116116        if (!nodecon) {
    117                 _pprintLine_("Creating the node connectivity table.");
     117                _pprintString_("Creating the node connectivity table." << "\n");
    118118                nncon=mxepg+1;
    119119                nodecon=xNewZeroInit<int>(mncon*nncon);
    … …  
    146146
    147147                else if (mdata == mncon) {
    148                         _pprintLine_("Averaging nodal data to element data.");
     148                        _pprintString_("Averaging nodal data to element data." << "\n");
    149149                        edata=xNewZeroInit<double>(melem*ndata);
    150150                        edfree=true;
    … …  
    185185        clock0a=clock();
    186186        time0a =time(NULL);
    187         _printLine_("  Constructed kml document -- " << ((double)(clock0a-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time0a,time0) << " elapsed seconds.\n\n");
     187        _printString_("  Constructed kml document -- " << ((double)(clock0a-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time0a,time0) << " elapsed seconds.\n\n" << "\n");
    188188
    189189/*  write kml file  */
    190190
    191         _pprintLine_("Writing kml document to file.");
     191        _pprintString_("Writing kml document to file." << "\n");
    192192        fprintf(fid,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
    193193        fprintf(fid,"<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n");
    … …  
    196196        clock0b=clock();
    197197        time0b =time(NULL);
    198         _printLine_("  Wrote kml file -- " << ((double)(clock0b-clock0a))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time0b,time0a) << " elapsed seconds.\n\n");
    199 
    200         _pprintLine_("Deleting kml document.");
     198        _printString_("  Wrote kml file -- " << ((double)(clock0b-clock0a))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time0b,time0a) << " elapsed seconds.\n\n" << "\n");
     199
     200        _pprintString_("Deleting kml document." << "\n");
    201201        delete kdoc;
    202202        clock0c=clock();
    203203        time0c =time(NULL);
    204         _printLine_("  Deleted kml document -- " << ((double)(clock0c-clock0b))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time0c,time0b) << " elapsed seconds.\n\n");
     204        _printString_("  Deleted kml document -- " << ((double)(clock0c-clock0b))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time0c,time0b) << " elapsed seconds.\n\n" << "\n");
    205205
    206206        clock1=clock();
    207207        time1 =time(NULL);
    208         _printLine_("KMLMeshWritex Module -- " << ((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time1,time0) << " elapsed seconds.\n\n");
     208        _printString_("KMLMeshWritex Module -- " << ((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time1,time0) << " elapsed seconds.\n\n" << "\n");
    209209
    210210        return;
    … …  
    297297/*  write each element as a polygon placemark  */
    298298
    299         _pprintLine_("Writing " << melem << " tria elements as KML polygons.");
     299        _pprintString_("Writing " << melem << " tria elements as KML polygons." << "\n");
    300300
    301301        for (i=0; i<melem; i++) {
    … …  
    349349
    350350//              if (!(int)fmod((double)(i+1),1000))
    351 //                      _pprintLine_("  " << (i+1) << " tria elements written.");
     351//                      _pprintString_("  " << (i+1) << " tria elements written." << "\n");
    352352        }
    353         _pprintLine_("  " << melem << " tria elements written.");
     353        _pprintString_("  " << melem << " tria elements written." << "\n");
    354354
    355355        return(kfold);

  • issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp

    r15097 r15099  
    7979/*  write kml file  */
    8080
    81         _pprintLine_("Writing kml document to file.");
     81        _pprintString_("Writing kml document to file." << "\n");
    8282        fprintf(fid,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
    8383        kfile->Write(fid,indent);
    … …  
    8787        clock1=clock();
    8888        time1 =time(NULL);
    89         _printLine_("KMLOverlayx Module -- " << ((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time1,time0) << " elapsed seconds.\n\n");
     89        _printString_("KMLOverlayx Module -- " << ((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time1,time0) << " elapsed seconds.\n\n" << "\n");
    9090
    9191        return;

  • issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp

    r15097 r15099  
    4646/*  open exp file  */
    4747
    48         _pprintLine_("Writing exp profiles to file.");
     48        _pprintString_("Writing exp profiles to file." << "\n");
    4949        fido=fopen(filexp,"w");
    5050
    … …  
    6161        clock1=clock();
    6262        time1 =time(NULL);
    63         _printLine_("Kml2Expx Module -- " << ((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time1,time0) << " elapsed seconds.\n\n");
     63        _printString_("Kml2Expx Module -- " << ((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time1,time0) << " elapsed seconds.\n\n" << "\n");
    6464
    6565        return(iret);

  • issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp

    r14996 r15099  
    8383                observations->ObservationList(&x,&y,&data,&nobs);
    8484
    85                 _printLine_("Generation Delaunay Triangulation");
     85                _printString_("Generation Delaunay Triangulation" << "\n");
    8686                BamgTriangulatex(&index,&nel,x,y,nobs);
    8787
    88                 _printLine_("Interpolating");
     88                _printString_("Interpolating" << "\n");
    8989                xDelete<double>(predictions);
    9090                InterpFromMeshToMesh2dx(&predictions,index,x,y,nobs,nel,data,nobs,1,x_interp,y_interp,n_interp,options);
    … …  
    110110                /*launch the thread manager with Krigingxt as a core: */
    111111                LaunchThread(NearestNeighbort,(void*)&gate,num);
    112                 _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     112                _printString_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    113113                xDelete<int>(gate.numdone);
    114114        }
    … …  
    132132                /*launch the thread manager with Krigingxt as a core: */
    133133                LaunchThread(idwt,(void*)&gate,num);
    134                 _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     134                _printString_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    135135                xDelete<int>(gate.numdone);
    136136        }
    … …  
    154154                /*launch the thread manager with Krigingxt as a core: */
    155155                LaunchThread(v4t,(void*)&gate,num);
    156                 _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     156                _printString_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    157157                xDelete<int>(gate.numdone);
    158158        }
    … …  
    177177                /*launch the thread manager with Krigingxt as a core: */
    178178                LaunchThread(Krigingxt,(void*)&gate,num);
    179                 _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     179                _printString_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    180180                xDelete<int>(gate.numdone);
    181181        }

  • issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp

    r15097 r15099  
    6868                /*partition loop across threads: */
    6969                for(int idx=my_rank;idx<n_interp;idx+=num_procs){
    70                         _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%");
     70                        _pprintString_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%" << "\n");
    7171                        observations->InterpolationKriging(&predictions[idx],&error[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,variogram);
    7272                }
    73                 _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%");
     73                _pprintString_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%" << "\n");
    7474
    7575#ifdef _HAVE_MPI_
    … …  
    8686                /*partition loop across threads: */
    8787                for(int idx=my_rank;idx<n_interp;idx+=num_procs){
    88                         _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%");
     88                        _pprintString_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%" << "\n");
    8989                        observations->InterpolationV4(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata);
    9090                }
    91                 _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%");
     91                _pprintString_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%" << "\n");
    9292
    9393#ifdef _HAVE_MPI_
    … …  
    101101                /*partition loop across threads: */
    102102                for(int idx=my_rank;idx<n_interp;idx+=num_procs){
    103                         _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%");
     103                        _pprintString_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%" << "\n");
    104104                        observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius);
    105105                }
    106                 _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%");
     106                _pprintString_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%" << "\n");
    107107
    108108#ifdef _HAVE_MPI_
    … …  
    118118                /*partition loop across threads: */
    119119                for(int idx=my_rank;idx<n_interp;idx+=num_procs){
    120                         _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%");
     120                        _pprintString_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%" << "\n");
    121121                        observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power);
    122122                }
    123                 _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%");
     123                _pprintString_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%" << "\n");
    124124
    125125#ifdef _HAVE_MPI_
    … …  
    142142
    143143        MPI_Barrier(MPI_COMM_WORLD); finish=MPI_Wtime( );
    144         _printLine_("\n   " << setw(34) << left << "Observation fitering elapsed time: " << finish_init-start_init << " seconds  \n");
    145         _printLine_("   " << setw(34) << left << "Kriging prediction elapsed time: " << finish_core-start_core << " seconds  \n");
    146         _printLine_("\n   " << "Total elapsed time " << int((finish-start)/3600) << " hrs " << int(int(finish-start)%3600/60) << " min " << int(finish-start)%60 << " sec\n\n");
     144        _printString_("\n   " << setw(34) << left << "Observation fitering elapsed time: " << finish_init-start_init << " seconds  \n" << "\n");
     145        _printString_("   " << setw(34) << left << "Kriging prediction elapsed time: " << finish_core-start_core << " seconds  \n" << "\n");
     146        _printString_("\n   " << "Total elapsed time " << int((finish-start)/3600) << " hrs " << int(int(finish-start)%3600/60) << " min " << int(finish-start)%60 << " sec\n\n" << "\n");
    147147        return 1;
    148148#else

  • issm/trunk-jpl/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp

    r14950 r15099  
    1717
    1818        /*Display message*/
    19         if(VerboseModule()) _pprintLine_("   Merging solution vector from fset to gset");
     19        if(VerboseModule()) _pprintString_("   Merging solution vector from fset to gset" << "\n");
    2020
    2121        /*first, get gsize, fsize and ssize: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

    r15000 r15099  
    4141        SetVerbosityLevel(verbose);
    4242
    43         if(VerboseMProcessor()) _pprintLine_("   starting model processor ");
     43        if(VerboseMProcessor()) _pprintString_("   starting model processor " << "\n");
    4444
    4545        for(i=0;i<nummodels;i++){
    … …  
    6565                if(solution_type==SteadystateSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isenthalpy==false) continue;
    6666
    67                 if(VerboseMProcessor()) _pprintLine_("   creating datasets for analysis " << EnumToStringx(analysis_type));
     67                if(VerboseMProcessor()) _pprintString_("   creating datasets for analysis " << EnumToStringx(analysis_type) << "\n");
    6868                CreateDataSets(&elements,&nodes,&vertices,&materials,&constraints,&loads,&parameters,iomodel,rootpath,solution_type,analysis_type,nummodels,i);
    6969        }
    70         if(VerboseMProcessor()) _pprintLine_("   done with model processor ");
     70        if(VerboseMProcessor()) _pprintString_("   done with model processor " << "\n");
    7171
    7272        /*Free resources:*/

  • issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp

    r14656 r15099  
    7070        }
    7171        if (my_thread==0)
    72          _printLine_("\r      loop progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
     72         _printString_("\r      loop progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%" << "\n");
    7373
    7474        /*Free ressources:*/

  • issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp

    r14999 r15099  
    5454
    5555  if (itm >= NPDMAX){
    56     _printLine_("increase NPDMAX in massBalance.cpp");
     56    _printString_("increase NPDMAX in massBalance.cpp" << "\n");
    5757    exit (1);
    5858      }
    … …  
    8080  itm = reCast<int,IssmDouble>((PDCUT+2.*siglimc)/DT + 1.5);
    8181  if (itm >= NPDCMAX){
    82     _printLine_("'increase NPDCMAX in p35com'");
     82    _printString_("'increase NPDCMAX in p35com'" << "\n");
    8383    exit (1);
    8484      }

  • issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp

    r14950 r15099  
    2222        bool        oldalloc  = false;
    2323
    24         if(VerboseModule()) _pprintLine_("   Dirichlet lifting applied to load vector");
     24        if(VerboseModule()) _pprintString_("   Dirichlet lifting applied to load vector" << "\n");
    2525
    2626        Kfs->GetSize(&global_m,&global_n);

  • issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp

    r14822 r15099  
    1717        bool        oldalloc  = false;
    1818
    19         if(VerboseModule()) _pprintLine_("   Reduce vector from g to f set");
     19        if(VerboseModule()) _pprintString_("   Reduce vector from g to f set" << "\n");
    2020
    2121        /*first figure out fsize: */

  • issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp

    r14999 r15099  
    1414
    1515        /*Display message*/
    16         if(VerboseModule()) _pprintLine_("   Resetting penalties");
     16        if(VerboseModule()) _pprintString_("   Resetting penalties" << "\n");
    1717
    1818        /*recover parameters: */

  • issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp

    r15097 r15099  
    295295
    296296                        if (pnpart[i] > 0)
    297                                 _printLine_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 0 parts.\n");
     297                                _printString_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 0 parts.\n" << "\n");
    298298                        if (pnvert[i] > 1)
    299                                 _printLine_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnvert[i] << " > 1 vertices.\n");
     299                                _printString_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnvert[i] << " > 1 vertices.\n" << "\n");
    300300
    301301                        kpoint=new KML_Point();
    … …  
    464464                                else {
    465465                                        if (!kpoly) {
    466                                                 _printLine_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\", part " << j << ", expected to be outer loop (cw).\n");
     466                                                _printString_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\", part " << j << ", expected to be outer loop (cw).\n" << "\n");
    467467                                                continue;
    468468                                        }
    … …  
    512512
    513513                        if (pnpart[i] > 0)
    514                                 _printLine_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 0 parts.\n");
     514                                _printString_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 0 parts.\n" << "\n");
    515515
    516516/*  create a multigeometry to hold all the points  */
    … …  
    555555
    556556                else if (pstype[i] == SHPT_MULTIPATCH) {
    557                         _printLine_("Warning -- Shape " << i << " of type \"" <<SHPTypeName( pstype[i] ) << "\" will be ignored.\n");
     557                        _printString_("Warning -- Shape " << i << " of type \"" <<SHPTypeName( pstype[i] ) << "\" will be ignored.\n" << "\n");
    558558                        continue;
    559559                }
    … …  
    562562
    563563                else {
    564                         _printLine_(,"Warning -- Shape " << i << " of type \"" <<SHPTypeName( pstype[i] ) << "\" will be ignored.\n");
     564                        _printString_(,"Warning -- Shape " << i << " of type \"" <<SHPTypeName( pstype[i] ) << "\" will be ignored.\n" << "\n");
    565565                }
    566566        }
    … …  
    575575/*  open exp file  */
    576576
    577         _pprintLine_("Writing exp profiles to file.");
     577        _pprintString_("Writing exp profiles to file." << "\n");
    578578        fid=fopen(filexp,"w");
    579579
    … …  
    609609        clock1=clock();
    610610        time1 =time(NULL);
    611         _printLine_("Shp2Expx Module -- " <<((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " <<difftime(time1,time0)  << " elapsed seconds.\n\n");
     611        _printString_("Shp2Expx Module -- " <<((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " <<difftime(time1,time0)  << " elapsed seconds.\n\n" << "\n");
    612612
    613613        return(iret);

  • issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

    r15097 r15099  
    283283
    284284                        if (pnpart[i] > 0)
    285                                 _printLine_("Warning -- Shape "<< i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 0 parts.\n");
     285                                _printString_("Warning -- Shape "<< i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 0 parts.\n" << "\n");
    286286                        if (pnvert[i] > 1)
    287                                 _printLine_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 1 vertices.\n");
     287                                _printString_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 1 vertices.\n" << "\n");
    288288
    289289                        kpoint=new KML_Point();
    … …  
    452452                                else {
    453453                                        if (!kpoly) {
    454                                                 _printLine_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\", part " << j << ", expected to be outer loop (cw).\n");
     454                                                _printString_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\", part " << j << ", expected to be outer loop (cw).\n" << "\n");
    455455                                                continue;
    456456                                        }
    … …  
    500500
    501501                        if (pnpart[i] > 0)
    502                                 _printLine_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 0 parts.\n");
     502                                _printString_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" should not have " << pnpart[i] << " > 0 parts.\n" << "\n");
    503503
    504504/*  create a multigeometry to hold all the points  */
    … …  
    543543
    544544                else if (pstype[i] == SHPT_MULTIPATCH) {
    545                         _printLine_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" will be ignored.\n");
     545                        _printString_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" will be ignored.\n" << "\n");
    546546                        continue;
    547547                }
    … …  
    550550
    551551                else {
    552                         _printLine_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" will be ignored.\n");
     552                        _printString_("Warning -- Shape " << i << " of type \"" << SHPTypeName( pstype[i] ) << "\" will be ignored.\n" << "\n");
    553553                }
    554554        }
    … …  
    563563/*  write kml file  */
    564564
    565         _pprintLine_("Writing kml document to file.");
     565        _pprintString_("Writing kml document to file." << "\n");
    566566        fid=fopen(filkml,"w");
    567567        fprintf(fid,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
    … …  
    592592        clock1=clock();
    593593        time1 =time(NULL);
    594         _printLine_("Shp2Kmlx Module -- " << ((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time1,time0) << " elapsed seconds.\n\n");
     594        _printString_("Shp2Kmlx Module -- " << ((double)(clock1-clock0))/CLOCKS_PER_SEC << " CPU seconds; " << difftime(time1,time0) << " elapsed seconds.\n\n" << "\n");
    595595
    596596        return(iret);

  • issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp

    r14822 r15099  
    2020        Vector<IssmDouble> *uf=NULL;
    2121
    22         if(VerboseModule()) _pprintLine_("   Solving matrix system");
     22        if(VerboseModule()) _pprintString_("   Solving matrix system" << "\n");
    2323
    2424        /*Initialize solver: */

  • issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp

    r15090 r15099  
    55
    66void printarray(IssmPDouble* array,int lines,int cols){
    7         _printLine_("");
     7        _printString_("" << "\n");
    88        for(int i=0;i<lines;i++){ 
    99                _printString_("   [ ");
    1010                for(int j=0;j<cols;j++) _printString_( " " << setw(11) << setprecision (5) << array[i*cols+j]);
    11                 _printLine_(" ]");
     11                _printString_(" ]" << "\n");
    1212        } 
    13         _printLine_("");
     13        _printString_("" << "\n");
    1414}
    1515void printsparsity(IssmPDouble* array,int lines,int cols){
    1616        int count;
    17         _printLine_("");
     17        _printString_("" << "\n");
    1818        for(int i=0;i<lines;i++){ 
    1919                _printString_("   [ ");
    … …  
    2626                         _printString_( " .");
    2727                }
    28                 _printLine_(" ] "<<i<<" => "<<count);
     28                _printString_(" ] "<<i<<" => "<<count << "\n");
    2929        } 
    30         _printLine_("");
     30        _printString_("" << "\n");
    3131}
    3232void printarray(int* array,int lines,int cols){
    33         _printLine_("");
     33        _printString_("" << "\n");
    3434        for(int i=0;i<lines;i++){ 
    3535                _printString_("   [ ");
    3636                for(int j=0;j<cols;j++) _printString_( " " << setw(11) << setprecision (5) << array[i*cols+j]);
    37                 _printLine_(" ]");
     37                _printString_(" ]" << "\n");
    3838        } 
    39         _printLine_("");
     39        _printString_("" << "\n");
    4040}
    4141void printarray(bool* array,int lines,int cols){
    42         _printLine_("");
     42        _printString_("" << "\n");
    4343        for(int i=0;i<lines;i++){ 
    4444                _printString_("   [ ");
    … …  
    4747                        else _printString_( " 0");
    4848                }
    49                 _printLine_(" ]");
     49                _printString_(" ]" << "\n");
    5050        } 
    51         _printLine_("");
     51        _printString_("" << "\n");
    5252}
    5353void printbinary(int n){

  • issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp

    r14951 r15099  
    4646        else{
    4747                if(num_procs==1){
    48                         _printLine_("\n??? Error in ==> " << file_name.c_str() << ":" << file_line);
    49                         _printLine_(function_name.c_str() << " error message: " << what() << "\n");
     48                        _printString_("\n??? Error in ==> " << file_name.c_str() << ":" << file_line << "\n");
     49                        _printString_(function_name.c_str() << " error message: " << what() << "\n" << "\n");
    5050                }
    5151                else{
    52                         _printLine_("\n[" << my_rank<< "] ??? Error using ==> " << file_name.c_str() << ":" << file_line);
    53                         _printLine_(  "[" << my_rank << "] " << function_name.c_str() << " error message: " << what() << "\n");
     52                        _printString_("\n[" << my_rank<< "] ??? Error using ==> " << file_name.c_str() << ":" << file_line << "\n");
     53                        _printString_(  "[" << my_rank << "] " << function_name.c_str() << " error message: " << what() << "\n" << "\n");
    5454                }
    5555        }

  • issm/trunk-jpl/src/c/shared/Exceptions/exceptions.h

    r15097 r15099  
    6464        }\
    6565        catch (exception& e) {\
    66                 _printLine_("Standard exception: " << e.what() << "\n");\
     66                _printString_("Standard exception: " << e.what() << "\n" << "\n");\
    6767                return 0;\
    6868        }\
    6969        catch(...){\
    70                 _printLine_("An unexpected error occurred \n");\
     70                _printString_("An unexpected error occurred \n" << "\n");\
    7171                return 0;\
    7272        }

  • issm/trunk-jpl/src/c/shared/LatLong/Ll2xyx.cpp

    r15069 r15099  
    114114                *pdelta= 45;
    115115                *pslat = 70;
    116                 if(flag) _pprintLine_("Info: creating coordinates in polar stereographic (Std Latitude: 70N Meridian: 45).");
     116                if(flag) _pprintString_("Info: creating coordinates in polar stereographic (Std Latitude: 70N Meridian: 45)." << "\n");
    117117        }
    118118        else if (sgn == -1) {
    119119                *pdelta= 0;
    120120                *pslat = 71;
    121                 if(flag) _pprintLine_("Info: creating coordinates in polar stereographic (Std Latitude: 71S Meridian: 0).");
     121                if(flag) _pprintString_("Info: creating coordinates in polar stereographic (Std Latitude: 71S Meridian: 0)." << "\n");
    122122        }
    123123        else _error_("Sign should be either +1 or -1.\n");

  • issm/trunk-jpl/src/c/shared/LatLong/Xy2llx.cpp

    r15069 r15099  
    122122                *pdelta= 45;
    123123                *pslat = 70;
    124                 if(flag) _pprintLine_("Warning: expecting coordinates in polar stereographic (Std Latitude: 70N Meridian: 45).");
     124                if(flag) _pprintString_("Warning: expecting coordinates in polar stereographic (Std Latitude: 70N Meridian: 45)." << "\n");
    125125        }
    126126        else if (sgn == -1) {
    127127                *pdelta= 0;
    128128                *pslat = 71;
    129                 if(flag) _pprintLine_("Warning: expecting coordinates in polar stereographic (Std Latitude: 71S Meridian: 0).");
     129                if(flag) _pprintString_("Warning: expecting coordinates in polar stereographic (Std Latitude: 71S Meridian: 0)." << "\n");
    130130        }
    131131        else _error_("Sign should be either +1 or -1.\n");

  • issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp

    r15097 r15099  
    205205                pindx[ipiv]++;
    206206
    207                 //              _printLine_("pivot for i=" << i << ": irow=" << irow << ", icol=" << icol  << ", pindx[" << ipiv << "]=" << pindx[ipiv] << "\n");
     207                //              _printString_("pivot for i=" << i << ": irow=" << irow << ", icol=" << icol  << ", pindx[" << ipiv << "]=" << pindx[ipiv] << "\n" << "\n");
    208208
    209209                /*  switch rows to put pivot element on diagonal, noting that the
    … …  
    211211
    212212                if (irow != icol) {
    213                         //                      _printLine_("row switch for i=" << i << ": irow=" << irow << ", icol=" << icol << "\n");
     213                        //                      _printString_("row switch for i=" << i << ": irow=" << irow << ", icol=" << icol << "\n" << "\n");
    214214
    215215                        ipt=irow*ndim;
    … …  
    292292                        icol=pivrc2[j];
    293293
    294                         //                      _printLine_("column switch back for j=" << j << ": irow=" << irow << ", icol=" << icol << "\n");
     294                        //                      _printString_("column switch back for j=" << j << ": irow=" << irow << ", icol=" << icol << "\n" << "\n");
    295295
    296296                        ipt=0;

  • issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp

    r14978 r15099  
    5050        if (xIsNan<IssmDouble>(fxmin)) _error_("Function evaluation returned NaN");
    5151        cout<<setprecision(5);
    52         if(VerboseControl()) _pprintLine_("");
    53         if(VerboseControl()) _pprintLine_("       Iteration         x           f(x)       Tolerance         Procedure");
    54         if(VerboseControl()) _pprintLine_("");
    55         if(VerboseControl()) _pprintLine_("           N/A    "<<setw(12)<<xmin<<"  "<<setw(12)<<fxmin<<"           N/A         boundary");
     52        if(VerboseControl()) _pprintString_("" << "\n");
     53        if(VerboseControl()) _pprintString_("       Iteration         x           f(x)       Tolerance         Procedure" << "\n");
     54        if(VerboseControl()) _pprintString_("" << "\n");
     55        if(VerboseControl()) _pprintString_("           N/A    "<<setw(12)<<xmin<<"  "<<setw(12)<<fxmin<<"           N/A         boundary" << "\n");
    5656        fxmax = (*f)(xmax,optargs);
    5757        if (xIsNan<IssmDouble>(fxmax)) _error_("Function evaluation returned NaN");
    58         if(VerboseControl()) _pprintLine_("           N/A    "<<setw(12)<<xmax<<"  "<<setw(12)<<fxmax<<"           N/A         boundary");
     58        if(VerboseControl()) _pprintString_("           N/A    "<<setw(12)<<xmax<<"  "<<setw(12)<<fxmax<<"           N/A         boundary" << "\n");
    5959
    6060        /*test if jump option activated and xmin==0*/
    … …  
    9393        /*4: print result*/
    9494        if(VerboseControl())
    95          _pprintLine_("         "<<setw(5)<<iter<<"    "<<setw(12)<<xbest<<"  "<<setw(12)<<fxbest<<"  "<<setw(12)<<pow(pow(xbest-xm,2),0.5)<<"         initial");
     95         _pprintString_("         "<<setw(5)<<iter<<"    "<<setw(12)<<xbest<<"  "<<setw(12)<<fxbest<<"  "<<setw(12)<<pow(pow(xbest-xm,2),0.5)<<"         initial" << "\n");
    9696        if (!xIsNan<IssmDouble>(cm_jump) && (xmin==0) && ((fxbest/fxmin)<cm_jump)){
    97                 if(VerboseControl()) _pprintLine_("      optimization terminated: current x satisfies criteria 'cm_jump'=" << cm_jump);
     97                if(VerboseControl()) _pprintString_("      optimization terminated: current x satisfies criteria 'cm_jump'=" << cm_jump << "\n");
    9898                loop=false;
    9999        }
    … …  
    189189                tol2=2.0*tol1;
    190190                if(VerboseControl())
    191                  _pprintLine_("         "<<setw(5)<<iter<<"    "<<setw(12)<<x<<"  "<<setw(12)<<fx<<"  "<<setw(12)<<pow(pow(xbest-xm,2),0.5)<<
     191                 _pprintString_("         "<<setw(5)<<iter<<"    "<<setw(12)<<x<<"  "<<setw(12)<<fx<<"  "<<setw(12)<<pow(pow(xbest-xm,2),0.5)<<
    192192                                         "         "<<(goldenflag?"golden":"parabolic"));
    193193
    194194                /*Stop the optimization?*/
    195195                if (sqrt(pow(xbest-xm,2)) < (tol2-0.5*(xmax-xmin))){
    196                         if(VerboseControl()) _pprintLine_("      optimization terminated: current x satisfies criteria 'tolx'=" << tolerance);
     196                        if(VerboseControl()) _pprintString_("      optimization terminated: current x satisfies criteria 'tolx'=" << tolerance << "\n");
    197197                        loop=false;
    198198                }
    199199                else if (iter>=maxiter){
    200                         if(VerboseControl()) _pprintLine_("      exiting: Maximum number of iterations has been exceeded  ('maxiter'=" << maxiter << ")");
     200                        if(VerboseControl()) _pprintString_("      exiting: Maximum number of iterations has been exceeded  ('maxiter'=" << maxiter << ")" << "\n");
    201201                        loop=false;
    202202                }
    203203                else if (!xIsNan<IssmDouble>(cm_jump) && (xmin==0) && ((fxbest/fxmin)<cm_jump)){
    204                         if(VerboseControl()) _pprintLine_("      optimization terminated: current x satisfies criteria 'cm_jump'=" << cm_jump);
     204                        if(VerboseControl()) _pprintString_("      optimization terminated: current x satisfies criteria 'cm_jump'=" << cm_jump << "\n");
    205205                        loop=false;
    206206                }

  • issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp

    r15097 r15099  
    5050                sizeof(wgt4 )/sizeof(IssmPDouble)};
    5151
    52         //      _pprintLine_("Gauss-Legendre recurrence coefficients ngaus=" << ngaus);
     52        //      _pprintString_("Gauss-Legendre recurrence coefficients ngaus=" << ngaus << "\n");
    5353        *pxgaus =xNew<IssmPDouble>(ngaus);
    5454        *pxwgt  =xNew<IssmPDouble>(ngaus);
    … …  
    11381138                sizeof(wgt20)/sizeof(IssmPDouble)};
    11391139
    1140         //      _pprintLine_("GaussLegendreTria: iord=" << iord);
     1140        //      _pprintString_("GaussLegendreTria: iord=" << iord << "\n");
    11411141
    11421142        /*  check to see if Gauss points need to be calculated  */
    … …  
    11981198        }
    11991199
    1200         //      _pprintLine_("GaussLegendreTria - ngaus=" << *pngaus);
     1200        //      _pprintString_("GaussLegendreTria - ngaus=" << *pngaus << "\n");
    12011201        //      for (i=0; i<*pngaus; i++)
    1202         //              _pprintLine_("i=" << i << ": l1gaus=" << (*pl1 )[i] << ",l2gaus=" << (*pl2 )[i] << ",l3gaus=" << (*pl3 )[i]<< ",wgt=" << (*pwgt)[i]<< "\n");
     1202        //              _pprintString_("i=" << i << ": l1gaus=" << (*pl1 )[i] << ",l2gaus=" << (*pl2 )[i] << ",l3gaus=" << (*pl3 )[i]<< ",wgt=" << (*pwgt)[i]<< "\n" << "\n");
    12031203
    12041204        return;
    … …  
    13961396                sizeof(wgt6 )/sizeof(IssmPDouble)};
    13971397
    1398         //      _pprintLine_("GaussLegendreTetra: iord=" << iord);
     1398        //      _pprintString_("GaussLegendreTetra: iord=" << iord << "\n");
    13991399
    14001400        /*  check to see if Gauss points need to be calculated  */
    … …  
    15191519                sizeof(wgt5 )/sizeof(IssmPDouble)};
    15201520
    1521         //      _pprintLine_("Gauss-Lobatto recurrence coefficients ngaus=" << ngaus);
     1521        //      _pprintString_("Gauss-Lobatto recurrence coefficients ngaus=" << ngaus << "\n");
    15221522        *pxgaus =xNew<IssmPDouble>(ngaus);
    15231523        *pxwgt  =xNew<IssmPDouble>(ngaus);

  • issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp

    r14979 r15099  
    4747        if (xIsNan<IssmDouble>(fx1)) _error_("Function evaluation returned NaN");
    4848        cout<<setprecision(5);
    49         if(VerboseControl()) _pprintLine_("");
    50         if(VerboseControl()) _pprintLine_("       Iteration         x           f(x)       Tolerance");
    51         if(VerboseControl()) _pprintLine_("");
    52         if(VerboseControl()) _pprintLine_("           N/A    "<<setw(12)<<x1<<"  "<<setw(12)<<fx1<<"           N/A");
     49        if(VerboseControl()) _pprintString_("" << "\n");
     50        if(VerboseControl()) _pprintString_("       Iteration         x           f(x)       Tolerance" << "\n");
     51        if(VerboseControl()) _pprintString_("" << "\n");
     52        if(VerboseControl()) _pprintString_("           N/A    "<<setw(12)<<x1<<"  "<<setw(12)<<fx1<<"           N/A" << "\n");
    5353
    5454        //update tolerances
    … …  
    6363                if (xIsNan<IssmDouble>(fx2)) _error_("Function evaluation returned NaN");
    6464                if(VerboseControl())
    65                  _pprintLine_("         "<<setw(5)<<iter<<"    "<<setw(12)<<x2<<"  "<<setw(12)<<fx2<<"  "<<(fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1)));
     65                 _pprintString_("         "<<setw(5)<<iter<<"    "<<setw(12)<<x2<<"  "<<setw(12)<<fx2<<"  "<<(fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1)) << "\n");
    6666
    6767                //Stop the optimization?
    6868                if ((fabs(x2-x1)+seps)<tolerance || (fabs(fx2-fx1)+seps)<tolerance){
    69                         if(VerboseControl()) _pprintLine_("      " << "optimization terminated: the current x satisfies the termination criteria using 'tolx' of "  << tolerance);
     69                        if(VerboseControl()) _pprintString_("      " << "optimization terminated: the current x satisfies the termination criteria using 'tolx' of "  << tolerance << "\n");
    7070                        loop=false;
    7171                }
    7272                else if (iter>=maxiter){
    73                         if(VerboseControl()) _pprintLine_("      " << "exiting: Maximum number of iterations has been exceeded  - increase 'maxiter'");
     73                        if(VerboseControl()) _pprintString_("      " << "exiting: Maximum number of iterations has been exceeded  - increase 'maxiter'" << "\n");
    7474                        loop=false;
    7575                }

  • issm/trunk-jpl/src/c/shared/io/Print/Print.h

    r15097 r15099  
    1919using namespace std;
    2020/*macros:*/
    21 /* _printLine_ {{{*/
    22 /* macro to print a line, adds std::endl, only on cpu 0 */
    23 #define _printLine_(StreamArgs)\
    24   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    25           aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    26           PrintfFunction3(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    27 /*}}}*/
    2821/* _printString_ {{{*/
    2922/* macro to print some string. Only on cpu0 */
    3023#define _printString_(StreamArgs)\
    3124  do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    32           aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    33           PrintfFunction4(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    34 /*}}}*/
    35 /* _pprintLine_ {{{*/
    36 /* macro to print a line, adds std::endl, only on cpu 0 */
    37 #define _pprintLine_(StreamArgs)\
    38   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    39           aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    40           PrintfFunction(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
     25          aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs; \
     26          PrintfFunctionOnAllCpus(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    4127/*}}}*/
    4228/* _pprintString_ {{{*/
    … …  
    4430#define _pprintString_(StreamArgs)\
    4531  do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    46           aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    47           PrintfFunction2(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    48 /*}}}*/
    49 
    50 /* _printLine_ {{{*/
    51 /* macro to print a line, adds std::endl, only on cpu 0 */
    52 #define _printLine_(StreamArgs)\
    53   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    54           aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    55           PrintfFunction3(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
     32          aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs; \
     33          PrintfFunctionOnCpu0(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    5634/*}}}*/
    5735
    5836/*functions: */
    59 int PrintfFunction(const char* format,...);
    60 int PrintfFunction(const string & message);
    61 int PrintfFunction2(const string & message);
    62 int PrintfFunction3(const string & message);
    63 int PrintfFunction4(const string & message);
     37int PrintfFunctionOnCpu0(const string & message);
     38int PrintfFunctionOnAllCpus(const string & message);
    6439
    6540#endif 

  • issm/trunk-jpl/src/c/shared/io/Print/PrintfFunction.cpp

    r15097 r15099  
    11/*\file PrintfFunction.c
    2  *\brief: this function is used by the print macros, to take into account the
     2 *\brief: this function is used by the _printf_ macro, to take into account the
    33 *fact we may be running on a cluster.
    44 */
    … …  
    2020#include "../../MemOps/MemOps.h"
    2121
    22 int PrintfFunction(const char* format,...){
    23         /*http://linux.die.net/man/3/vsnprintf*/
    24 
    25         /*string to be printed: */
    26         char *buffer = NULL;
    27         int   n,size = 100;
    28         int   my_rank;
    29         //variable list of arguments
    30         va_list args;
    31 
    32         /*recover my_rank:*/
    33         my_rank=IssmComm::GetRank();
    34 
    35         while(true){
    36 
    37                 /*allocate buffer for given string size*/
    38                 buffer=xNew<char>(size);
    39 
    40                 /* Try to print in the allocated space. */
    41                 va_start(args, format);
    42                 n=vsnprintf(buffer,size,format,args);
    43                 va_end(args);
    44 
    45                 /* If that worked, return the string. */
    46                 if(n>-1 && n<size) break;
    47 
    48                 /* Else try again with more space. */
    49                 if(n>-1)   /* glibc 2.1 */
    50                  size=n+1; /* precisely what is needed */
    51                 else       /* glibc 2.0 */
    52                  size*=2;  /* twice the old size */
    53 
    54                 xDelete<char>(buffer);
    55         }
    56 
    57         /*Ok, if we are running in parallel, get node 0 to print*/
    58         if(my_rank==0)_printString_(buffer);
    59 
    60         /*Clean up and return*/
    61         xDelete<char>(buffer);
    62         return 1;
    63 }
    64 int PrintfFunction(const string & message){
     22int PrintfFunctionOnCpu0(const string & message){
    6523        int  my_rank;
    6624
    … …  
    7230                __android_log_print(ANDROID_LOG_INFO, "Native",message.c_str());
    7331                #else
    74                 ApiPrintf("%s\n",message.c_str());
     32                ApiPrintf("%s",message.c_str());
    7533                #endif
    7634        }
    7735        return 1;
    7836}
    79 int PrintfFunction2(const string & message){
    80         int  my_rank;
    81 
    82         /*recover my_rank:*/
    83         my_rank=IssmComm::GetRank();
    84 
    85         if(my_rank==0){
    86                 ApiPrintf("%s",message.c_str());
    87         }
    88         return 1;
    89 }
    90 int PrintfFunction3(const string & message){
     37int PrintfFunctionOnAllCpus(const string & message){
    9138
    9239        #ifdef _HAVE_ANDROID_JNI_
    9340        __android_log_print(ANDROID_LOG_INFO, "Native",message.c_str());
    9441        #else
    95         ApiPrintf("%s\n",message.c_str());
     42        ApiPrintf("%s",message.c_str());
    9643        #endif
    9744
    9845        return 1;
    9946}
    100 int PrintfFunction4(const string & message){
    101 
    102         ApiPrintf("%s",message.c_str());
    103 
    104         return 1;
    105 }

  • issm/trunk-jpl/src/c/solutionsequences/convergence.cpp

    r15055 r15099  
    3030        IssmDouble yts;
    3131
    32         if(VerboseModule()) _pprintLine_("   checking convergence");
     32        if(VerboseModule()) _pprintString_("   checking convergence" << "\n");
    3333
    3434        /*If uf is NULL in input, f-set is nil, model is fully constrained, therefore converged from
    … …  
    5656                nF=pf->Norm(NORM_TWO);
    5757                solver_residue=nKUF/nF;
    58                 _pprintLine_("\n" << "   solver residue: norm(KU-F)/norm(F)=" << solver_residue);
     58                _pprintString_("\n" << "   solver residue: norm(KU-F)/norm(F)=" << solver_residue << "\n");
    5959
    6060                //clean up
    … …  
    7373        res=nKUoldF/nF;
    7474        if (xIsNan<IssmDouble>(res)){
    75                 _pprintLine_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f");
     75                _pprintString_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f" << "\n");
    7676                _error_("mechanical equilibrium convergence criterion is NaN!");
    7777        }
    … …  
    8383        //print
    8484        if(res<eps_res){
    85                 if(VerboseConvergence()) _pprintLine_(setw(50)<<left<<"   mechanical equilibrium convergence criterion"<<res*100<< " < "<<eps_res*100<<" %");
     85                if(VerboseConvergence()) _pprintString_(setw(50)<<left<<"   mechanical equilibrium convergence criterion"<<res*100<< " < "<<eps_res*100<<" %" << "\n");
    8686                converged=true;
    8787        }
    8888        else{
    89                 if(VerboseConvergence()) _pprintLine_(setw(50)<<left<<"   mechanical equilibrium convergence criterion"<<res*100<<" > "<<eps_res*100<<" %");
     89                if(VerboseConvergence()) _pprintString_(setw(50)<<left<<"   mechanical equilibrium convergence criterion"<<res*100<<" > "<<eps_res*100<<" %" << "\n");
    9090                converged=false;
    9191        }
    … …  
    106106                if (!xIsNan<IssmDouble>(eps_rel)){
    107107                        if((ndu/nu)<eps_rel){
    108                                 if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " < " << eps_rel*100 << " %");
     108                                if(VerboseConvergence()) _pprintString_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " < " << eps_rel*100 << " %" << "\n");
    109109                        }
    110110                        else{
    111                                 if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " > " << eps_rel*100 << " %");
     111                                if(VerboseConvergence()) _pprintString_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " > " << eps_rel*100 << " %" << "\n");
    112112                                converged=false;
    113113                        }
    114114                }
    115                 else _pprintLine_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " %");
     115                else _pprintString_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " %" << "\n");
    116116
    117117        }
    … …  
    131131                if (!xIsNan<IssmDouble>(eps_abs)){
    132132                        if ((nduinf*yts)<eps_abs){
    133                                 if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Convergence criterion: max(du)" << nduinf*yts << " < " << eps_abs << " m/yr");
     133                                if(VerboseConvergence()) _pprintString_(setw(50) << left << "   Convergence criterion: max(du)" << nduinf*yts << " < " << eps_abs << " m/yr" << "\n");
    134134                        }
    135135                        else{
    136                                 if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Convergence criterion: max(du)" << nduinf*yts << " > " << eps_abs << " m/yr");
     136                                if(VerboseConvergence()) _pprintString_(setw(50) << left << "   Convergence criterion: max(du)" << nduinf*yts << " > " << eps_abs << " m/yr" << "\n");
    137137                                converged=false;
    138138                        }
    139139                }
    140                 else  _pprintLine_(setw(50) << left << "   Convergence criterion: max(du)" << nduinf*yts << " m/yr");
     140                else  _pprintString_(setw(50) << left << "   Convergence criterion: max(du)" << nduinf*yts << " m/yr" << "\n");
    141141
    142142        }

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

    r15077 r15099  
    9191
    9292                        if (!sedconverged){
    93                                 if(VerboseConvergence()) _pprintLine_("   #unstable constraints = " << num_unstable_constraints);
     93                                if(VerboseConvergence()) _pprintString_("   #unstable constraints = " << num_unstable_constraints << "\n");
    9494                                if(num_unstable_constraints==0) sedconverged = true;
    9595                                if (sedcount>=hydro_maxiter){
    … …  
    131131
    132132                        if (!eplconverged){
    133                                 if(VerboseConvergence()) _pprintLine_("   #unstable constraints = " << num_unstable_constraints);
     133                                if(VerboseConvergence()) _pprintString_("   #unstable constraints = " << num_unstable_constraints << "\n");
    134134                                if(num_unstable_constraints==0) eplconverged = true;
    135135                                if (eplcount>=hydro_maxiter){
    … …  
    164164                        if (!xIsNan<IssmDouble>(eps_hyd)){
    165165                                if((ndu_sed/nu_sed)<eps_hyd){
    166                                         if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Sediment Convergence criterion:" << ndu_sed/nu_sed*100 << " < " << eps_hyd*100 << " %");
     166                                        if(VerboseConvergence()) _pprintString_(setw(50) << left << "   Sediment Convergence criterion:" << ndu_sed/nu_sed*100 << " < " << eps_hyd*100 << " %" << "\n");
    167167                                        hydroconverged=true;
    168168                                }
    169169                                else{
    170                                         if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Sediment Convergence criterion:" << ndu_sed/nu_sed*100 << " > " << eps_hyd*100 << " %");
     170                                        if(VerboseConvergence()) _pprintString_(setw(50) << left << "   Sediment Convergence criterion:" << ndu_sed/nu_sed*100 << " > " << eps_hyd*100 << " %" << "\n");
    171171                                        hydroconverged=false;
    172172                                }
    173173                                if(isefficientlayer){
    174174                                        if((ndu_epl/nu_epl)<eps_hyd){
    175                                                 if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   EPL Convergence criterion:" << ndu_epl/nu_epl*100 << " < " << eps_hyd*100 << " %");
     175                                                if(VerboseConvergence()) _pprintString_(setw(50) << left << "   EPL Convergence criterion:" << ndu_epl/nu_epl*100 << " < " << eps_hyd*100 << " %" << "\n");
    176176                                        }
    177177                                        else{
    178                                                 if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   EPL Convergence criterion:" << ndu_epl/nu_epl*100 << " > " << eps_hyd*100 << " %");
     178                                                if(VerboseConvergence()) _pprintString_(setw(50) << left << "   EPL Convergence criterion:" << ndu_epl/nu_epl*100 << " > " << eps_hyd*100 << " %" << "\n");
    179179                                                hydroconverged=false;
    180180                                        }
    181181                                }
    182182                        }
    183                         else _pprintLine_(setw(50) << left << "   Convergence criterion:" << ndu_sed/nu_sed*100 << " %");
     183                        else _pprintString_(setw(50) << left << "   Convergence criterion:" << ndu_sed/nu_sed*100 << " %" << "\n");
    184184                        if (hydrocount>=hydro_maxiter){
    185185                                _error_("   maximum number for hydrological global iterations (" << hydro_maxiter << ") exceeded");

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp

    r15055 r15099  
    9393                }
    9494                if(count>=max_nonlinear_iterations){
    95                         _pprintLine_("   maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded");
     95                        _pprintString_("   maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded" << "\n");
    9696                        bool max_iteration_state=true;
    9797                        int tempStep=1;
    … …  
    104104        }
    105105
    106         if(VerboseConvergence()) _pprintLine_("\n   total number of iterations: " << count-1);
     106        if(VerboseConvergence()) _pprintString_("\n   total number of iterations: " << count-1 << "\n");
    107107
    108108        /*clean-up*/

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_nonlinear.cpp

    r15058 r15099  
    7070
    7171                ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    72                 if(VerboseConvergence()) _pprintLine_("   number of unstable constraints: " << num_unstable_constraints);
     72                if(VerboseConvergence()) _pprintString_("   number of unstable constraints: " << num_unstable_constraints << "\n");
    7373
    7474                //rift convergence
    … …  
    9090                }
    9191                if(count>=max_nonlinear_iterations){
    92                         _pprintLine_("   maximum number of nonlinear iterations (" << max_nonlinear_iterations << ") exceeded");
     92                        _pprintString_("   maximum number of nonlinear iterations (" << max_nonlinear_iterations << ") exceeded" << "\n");
    9393                        converged=true;
    9494                        InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum);
    … …  
    102102        }
    103103
    104         if(VerboseConvergence()) _pprintLine_("\n   total number of iterations: " << count-1);
     104        if(VerboseConvergence()) _pprintString_("\n   total number of iterations: " << count-1 << "\n");
    105105
    106106        /*clean-up*/

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp

    r15055 r15099  
    8989                if(converged==true)break;
    9090                if(count>=max_nonlinear_iterations){
    91                         _pprintLine_("   maximum number of iterations (" << max_nonlinear_iterations << ") exceeded");
     91                        _pprintString_("   maximum number of iterations (" << max_nonlinear_iterations << ") exceeded" << "\n");
    9292                        break;
    9393                }

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp

    r15002 r15099  
    5959
    6060                if (!converged){
    61                         if(VerboseConvergence()) _pprintLine_("   #unstable constraints = " << num_unstable_constraints);
     61                        if(VerboseConvergence()) _pprintString_("   #unstable constraints = " << num_unstable_constraints << "\n");
    6262                        if (num_unstable_constraints <= thermal_penalty_threshold)converged=true;
    6363                        if (count>=thermal_maxiter){
    6464                                converged=true;
    65                                 _pprintLine_("   maximum number of iterations (" << thermal_maxiter << ") exceeded");
     65                                _pprintString_("   maximum number of iterations (" << thermal_maxiter << ") exceeded" << "\n");
    6666                        }
    6767                }

  • issm/trunk-jpl/src/c/toolkits/issm/Bucket.h

    r15070 r15099  
    8888                /*object virtual functions definitions:*/
    8989                void    Echo(){ /*{{{*/
    90                         _printLine_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")");
    91                         _printLine_("bucket type: " << type);
    92                         _printLine_("num rows: "<<this->m<<" num cols: "<<this->n);
     90                        _printString_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")" << "\n");
     91                        _printString_("bucket type: " << type << "\n");
     92                        _printString_("num rows: "<<this->m<<" num cols: "<<this->n << "\n");
    9393                } /*}}}*/
    9494                void    DeepEcho(){ /*{{{*/
    9595                        int i,j;
    9696
    97                         _printLine_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")");
    98                         _printLine_("bucket type: " << type);
    99                         _printLine_("num rows: "<<this->m<<" num cols: "<<this->n);
     97                        _printString_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")" << "\n");
     98                        _printString_("bucket type: " << type << "\n");
     99                        _printString_("num rows: "<<this->m<<" num cols: "<<this->n << "\n");
    100100                        if(type==MATRIX_BUCKET){
    101101                                for (i=0;i<this->m;i++){
    102                                         _printLine_("row "<<this->idxm[i]<<", column indices: ");
     102                                        _printString_("row "<<this->idxm[i]<<", column indices: " << "\n");
    103103                                        for (j=0;j<this->n;j++){
    104                                                 _printLine_(" "<<this->idxn[j]);
    105                                         }
    106                                         _printLine_("values: ");
     104                                                _printString_(" "<<this->idxn[j] << "\n");
     105                                        }
     106                                        _printString_("values: " << "\n");
    107107                                        for (j=0;j<this->n;j++){
    108                                                 _printLine_(" "<<this->values[m*i+j]);
     108                                                _printString_(" "<<this->values[m*i+j] << "\n");
    109109                                        }
    110110                                }
    … …  
    112112                        else if(type==VECTOR_BUCKET){
    113113                                for (i=0;i<this->m;i++){
    114                                         _printLine_("row "<<this->idxm[i]<<", value " << this->values[i]);
     114                                        _printString_("row "<<this->idxm[i]<<", value " << this->values[i] << "\n");
    115115                                }
    116116                        }

  • issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h

    r15070 r15099  
    115115
    116116                        int i,j;
    117                         _printLine_("IssmDenseMat size " << this->M << "-" << this->N);
     117                        _printString_("IssmDenseMat size " << this->M << "-" << this->N << "\n");
    118118                        for(i=0;i<M;i++){
    119119                                for(j=0;j<N;j++){
    120120                                        _printString_(this->matrix[N*i+j] << " ");
    121121                                }
    122                                 _printLine_("");
     122                                _printString_("" << "\n");
    123123                        }
    124124                }

  • issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h

    r15070 r15099  
    144144                        for(i=0;i<IssmComm::GetSize();i++){
    145145                                if (my_rank==i){
    146                                         _printLine_("cpu " << i << " #rows: " << this->m);
     146                                        _printString_("cpu " << i << " #rows: " << this->m << "\n");
    147147                                        for (j=0;j<this->m;j++){
    148                                                 _printLine_("row " << j);
     148                                                _printString_("row " << j << "\n");
    149149                                                for (k=0;k<this->N;k++){
    150                                                         _printLine_(this->matrix[j*this->N+k] << " ");
     150                                                        _printString_(this->matrix[j*this->N+k] << " " << "\n");
    151151                                                }
    152                                                 _printLine_("");
     152                                                _printString_("" << "\n");
    153153                                        }
    154154                                }

  • issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h

    r14950 r15099  
    132132                        for(i=0;i<IssmComm::GetSize();i++){
    133133                                if (IssmComm::GetRank()==i){
    134                                         _printLine_("cpu " << i << " #rows: " << this->m);
     134                                        _printString_("cpu " << i << " #rows: " << this->m << "\n");
    135135                                        for (j=0;j<this->m;j++){
    136                                                 _printLine_("row " << j << " " << this->vector[j]);
     136                                                _printString_("row " << j << " " << this->vector[j] << "\n");
    137137                                        }
    138                                         _printLine_("");
     138                                        _printString_("" << "\n");
    139139                                }
    140140                                MPI_Barrier(IssmComm::GetComm());

  • issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h

    r14998 r15099  
    9191
    9292                        int i;
    93                         _printLine_("IssmSeqVec size " << this->M);
     93                        _printString_("IssmSeqVec size " << this->M << "\n");
    9494                        for(i=0;i<M;i++){
    9595                                _printString_(vector[i] << "\n ");

  • issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp

    r14441 r15099  
    9393        MatInfo info;
    9494        MatGetInfo(this->matrix,MAT_GLOBAL_SUM,&info);
    95         _pprintLine_("=========================== Stiffness matrix allocation info ===========================");
    96         _pprintLine_("");
    97    _pprintLine_(" Block size  : "<<info.block_size);
    98         _pprintLine_(" nz_allocated: "<<info.nz_allocated);
    99         _pprintLine_(" nz_used     : "<<info.nz_used);
    100         _pprintLine_(" nz_unneeded : "<<info.nz_unneeded<<" ("<<double(info.nz_unneeded)/double(info.nz_allocated)*100.<<"%)");
    101         _pprintLine_("");
    102         _pprintLine_("========================================================================================");
     95        _pprintString_("=========================== Stiffness matrix allocation info ===========================" << "\n");
     96        _pprintString_("" << "\n");
     97   _pprintString_(" Block size  : "<<info.block_size << "\n");
     98        _pprintString_(" nz_allocated: "<<info.nz_allocated << "\n");
     99        _pprintString_(" nz_used     : "<<info.nz_used << "\n");
     100        _pprintString_(" nz_unneeded : "<<info.nz_unneeded<<" ("<<double(info.nz_unneeded)/double(info.nz_allocated)*100.<<"%)" << "\n");
     101        _pprintString_("" << "\n");
     102        _pprintString_("========================================================================================" << "\n");
    103103}
    104104/*}}}*/

  • issm/trunk-jpl/src/wrappers/AverageFilter/AverageFilter.cpp

    r15008 r15099  
    1313
    1414void AverageFilterUsage(void){/*{{{*/
    15         _printLine_("   AverageFilter usage:");
    16         _printLine_("   [image_out]=AverageFilter(image_in,pixels);\n");
    17         _printLine_("   where:");
    18         _printLine_("      image_in in double format");
    19         _printLine_("      pixels: characteristic size of smoothing");
    20         _printLine_("      image_out in double format");
    21         _printLine_("");
     15        _printString_("   AverageFilter usage:" << "\n");
     16        _printString_("   [image_out]=AverageFilter(image_in,pixels)" << "\n");
     17        _printString_("   where:" << "\n");
     18        _printString_("      image_in in double format" << "\n");
     19        _printString_("      pixels: characteristic size of smoothing" << "\n");
     20        _printString_("      image_out in double format" << "\n");
     21        _printString_("" << "\n");
    2222}/*}}}*/
    2323WRAPPER(AverageFilter){

  • issm/trunk-jpl/src/wrappers/BamgConvertMesh/BamgConvertMesh.cpp

    r15008 r15099  
    66void BamgConvertMeshUsage(void){/*{{{*/
    77        _pprintString_("BAMGCONVERTMESH - convert [x y index] to a bamg geom and mesh geom");
    8         _pprintLine_("");
    9         _pprintLine_("   Usage:");
    10         _pprintLine_("      [bamggeom bamgmesh]=BamgConvertMesh(index,x,y);");
    11         _pprintLine_("      index: index of the mesh");
    12         _pprintLine_("      x,y: coordinates of the nodes");
    13         _pprintLine_("");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   Usage:" << "\n");
     10        _pprintString_("      [bamggeom bamgmesh]=BamgConvertMesh(index,x,y)" << "\n");
     11        _pprintString_("      index: index of the mesh" << "\n");
     12        _pprintString_("      x,y: coordinates of the nodes" << "\n");
     13        _pprintString_("" << "\n");
    1414}/*}}}*/
    1515WRAPPER(BamgConvertMesh){

  • issm/trunk-jpl/src/wrappers/BamgMesher/BamgMesher.cpp

    r15008 r15099  
    55
    66void BamgMesherUsage(void){/*{{{*/
    7         _pprintLine_("");
    8         _pprintLine_("   usage: [bamgmesh,bamggeom]=" << __FUNCT__ << "(bamgmesh,bamggeom,bamgoptions);");
    9         _pprintLine_("");
     7        _pprintString_("" << "\n");
     8        _pprintString_("   usage: [bamgmesh,bamggeom]=" << __FUNCT__ << "(bamgmesh,bamggeom,bamgoptions)" << "\n");
     9        _pprintString_("" << "\n");
    1010}/*}}}*/
    1111WRAPPER(BamgMesher){

  • issm/trunk-jpl/src/wrappers/BamgTriangulate/BamgTriangulate.cpp

    r15008 r15099  
    66void BamgTriangulateUsage(void){/*{{{*/
    77        _pprintString_("BAMGTRIANGULATE - Delaunay Triangulation of a list of points");
    8         _pprintLine_("");
    9         _pprintLine_("   Usage:");
    10         _pprintLine_("      index=BamgTriangulate(x,y);");
    11         _pprintLine_("      index: index of the triangulation");
    12         _pprintLine_("      x,y: coordinates of the nodes");
    13         _pprintLine_("");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   Usage:" << "\n");
     10        _pprintString_("      index=BamgTriangulate(x,y);" << "\n");
     11        _pprintString_("      index: index of the triangulation" << "\n");
     12        _pprintString_("      x,y: coordinates of the nodes" << "\n");
     13        _pprintString_("" << "\n");
    1414}/*}}}*/
    1515WRAPPER(BamgTriangulate){
    … …  
    3636
    3737        /*Input datasets: */
    38         if (verbose) _printLine_("Fetching inputs");
     38        if (verbose) _printString_("Fetching inputs" << "\n");
    3939        FetchData(&x,&nods,&x_cols,XHANDLE);
    4040        FetchData(&y,&y_rows,&y_cols,YHANDLE);
    … …  
    4646
    4747        /* Run core computations: */
    48         if (verbose) _printLine_("Call core");
     48        if (verbose) _printString_("Call core" << "\n");
    4949        BamgTriangulatex(&index,&nels,x,y,nods);
    5050

  • issm/trunk-jpl/src/wrappers/Chaco/Chaco.cpp

    r13250 r15099  
    1212
    1313void ChacoUsage(void){/*{{{*/
    14         _pprintLine_("");
    15         _pprintLine_("Usage: [assgn] = Chaco(A,vwgts,ewgts,x,y,z,options,nparts,goal);");
    16         _pprintLine_("");
     14        _pprintString_("" << "\n");
     15        _pprintString_("Usage: [assgn] = Chaco(A,vwgts,ewgts,x,y,z,options,nparts,goal);" << "\n");
     16        _pprintString_("" << "\n");
    1717}/*}}}*/
    1818WRAPPER(Chaco){
    … …  
    8686        /*Some debugging print: {{{*/
    8787        #ifdef _DEBUG_
    88         _printLine_("nvtxs: " << nvtxs);
     88        _printString_("nvtxs: " << nvtxs << "\n");
    8989        _printString_("options: [");
    9090        for(i=0;i<10;i++)_printString_(options[i] << "|");
    91         _printLine_("]");
    92         _printLine_("start: ");
     91        _printString_("]" << "\n");
     92        _printString_("start: " << "\n");
    9393        for (i=0; i<nvtxs+1;i++)_printString_(start[i] << " ");
    94         _printLine_("");
    95         _printLine_("adjacency: ");
     94        _printString_("" << "\n");
     95        _printString_("adjacency: " << "\n");
    9696        for (i=0; i<mxGetNzmax(A_IN);i++)_printString_("" <<adjacency[i]<< " ");i++)
    97         _printLine_("");
    98         _printLine_("nedges: " << nedges << " " << ewgts);
     97        _printString_("" << "\n");
     98        _printString_("nedges: " << nedges << " " << ewgts << "\n");
    9999        if(ewgts) for (i = 0; i < nedges; i++)_printString_(ewgts[i] << " ");
    100         _printLine_("");
    101         _printLine_("vwgts:");
     100        _printString_("" << "\n");
     101        _printString_("vwgts:" << "\n");
    102102        for (i = 0; i < nvtxs; i++)_printString_(vwgts[i] << " ");
    103         _printLine_("");
    104         _printLine_("nparts: " << nparts[0]);
    105         _printLine_("goal: " << goal);
     103        _printString_("" << "\n");
     104        _printString_("nparts: " << nparts[0] << "\n");
     105        _printString_("goal: " << goal << "\n");
    106106        #endif
    107107        /*}}}*/

  • issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.cpp

    r15008 r15099  
    77
    88void ContourToMeshUsage(void){/*{{{*/
    9         _printLine_("CONTOURTOMESH - Flag the elements or nodes inside a contour");
    10         _printLine_("");
    11         _printLine_("      Usage: ");
    12         _printLine_("         [in_nod,in_elem]=ContourToMesh(index,x,y,contourname,interptype,edgevalue)\n");
    13         _printLine_("");
    14         _printLine_("         index,x,y: mesh triangulation.");
    15         _printLine_("         contourname: name of .exp file containing the contours.");
    16         _printLine_("         interptype: string definining type of interpolation ('element', or 'node').");
    17         _printLine_("         edgevalue: integer (0, 1 or 2) defining the value associated to the nodes on the edges of the polygons.");
    18         _printLine_("         in_nod: vector of flags (0 or 1), of size nods if interptype is set to 'node' or 'element and node', ");
    19         _printLine_("            or of size 0 otherwise.");
    20         _printLine_("         in_elem: vector of flags (0 or 1), of size nel if interptype is set to 'element' or 'element and node', ");
    21         _printLine_("            or of size 0 otherwise.");
    22         _printLine_("");
    23         _printLine_("      Example: ");
    24         _printLine_("         in_nod=ContourToMesh(md.elements,md.x,md.y,'Contour.exp','node',1)");
    25         _printLine_("         in_elements=ContourToMesh(md.elements,md.x,md.y,'Contour.exp','element',0)");
    26         _printLine_("         [in_nodes,in_elements]=ContourToMesh(md.elements,md.x,md.y,'Contour.exp','element and node',0)");
    27         _printLine_("");
     9        _printString_("CONTOURTOMESH - Flag the elements or nodes inside a contour" << "\n");
     10        _printString_("" << "\n");
     11        _printString_("      Usage: " << "\n");
     12        _printString_("         [in_nod,in_elem]=ContourToMesh(index,x,y,contourname,interptype,edgevalue)" << "\n");
     13        _printString_("" << "\n");
     14        _printString_("         index,x,y: mesh triangulation." << "\n");
     15        _printString_("         contourname: name of .exp file containing the contours." << "\n");
     16        _printString_("         interptype: string definining type of interpolation ('element', or 'node')." << "\n");
     17        _printString_("         edgevalue: integer (0, 1 or 2) defining the value associated to the nodes on the edges of the polygons." << "\n");
     18        _printString_("         in_nod: vector of flags (0 or 1), of size nods if interptype is set to 'node' or 'element and node', " << "\n");
     19        _printString_("            or of size 0 otherwise." << "\n");
     20        _printString_("         in_elem: vector of flags (0 or 1), of size nel if interptype is set to 'element' or 'element and node', " << "\n");
     21        _printString_("            or of size 0 otherwise." << "\n");
     22        _printString_("" << "\n");
     23        _printString_("      Example: " << "\n");
     24        _printString_("         in_nod=ContourToMesh(md.elements,md.x,md.y,'Contour.exp','node',1)" << "\n");
     25        _printString_("         in_elements=ContourToMesh(md.elements,md.x,md.y,'Contour.exp','element',0)" << "\n");
     26        _printString_("         [in_nodes,in_elements]=ContourToMesh(md.elements,md.x,md.y,'Contour.exp','element and node',0)" << "\n");
     27        _printString_("" << "\n");
    2828}/*}}}*/
    2929WRAPPER(ContourToMesh){

  • issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp

    r15008 r15099  
    66
    77void ContourToNodesUsage(void){/*{{{*/
    8         _printLine_("   usage:");
    9         _printLine_("   [flags]=ContourToNodes(x,y,contourname,edgevalue);\n");
    10         _printLine_("   where:");
    11         _printLine_("      x,y: list of nodes.");
    12         _printLine_("      contourname: name of .exp file containing the contours, or resulting structure from call to expread.");
    13         _printLine_("      edgevalue: integer (0, 1 or 2) defining the value associated to the nodes on the edges of the polygons.");
    14         _printLine_("      flags: vector of flags (0 or 1), of size nods.");
    15         _printLine_("");
     8        _printString_("   usage:" << "\n");
     9        _printString_("   [flags]=ContourToNodes(x,y,contourname,edgevalue);" << "\n");
     10        _printString_("   where:" << "\n");
     11        _printString_("      x,y: list of nodes." << "\n");
     12        _printString_("      contourname: name of .exp file containing the contours, or resulting structure from call to expread." << "\n");
     13        _printString_("      edgevalue: integer (0, 1 or 2) defining the value associated to the nodes on the edges of the polygons." << "\n");
     14        _printString_("      flags: vector of flags (0 or 1), of size nods." << "\n");
     15        _printString_("" << "\n");
    1616}/*}}}*/
    1717WRAPPER(ContourToNodes){

  • issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.cpp

    r15008 r15099  
    66
    77void EdgeDetectionUsage(void){/*{{{*/
    8         _pprintLine_("EDGEDETECTION usage- detect edges of a boolean image");
    9         _pprintLine_("");
    10         _pprintLine_("   Usage:");
    11         _pprintLine_("      contours=EdgeDetection(image);");
    12         _pprintLine_("");
    13         _pprintLine_("      image: boolean matrix");
    14         _pprintLine_("");
    15         _pprintLine_("   Example:");
    16         _pprintLine_("      load('velocities.mat');");
    17         _pprintLine_("      md.inversion.vx_obs=EdgeDetection(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);");
    18         _pprintLine_("");
     8        _pprintString_("EDGEDETECTION usage- detect edges of a boolean image" << "\n");
     9        _pprintString_("" << "\n");
     10        _pprintString_("   Usage:" << "\n");
     11        _pprintString_("      contours=EdgeDetection(image);" << "\n");
     12        _pprintString_("" << "\n");
     13        _pprintString_("      image: boolean matrix" << "\n");
     14        _pprintString_("" << "\n");
     15        _pprintString_("   Example:" << "\n");
     16        _pprintString_("      load('velocities.mat');" << "\n");
     17        _pprintString_("      md.inversion.vx_obs=EdgeDetection(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);" << "\n");
     18        _pprintString_("" << "\n");
    1919}/*}}}*/
    2020WRAPPER(EdgeDetection){

  • issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.cpp

    r15008 r15099  
    66
    77void ElementConnectivityUsage(void) {/*{{{*/
    8         _pprintLine_("");
    9         _pprintLine_("   usage: elementconnectivity = " << __FUNCT__ << "(elements, nodeconnectivity);");
    10         _pprintLine_("");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   usage: elementconnectivity = " << __FUNCT__ << "(elements, nodeconnectivity);" << "\n");
     10        _pprintString_("" << "\n");
    1111}/*}}}*/
    1212WRAPPER(ElementConnectivity){

  • issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.cpp

    r15008 r15099  
    66
    77void EnumToStringUsage(void){/*{{{*/
    8         _pprintLine_("");
    9         _pprintLine_("   usage: " << __FUNCT__ << "string = EnumToString(enum);");
    10         _pprintLine_("");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   usage: " << __FUNCT__ << "string = EnumToString(enum);" << "\n");
     10        _pprintString_("" << "\n");
    1111}/*}}}*/
    1212WRAPPER(EnumToString){

  • issm/trunk-jpl/src/wrappers/Exp2Kml/Exp2Kml.cpp

    r13250 r15099  
    55
    66void Exp2KmlUsage(void){/*{{{*/
    7         _pprintLine_("Exp2Kml - exp to kml file conversion module:");
    8         _pprintLine_("");
    9         _pprintLine_("   This module converts a file from exp to kml format.");
    10         _pprintLine_("");
    11         _pprintLine_("   Usage:");
    12         _pprintLine_("      [ret]=Exp2Kml(filexp,filkml,sgn,'param name',param,...);");
    13         _pprintLine_("");
    14         _pprintLine_("      filexp      file name of exp file to be read (char)");
    15         _pprintLine_("      filkml      file name of kml file to be written (char)");
    16         _pprintLine_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))");
    17         _pprintLine_("");
    18         _pprintLine_("      central_meridian     central meridian (double, optional, but must specify with sp)");
    19         _pprintLine_("      standard_parallel    standard parallel (double, optional, but must specify with cm)");
    20         _pprintLine_("      holes       flag for treatment of multiple profiles (char, optional, 'yes' for holes))");
    21         _pprintLine_("");
    22         _pprintLine_("      ret         return code (non-zero for warning)");
    23         _pprintLine_("");
    24         _pprintLine_("   Examples:");
    25         _pprintLine_("      [ret]=Exp2Kml('file.exp','file.kml', 1);");
    26         _pprintLine_("      [ret]=Exp2Kml('file.exp','file.kml', 1,'central_meridian',45,'standard_parallel',70,'holes','yes');");
    27         _pprintLine_("      [ret]=Exp2Kml('file.exp','file.kml',-1,'central_meridian', 0,'standard_parallel',71,'holes','yes');");
    28         _pprintLine_("");
     7        _pprintString_("Exp2Kml - exp to kml file conversion module:" << "\n");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   This module converts a file from exp to kml format." << "\n");
     10        _pprintString_("" << "\n");
     11        _pprintString_("   Usage:" << "\n");
     12        _pprintString_("      [ret]=Exp2Kml(filexp,filkml,sgn,'param name',param,...);" << "\n");
     13        _pprintString_("" << "\n");
     14        _pprintString_("      filexp      file name of exp file to be read (char)" << "\n");
     15        _pprintString_("      filkml      file name of kml file to be written (char)" << "\n");
     16        _pprintString_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))" << "\n");
     17        _pprintString_("" << "\n");
     18        _pprintString_("      central_meridian     central meridian (double, optional, but must specify with sp)" << "\n");
     19        _pprintString_("      standard_parallel    standard parallel (double, optional, but must specify with cm)" << "\n");
     20        _pprintString_("      holes       flag for treatment of multiple profiles (char, optional, 'yes' for holes))" << "\n");
     21        _pprintString_("" << "\n");
     22        _pprintString_("      ret         return code (non-zero for warning)" << "\n");
     23        _pprintString_("" << "\n");
     24        _pprintString_("   Examples:" << "\n");
     25        _pprintString_("      [ret]=Exp2Kml('file.exp','file.kml', 1);" << "\n");
     26        _pprintString_("      [ret]=Exp2Kml('file.exp','file.kml', 1,'central_meridian',45,'standard_parallel',70,'holes','yes');" << "\n");
     27        _pprintString_("      [ret]=Exp2Kml('file.exp','file.kml',-1,'central_meridian', 0,'standard_parallel',71,'holes','yes');" << "\n");
     28        _pprintString_("" << "\n");
    2929}/*}}}*/
    3030WRAPPER(Exp2Kml){
    … …  
    6767        if (options->GetOption("central_meridian") || options->GetOption("standard_parallel")) {
    6868                options->Get(&cm,"central_meridian");
    69                 if (verbose) _printLine_("  cm=" << cm);
     69                if (verbose) _printString_("  cm=" << cm << "\n");
    7070                options->Get(&sp,"standard_parallel");
    71                 if (verbose) _printLine_("  sp=" << sp);
     71                if (verbose) _printString_("  sp=" << sp << "\n");
    7272        }
    7373

  • issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp

    r15095 r15099  
    55
    66void ExpSimplifyUsage(void){/*{{{*/
    7         _printLine_("ExpSimplify - Simplify Exp contour");
    8         _printLine_("");
    9         _printLine_("   Recursive Douglas-Peucker Polygon Simplification");
    10         _printLine_("");
    11         _printLine_("   Usage:");
    12         _printLine_("      ExpSimplify(expfile,tol);");
    13         _printLine_("      - expfile: name of the exp file");
    14         _printLine_("      - tol:  tolerance (maximal euclidean distance allowed between the new line and a vertex)");
    15         _printLine_("      Additional options:");
    16         _printLine_("      - 'min': minimum number of vertices to save contours in exp file (default is 3)");
    17         _printLine_("");
    18         _printLine_("   Example:");
    19         _printLine_("      ExpSimplify('file.exp',100);");
    20         _printLine_("      ExpSimplify('file.exp',100,'remove1',false);");
     7        _printString_("ExpSimplify - Simplify Exp contour" << "\n");
     8        _printString_("" << "\n");
     9        _printString_("   Recursive Douglas-Peucker Polygon Simplification" << "\n");
     10        _printString_("" << "\n");
     11        _printString_("   Usage:" << "\n");
     12        _printString_("      ExpSimplify(expfile,tol);" << "\n");
     13        _printString_("      - expfile: name of the exp file" << "\n");
     14        _printString_("      - tol:  tolerance (maximal euclidean distance allowed between the new line and a vertex)" << "\n");
     15        _printString_("      Additional options:" << "\n");
     16        _printString_("      - 'min': minimum number of vertices to save contours in exp file (default is 3)" << "\n");
     17        _printString_("" << "\n");
     18        _printString_("   Example:" << "\n");
     19        _printString_("      ExpSimplify('file.exp',100);" << "\n");
     20        _printString_("      ExpSimplify('file.exp',100,'remove1',false);" << "\n");
    2121}/*}}}*/
    2222void simplify(Contour<double>* contour,bool* flags,int ind0,int ind1,double tolerance){/*{{{*/
    … …  
    145145                x       = contour->x;
    146146                y       = contour->y;
    147                 _printLine_("   Initial number of vertices in contour #"<<counter+1<<": "<<nods);
     147                _printString_("   Initial number of vertices in contour #"<<counter+1<<": "<<nods << "\n");
    148148
    149149                /*Allocate flags (1=keep, 0=remove)*/
    … …  
    183183                /*Do we save new profile?*/
    184184                if(newnods>=minimumvertices){
    185                         _printLine_("   Final   number of vertices in contour #"<<counter+1<<": "<<newnods);
     185                        _printString_("   Final   number of vertices in contour #"<<counter+1<<": "<<newnods << "\n");
    186186                        newcontour       = xNew<Contour<double> >(1);
    187187                        newcontour->nods = newnods;
    … …  
    202202                }
    203203                else{
    204                         _printLine_("   Final   number of vertices in contour #"<<counter+1<<": "<<newnods<<" (not saved)");
     204                        _printString_("   Final   number of vertices in contour #"<<counter+1<<": "<<newnods<<" (not saved)" << "\n");
    205205                }
    206206
    … …  
    208208                xDelete<bool>(flags);
    209209        }
    210         _printLine_("   Initial number of contours: "<<oldcontours->Size());
    211         _printLine_("   Final   number of contours: "<<newcontours->Size());
     210        _printString_("   Initial number of contours: "<<oldcontours->Size() << "\n");
     211        _printString_("   Final   number of contours: "<<newcontours->Size() << "\n");
    212212
    213213        /*Write data: */

  • issm/trunk-jpl/src/wrappers/HoleFiller/HoleFiller.cpp

    r15008 r15099  
    1313
    1414void HoleFillerUsage(void){/*{{{*/
    15         _printLine_("   HoleFiller usage:");
    16         _printLine_("   [image_out]=HoleFiller(image_in,smooth);\n");
    17         _printLine_("   where:");
    18         _printLine_("      image_in in double format");
    19         _printLine_("      smooth: 1 to smooth with a box filer, 0 to leave data raw");
    20         _printLine_("      image_out in double format");
    21         _printLine_("");
     15        _printString_("   HoleFiller usage:" << "\n");
     16        _printString_("   [image_out]=HoleFiller(image_in,smooth);" << "\n");
     17        _printString_("   where:" << "\n");
     18        _printString_("      image_in in double format" << "\n");
     19        _printString_("      smooth: 1 to smooth with a box filer, 0 to leave data raw" << "\n");
     20        _printString_("      image_out in double format" << "\n");
     21        _printString_("" << "\n");
    2222}/*}}}*/
    2323WRAPPER(HoleFiller){

  • issm/trunk-jpl/src/wrappers/InternalFront/InternalFront.cpp

    r14304 r15099  
    66
    77void InternalFrontUsage(void) {/*{{{*/
    8         _pprintLine_("");
    9         _pprintLine_("   usage: icefront = " << __FUNCT__ << "(md);");
    10         _pprintLine_("");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   usage: icefront = " << __FUNCT__ << "(md);" << "\n");
     10        _pprintString_("" << "\n");
    1111}/*}}}*/
    1212WRAPPER(InternalFront){

  • issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp

    r14656 r15099  
    66
    77void InterpFromGridToMeshUsage(void){/*{{{*/
    8         _pprintLine_("INTERPFROMGRIDTOMESH - interpolation from a grid onto a list of points");
    9         _pprintLine_("");
    10         _pprintLine_("   This function is a multi-threaded mex file that interpolates a field");
    11         _pprintLine_("   defined on a grid onto a list of points");
    12         _pprintLine_("");
    13         _pprintLine_("   Usage:");
    14         _pprintLine_("      data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value);");
    15         _pprintLine_("");
    16         _pprintLine_("      data: matrix holding the data to be interpolated onto the mesh.");
    17         _pprintLine_("      x,y: coordinates of matrix data. (x and y must be in increasing order)");
    18         _pprintLine_("      x_mesh,y_mesh: coordinates of the points onto which we interpolate.");
    19         _pprintLine_("      default_value: default value if no data is found (holes).");
    20         _pprintLine_("      data_mesh: vector of mesh interpolated data.");
    21         _pprintLine_("");
    22         _pprintLine_("   Example:");
    23         _pprintLine_("      load('velocities.mat');");
    24         _pprintLine_("      md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);");
    25         _pprintLine_("");
     8        _pprintString_("INTERPFROMGRIDTOMESH - interpolation from a grid onto a list of points" << "\n");
     9        _pprintString_("" << "\n");
     10        _pprintString_("   This function is a multi-threaded mex file that interpolates a field" << "\n");
     11        _pprintString_("   defined on a grid onto a list of points" << "\n");
     12        _pprintString_("" << "\n");
     13        _pprintString_("   Usage:" << "\n");
     14        _pprintString_("      data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value);" << "\n");
     15        _pprintString_("" << "\n");
     16        _pprintString_("      data: matrix holding the data to be interpolated onto the mesh." << "\n");
     17        _pprintString_("      x,y: coordinates of matrix data. (x and y must be in increasing order)" << "\n");
     18        _pprintString_("      x_mesh,y_mesh: coordinates of the points onto which we interpolate." << "\n");
     19        _pprintString_("      default_value: default value if no data is found (holes)." << "\n");
     20        _pprintString_("      data_mesh: vector of mesh interpolated data." << "\n");
     21        _pprintString_("" << "\n");
     22        _pprintString_("   Example:" << "\n");
     23        _pprintString_("      load('velocities.mat');" << "\n");
     24        _pprintString_("      md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);" << "\n");
     25        _pprintString_("" << "\n");
    2626}/*}}}*/
    2727WRAPPER(InterpFromGridToMesh){

  • issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp

    r14656 r15099  
    66
    77void InterpFromMesh2dUsage(void){/*{{{*/
    8         _pprintLine_("   usage:");
    9         _pprintLine_("         data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime);\n");
    10         _pprintLine_("      or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value);\n");
    11         _pprintLine_("      or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value,contourname);\n");
    12         _pprintLine_("   where:");
    13         _pprintLine_("      x,y: coordinates of the nodes where data is defined");
    14         _pprintLine_("      index: index of the mesh where data is defined");
    15         _pprintLine_("      data - vector holding the data to be interpolated onto the points.");
    16         _pprintLine_("      x_prime,y_prime: coordinates of the mesh vertices onto which we interpolate.");
    17         _pprintLine_("      default_value: a scalar or vector of size length(x_prime).");
    18         _pprintLine_("      contourname: linear interpolation will happen on all x_interp,y_interp inside the contour, default value will be adopted on the rest of the mesh.");
    19         _pprintLine_("      data_prime:  vector of prime interpolated data.");
    20         _pprintLine_("");
     8        _pprintString_("   usage:" << "\n");
     9        _pprintString_("         data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime);" << "\n");
     10        _pprintString_("      or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value);" << "\n");
     11        _pprintString_("      or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value,contourname);" << "\n");
     12        _pprintString_("   where:" << "\n");
     13        _pprintString_("      x,y: coordinates of the nodes where data is defined" << "\n");
     14        _pprintString_("      index: index of the mesh where data is defined" << "\n");
     15        _pprintString_("      data - vector holding the data to be interpolated onto the points." << "\n");
     16        _pprintString_("      x_prime,y_prime: coordinates of the mesh vertices onto which we interpolate." << "\n");
     17        _pprintString_("      default_value: a scalar or vector of size length(x_prime)." << "\n");
     18        _pprintString_("      contourname: linear interpolation will happen on all x_interp,y_interp inside the contour, default value will be adopted on the rest of the mesh." << "\n");
     19        _pprintString_("      data_prime:  vector of prime interpolated data." << "\n");
     20        _pprintString_("" << "\n");
    2121}/*}}}*/
    2222WRAPPER(InterpFromMesh2d){
    … …  
    113113                /* Debugging of contours :{{{1*/
    114114                /*for(i=0;i<numcontours;i++){
    115                   _printLine_("\nContour echo: contour number  " << i+1 << " / " << numcontours);
     115                  _printString_("\nContour echo: contour number  " << i+1 << " / " << numcontours << "\n");
    116116                  contouri=*(contours+i);
    117                   _printLine_("   Number of vertices " << contouri->nods);
     117                  _printString_("   Number of vertices " << contouri->nods << "\n");
    118118                  for (j=0;j<contouri->nods;j++){
    119                   _printLine_("   " << *(contouri->x+j) << "f " << *(contouri->y+j) << "f");
     119                  _printString_("   " << *(contouri->x+j) << "f " << *(contouri->y+j) << "f" << "\n");
    120120                  }
    121121                  }*/

  • issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp

    r13236 r15099  
    66
    77void InterpFromMeshToGridUsage(void){/*{{{*/
    8         _pprintLine_("INTERPFROMMESHTOGRID - interpolation of a data defined on a mesh onto a grid");
    9         _pprintLine_("");
    10         _pprintLine_("   This function is a multi-threaded mex file that interpolates a field");
    11         _pprintLine_("   defined on a triangular mesh onto a regular grid");
    12         _pprintLine_("");
    13         _pprintLine_("   Usage:");
    14         _pprintLine_("      [x_m,y_m,griddata]=InterpFromMeshToGrid(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value)");
    15         _pprintLine_("");
    16         _pprintLine_("      index,x,y: delaunay triangulation defining the mesh.");
    17         _pprintLine_("      meshdata: vertex values of data to be interpolated.");
    18         _pprintLine_("      xmin,ymax,posting,nlines,ncols: parameters that define the grid");
    19         _pprintLine_("      default_value: value of points located out of the mesh.");
    20         _pprintLine_("");
     8        _pprintString_("INTERPFROMMESHTOGRID - interpolation of a data defined on a mesh onto a grid" << "\n");
     9        _pprintString_("" << "\n");
     10        _pprintString_("   This function is a multi-threaded mex file that interpolates a field" << "\n");
     11        _pprintString_("   defined on a triangular mesh onto a regular grid" << "\n");
     12        _pprintString_("" << "\n");
     13        _pprintString_("   Usage:" << "\n");
     14        _pprintString_("      [x_m,y_m,griddata]=InterpFromMeshToGrid(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value)" << "\n");
     15        _pprintString_("" << "\n");
     16        _pprintString_("      index,x,y: delaunay triangulation defining the mesh." << "\n");
     17        _pprintString_("      meshdata: vertex values of data to be interpolated." << "\n");
     18        _pprintString_("      xmin,ymax,posting,nlines,ncols: parameters that define the grid" << "\n");
     19        _pprintString_("      default_value: value of points located out of the mesh." << "\n");
     20        _pprintString_("" << "\n");
    2121}/*}}}*/
    2222WRAPPER(InterpFromMeshToGrid){

  • issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp

    r13236 r15099  
    55
    66void InterpFromMeshToMesh2dUsage(void){/*{{{*/
    7         _pprintLine_("INTERFROMMESHTOMESH2D - interpolation from a 2d triangular mesh onto a list of point");
    8         _pprintLine_("");
    9         _pprintLine_("   This function is a multi-threaded mex file that interpolates a field");
    10         _pprintLine_("   defined on a Delaunay triangulation onto a list of point");
    11         _pprintLine_("");
    12         _pprintLine_("   Usage:");
    13         _pprintLine_("         data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp);");
    14         _pprintLine_("      or data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp,OPTIONS);");
    15         _pprintLine_("");
    16         _pprintLine_("      index             : index of the mesh where data is defined");
    17         _pprintLine_("      x,y               : coordinates of the nodes where data is defined");
    18         _pprintLine_("      data              : matrix holding the data to be interpolated onto the mesh. (one column per field)");
    19         _pprintLine_("      x_interp,y_interp : coordinates of the points onto which we interpolate.");
    20         _pprintLine_("      data_interp       : vector of mesh interpolated data.");
    21         _pprintLine_("      Available options :");
    22         _pprintLine_("         - 'default' : default value if point is outsite of triangulation (instead of linear interolation)");
    23         _pprintLine_("");
    24         _pprintLine_("   Example:");
    25         _pprintLine_("      load('temperature.mat');");
    26         _pprintLine_("      md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y);");
    27         _pprintLine_("      md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y,'default',253);");
    28         _pprintLine_("");
     7        _pprintString_("INTERFROMMESHTOMESH2D - interpolation from a 2d triangular mesh onto a list of point" << "\n");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   This function is a multi-threaded mex file that interpolates a field" << "\n");
     10        _pprintString_("   defined on a Delaunay triangulation onto a list of point" << "\n");
     11        _pprintString_("" << "\n");
     12        _pprintString_("   Usage:" << "\n");
     13        _pprintString_("         data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp);" << "\n");
     14        _pprintString_("      or data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp,OPTIONS);" << "\n");
     15        _pprintString_("" << "\n");
     16        _pprintString_("      index             : index of the mesh where data is defined" << "\n");
     17        _pprintString_("      x,y               : coordinates of the nodes where data is defined" << "\n");
     18        _pprintString_("      data              : matrix holding the data to be interpolated onto the mesh. (one column per field)" << "\n");
     19        _pprintString_("      x_interp,y_interp : coordinates of the points onto which we interpolate." << "\n");
     20        _pprintString_("      data_interp       : vector of mesh interpolated data." << "\n");
     21        _pprintString_("      Available options :" << "\n");
     22        _pprintString_("         - 'default' : default value if point is outsite of triangulation (instead of linear interolation)" << "\n");
     23        _pprintString_("" << "\n");
     24        _pprintString_("   Example:" << "\n");
     25        _pprintString_("      load('temperature.mat');" << "\n");
     26        _pprintString_("      md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y);" << "\n");
     27        _pprintString_("      md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y,'default',253);" << "\n");
     28        _pprintString_("" << "\n");
    2929}/*}}}*/
    3030WRAPPER(InterpFromMeshToMesh2d){

  • issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp

    r14656 r15099  
    66
    77void InterpFromMeshToMesh3dUsage(void){/*{{{*/
    8         _pprintLine_("INTERPFROMMESHTOMESH3D - interpolation from a 3d hexahedron mesh onto a list of point");
    9         _pprintLine_("");
    10         _pprintLine_("   This function is a multi-threaded mex file that interpolates a field");
    11         _pprintLine_("   defined on a triangular mesh onto a list of point");
    12         _pprintLine_("");
    13         _pprintLine_("   Usage:");
    14         _pprintLine_("      data_prime=InterpFromMeshToMesh3d(index,x,y,z,data,x_prime,y_prime,z_prime,default_value);");
    15         _pprintLine_("");
    16         _pprintLine_("      index: index of the mesh where data is defined");
    17         _pprintLine_("      x,y,z: coordinates of the nodes where data is defined");
    18         _pprintLine_("      data: matrix holding the data to be interpolated onto the mesh.");
    19         _pprintLine_("      x_prime,y_prime,z_prime: coordinates of the points onto which we interpolate.");
    20         _pprintLine_("      default_value: default value if no data is found (holes).");
    21         _pprintLine_("      data_prime: vector of mesh interpolated data.");
    22         _pprintLine_("");
    23         _pprintLine_("   Example:");
    24         _pprintLine_("      load('temperature.mat');");
    25         _pprintLine_("      md.initialization.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.mesh.x,md.mesh.y,md.mesh.z,253);");
    26         _pprintLine_("");
     8        _pprintString_("INTERPFROMMESHTOMESH3D - interpolation from a 3d hexahedron mesh onto a list of point" << "\n");
     9        _pprintString_("" << "\n");
     10        _pprintString_("   This function is a multi-threaded mex file that interpolates a field" << "\n");
     11        _pprintString_("   defined on a triangular mesh onto a list of point" << "\n");
     12        _pprintString_("" << "\n");
     13        _pprintString_("   Usage:" << "\n");
     14        _pprintString_("      data_prime=InterpFromMeshToMesh3d(index,x,y,z,data,x_prime,y_prime,z_prime,default_value);" << "\n");
     15        _pprintString_("" << "\n");
     16        _pprintString_("      index: index of the mesh where data is defined" << "\n");
     17        _pprintString_("      x,y,z: coordinates of the nodes where data is defined" << "\n");
     18        _pprintString_("      data: matrix holding the data to be interpolated onto the mesh." << "\n");
     19        _pprintString_("      x_prime,y_prime,z_prime: coordinates of the points onto which we interpolate." << "\n");
     20        _pprintString_("      default_value: default value if no data is found (holes)." << "\n");
     21        _pprintString_("      data_prime: vector of mesh interpolated data." << "\n");
     22        _pprintString_("" << "\n");
     23        _pprintString_("   Example:" << "\n");
     24        _pprintString_("      load('temperature.mat');" << "\n");
     25        _pprintString_("      md.initialization.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.mesh.x,md.mesh.y,md.mesh.z,253);" << "\n");
     26        _pprintString_("" << "\n");
    2727}/*}}}*/
    2828WRAPPER(InterpFromMeshToMesh3d){

  • issm/trunk-jpl/src/wrappers/KMLFileRead/KMLFileRead.cpp

    r13250 r15099  
    55
    66void KMLFileReadUsage(void){/*{{{*/
    7         _pprintLine_("KMLFileRead - KML file reader module:");
    8         _pprintLine_("");
    9         _pprintLine_("   This module reads a KML file.");
    10         _pprintLine_("");
    11         _pprintLine_("   Usage:");
    12         _pprintLine_("      [ierror]=KMLFileRead(kmlfile,'param name',param,...);");
    13         _pprintLine_("");
    14         _pprintLine_("      kmlfile      file name of kml file to be read (char)");
    15         _pprintLine_("");
    16         _pprintLine_("      echo         echo command (char, optional, 'off'/'on')");
    17         _pprintLine_("      deepecho     deep echo command (char, optional, 'off'/'on')");
    18         _pprintLine_("      write        write command (char, optional, 'off'/'stdout'/kmlfile)");
    19         _pprintLine_("");
    20         _pprintLine_("      ierror       return code (non-zero for error)");
    21         _pprintLine_("");
    22         _pprintLine_("   Examples:");
    23         _pprintLine_("      [ierror]=KMLFileRead('file.kml','deepecho','on');");
    24         _pprintLine_("      [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml');");
    25         _pprintLine_("");
     7        _pprintString_("KMLFileRead - KML file reader module:" << "\n");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   This module reads a KML file." << "\n");
     10        _pprintString_("" << "\n");
     11        _pprintString_("   Usage:" << "\n");
     12        _pprintString_("      [ierror]=KMLFileRead(kmlfile,'param name',param,...);" << "\n");
     13        _pprintString_("" << "\n");
     14        _pprintString_("      kmlfile      file name of kml file to be read (char)" << "\n");
     15        _pprintString_("" << "\n");
     16        _pprintString_("      echo         echo command (char, optional, 'off'/'on')" << "\n");
     17        _pprintString_("      deepecho     deep echo command (char, optional, 'off'/'on')" << "\n");
     18        _pprintString_("      write        write command (char, optional, 'off'/'stdout'/kmlfile)" << "\n");
     19        _pprintString_("" << "\n");
     20        _pprintString_("      ierror       return code (non-zero for error)" << "\n");
     21        _pprintString_("" << "\n");
     22        _pprintString_("   Examples:" << "\n");
     23        _pprintString_("      [ierror]=KMLFileRead('file.kml','deepecho','on');" << "\n");
     24        _pprintString_("      [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml');" << "\n");
     25        _pprintString_("" << "\n");
    2626}/*}}}*/
    2727WRAPPER(KMLFileRead){
    … …  
    8484        if (!strlen(filnam)) strcpy(filnam,"stdout");
    8585
    86         if (verbose) _printLine_("Opening file \"" << filnam << "\".");
     86        if (verbose) _printString_("Opening file \"" << filnam << "\"." << "\n");
    8787        fidi=fopen(filnam,"r");
    8888
    8989        /* Run core computations: */
    90         if (verbose) _printLine_("Calling core:");
     90        if (verbose) _printString_("Calling core:" << "\n");
    9191        kobj=KMLFileReadx(fidi);
    9292
    93         if (verbose) _printLine_("Closing file \"" << filnam << "\".");
     93        if (verbose) _printString_("Closing file \"" << filnam << "\"." << "\n");
    9494        fclose(fidi);
    9595
    … …  
    104104                        }
    105105                        else {
    106                                 if (verbose) _printLine_("Opening file \"" << write << "\".");
     106                                if (verbose) _printString_("Opening file \"" << write << "\"." << "\n");
    107107                                fido=fopen(write,"w");
    108108                                kobj->Write(fido,"");
    109                                 if (verbose) _printLine_("Closing file \"" << write << "\".");
     109                                if (verbose) _printString_("Closing file \"" << write << "\"." << "\n");
    110110                                ierror=fclose(fido);
    111111                        }

  • issm/trunk-jpl/src/wrappers/KMLMeshWrite/KMLMeshWrite.cpp

    r13250 r15099  
    55
    66void KMLMeshWriteUsage(void){/*{{{*/
    7         _pprintLine_("KMLMeshWrite - KML mesh writer module:");
    8         _pprintLine_("");
    9         _pprintLine_("   This module writes the mesh of a model as KML polygons into the specified KML file.");
    10         _pprintLine_("");
    11         _pprintLine_("   Usage:");
    12         _pprintLine_("      ierror=KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);");
    13         _pprintLine_("");
    14         _pprintLine_("      name       model name (string, may be empty)");
    15         _pprintLine_("      notes      model notes (string or cell array of strings, may be empty)");
    16         _pprintLine_("      elem       elements (double array)");
    17         _pprintLine_("      nodecon    nodal connectivity array (double array, may be empty)");
    18         _pprintLine_("      lat        nodal latititudes (double vector)");
    19         _pprintLine_("      long       nodal longitudes (double vector)");
    20         _pprintLine_("      part       nodal partitions (double vector, may be empty)");
    21         _pprintLine_("      data       nodal or element data (double vector, may be empty)");
    22         _pprintLine_("      cmap       color map (double nx3 array, may be empty)");
    23         _pprintLine_("      kmlfile    KML file name (string)");
    24         _pprintLine_("");
    25         _pprintLine_("      ierror     error flag (double, non-zero for error)");
    26         _pprintLine_("");
    27         _pprintLine_("   Example:");
    28         _pprintLine_("      KMLMeshWrite(md.name,md.notes,md.elements,md.nodeconnectivity,md.lat,md.long,md.part,md.fm_criterion,options.cmap,filekml);");
    29         _pprintLine_("");
     7        _pprintString_("KMLMeshWrite - KML mesh writer module:" << "\n");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   This module writes the mesh of a model as KML polygons into the specified KML file." << "\n");
     10        _pprintString_("" << "\n");
     11        _pprintString_("   Usage:" << "\n");
     12        _pprintString_("      ierror=KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);" << "\n");
     13        _pprintString_("" << "\n");
     14        _pprintString_("      name       model name (string, may be empty)" << "\n");
     15        _pprintString_("      notes      model notes (string or cell array of strings, may be empty)" << "\n");
     16        _pprintString_("      elem       elements (double array)" << "\n");
     17        _pprintString_("      nodecon    nodal connectivity array (double array, may be empty)" << "\n");
     18        _pprintString_("      lat        nodal latititudes (double vector)" << "\n");
     19        _pprintString_("      long       nodal longitudes (double vector)" << "\n");
     20        _pprintString_("      part       nodal partitions (double vector, may be empty)" << "\n");
     21        _pprintString_("      data       nodal or element data (double vector, may be empty)" << "\n");
     22        _pprintString_("      cmap       color map (double nx3 array, may be empty)" << "\n");
     23        _pprintString_("      kmlfile    KML file name (string)" << "\n");
     24        _pprintString_("" << "\n");
     25        _pprintString_("      ierror     error flag (double, non-zero for error)" << "\n");
     26        _pprintString_("" << "\n");
     27        _pprintString_("   Example:" << "\n");
     28        _pprintString_("      KMLMeshWrite(md.name,md.notes,md.elements,md.nodeconnectivity,md.lat,md.long,md.part,md.fm_criterion,options.cmap,filekml);" << "\n");
     29        _pprintString_("" << "\n");
    3030}/*}}}*/
    3131WRAPPER(KMLMeshWrite){

  • issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.cpp

    r13250 r15099  
    55
    66void KMLOverlayUsage(void){/*{{{*/
    7         _pprintLine_("KMLOverlay - KML file overlay module:");
    8         _pprintLine_("");
    9         _pprintLine_("   This module reads a list of image files and writes a KML or KMZ overlay file.");
    10         _pprintLine_("");
    11         _pprintLine_("   Usage:");
    12         _pprintLine_("      ierror=KMLOverlay(kmlfile,'param name',param,...);");
    13         _pprintLine_("");
    14         _pprintLine_("      kmlfile     KML or KMZ file name (string)");
    15         _pprintLine_("");
    16         _pprintLine_("      lataxis     latitude axis (double vector [south north], required)");
    17         _pprintLine_("      longaxis    longitude axis (double vector [west east], required)");
    18         _pprintLine_("      images      relative or http image file names (string or array of strings or cell array of strings, required)");
    19         _pprintLine_("      zip         flag to zip the doc.kml and image files into kmzfile (double, non-zero for kmz)");
    20         _pprintLine_("");
    21         _pprintLine_("      ierror     error flag (double, non-zero for error)");
    22         _pprintLine_("");
    23         _pprintLine_("   Example:");
    24         _pprintLine_("      KMLOverlay(kmlfile,'lataxis',[south north],'longaxis',[west east],'images',{'file1.png','http://issm/file2.png'},'zip',1);");
    25         _pprintLine_("");
     7        _pprintString_("KMLOverlay - KML file overlay module:" << "\n");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   This module reads a list of image files and writes a KML or KMZ overlay file." << "\n");
     10        _pprintString_("" << "\n");
     11        _pprintString_("   Usage:" << "\n");
     12        _pprintString_("      ierror=KMLOverlay(kmlfile,'param name',param,...);" << "\n");
     13        _pprintString_("" << "\n");
     14        _pprintString_("      kmlfile     KML or KMZ file name (string)" << "\n");
     15        _pprintString_("" << "\n");
     16        _pprintString_("      lataxis     latitude axis (double vector [south north], required)" << "\n");
     17        _pprintString_("      longaxis    longitude axis (double vector [west east], required)" << "\n");
     18        _pprintString_("      images      relative or http image file names (string or array of strings or cell array of strings, required)" << "\n");
     19        _pprintString_("      zip         flag to zip the doc.kml and image files into kmzfile (double, non-zero for kmz)" << "\n");
     20        _pprintString_("" << "\n");
     21        _pprintString_("      ierror     error flag (double, non-zero for error)" << "\n");
     22        _pprintString_("" << "\n");
     23        _pprintString_("   Example:" << "\n");
     24        _pprintString_("      KMLOverlay(kmlfile,'lataxis',[south north],'longaxis',[west east],'images',{'file1.png','http://issm/file2.png'},'zip',1);" << "\n");
     25        _pprintString_("" << "\n");
    2626}/*}}}*/
    2727WRAPPER(KMLOverlay){
    … …  
    6363
    6464        options->Get(&lataxis ,&nlat ,(char*)"lataxis");
    65         if (verbose && lataxis) for (i=0; i<nlat; i++) _printLine_("  lataxis [" << i << "]=" << lataxis[i]);
     65        if (verbose && lataxis) for (i=0; i<nlat; i++) _printString_("  lataxis [" << i << "]=" << lataxis[i] << "\n");
    6666        options->Get(&longaxis,&nlong,(char*)"longaxis");
    67         if (verbose && longaxis) for (i=0; i<nlong; i++) _printLine_("  longaxis[" << i << "]=" << longaxis[i]);
     67        if (verbose && longaxis) for (i=0; i<nlong; i++) _printString_("  longaxis[" << i << "]=" << longaxis[i] << "\n");
    6868        options->Get(&pimages,&nimages,(char*)"images");
    69         if (verbose && pimages) for (i=0; i<nimages; i++) _printLine_("  pimages[" << i << "]=\"" << pimages[i] << "\"");
     69        if (verbose && pimages) for (i=0; i<nimages; i++) _printString_("  pimages[" << i << "]=\"" << pimages[i] << "\"" << "\n");
    7070        options->Get(&dzip,(char*)"zip",0.);
    71         if (verbose) _printLine_("  dzip=" << dzip);
     71        if (verbose) _printString_("  dzip=" << dzip << "\n");
    7272
    7373        /*some checks*/
    … …  
    8484        if(!strlen(filkml)) strcpy(filkml,"stdout");
    8585
    86         if(verbose) _printLine_("Opening kml overlay file \"" << filkml << "\".");
     86        if(verbose) _printString_("Opening kml overlay file \"" << filkml << "\"." << "\n");
    8787        fid=fopen(filkml,"w");
    8888
    8989        /* Run core computations: */
    90         if (verbose) _printLine_("Calling core:");
     90        if (verbose) _printString_("Calling core:" << "\n");
    9191        KMLOverlayx(&ierror,lataxis,longaxis,nimages,pimages,fid);
    9292
    93         if (verbose) _printLine_("Closing file \"" << filkml << "\".");
     93        if (verbose) _printString_("Closing file \"" << filkml << "\"." << "\n");
    9494        fclose(fid);
    9595
    … …  
    108108                                strcat(czip,pimages[i]);
    109109                        }
    110                 if (verbose) _printLine_("Zipping file \"" << filkmz << "\".");
    111                 if (verbose) _printLine_(czip);
     110                if (verbose) _printString_("Zipping file \"" << filkmz << "\"." << "\n");
     111                if (verbose) _printString_(czip << "\n");
    112112
    113113                if (mexEvalString(czip)) _error_("Error zipping file \"" << filkmz << "\".");

  • issm/trunk-jpl/src/wrappers/Kml2Exp/Kml2Exp.cpp

    r13250 r15099  
    55
    66void Kml2ExpUsage(void){/*{{{*/
    7         _pprintLine_("Kml2Exp - kml to exp file conversion module:");
    8         _pprintLine_("");
    9         _pprintLine_("   This module converts a file from kml to exp format.");
    10         _pprintLine_("");
    11         _pprintLine_("   Usage:");
    12         _pprintLine_("      [ret]=Kml2Exp(filexp,filkml,sgn,'param name',param,...);");
    13         _pprintLine_("");
    14         _pprintLine_("      filkml      file name of kml file to be read (char)");
    15         _pprintLine_("      filexp      file name of exp file to be written (char)");
    16         _pprintLine_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))");
    17         _pprintLine_("");
    18         _pprintLine_("      central_meridian     central meridian (double, optional, but must specify with sp)");
    19         _pprintLine_("      standard_parallel    standard parallel (double, optional, but must specify with cm)");
    20         _pprintLine_("");
    21         _pprintLine_("      ret         return code (non-zero for warning)");
    22         _pprintLine_("");
    23         _pprintLine_("   Examples:");
    24         _pprintLine_("      [ret]=Kml2Exp('file.kml','file.exp', 1);");
    25         _pprintLine_("      [ret]=Kml2Exp('file.kml','file.exp', 1,'central_meridian',45,'standard_parallel',70);");
    26         _pprintLine_("      [ret]=Kml2Exp('file.kml','file.exp',-1,'central_meridian', 0,'standard_parallel',71);");
    27         _pprintLine_("");
     7        _pprintString_("Kml2Exp - kml to exp file conversion module:" << "\n");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   This module converts a file from kml to exp format." << "\n");
     10        _pprintString_("" << "\n");
     11        _pprintString_("   Usage:" << "\n");
     12        _pprintString_("      [ret]=Kml2Exp(filexp,filkml,sgn,'param name',param,...);" << "\n");
     13        _pprintString_("" << "\n");
     14        _pprintString_("      filkml      file name of kml file to be read (char)" << "\n");
     15        _pprintString_("      filexp      file name of exp file to be written (char)" << "\n");
     16        _pprintString_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))" << "\n");
     17        _pprintString_("" << "\n");
     18        _pprintString_("      central_meridian     central meridian (double, optional, but must specify with sp)" << "\n");
     19        _pprintString_("      standard_parallel    standard parallel (double, optional, but must specify with cm)" << "\n");
     20        _pprintString_("" << "\n");
     21        _pprintString_("      ret         return code (non-zero for warning)" << "\n");
     22        _pprintString_("" << "\n");
     23        _pprintString_("   Examples:" << "\n");
     24        _pprintString_("      [ret]=Kml2Exp('file.kml','file.exp', 1);" << "\n");
     25        _pprintString_("      [ret]=Kml2Exp('file.kml','file.exp', 1,'central_meridian',45,'standard_parallel',70);" << "\n");
     26        _pprintString_("      [ret]=Kml2Exp('file.kml','file.exp',-1,'central_meridian', 0,'standard_parallel',71);" << "\n");
     27        _pprintString_("" << "\n");
    2828}/*}}}*/
    2929WRAPPER(Kml2Exp){
    … …  
    6060        if (options->GetOption("central_meridian") || options->GetOption("standard_parallel")) {
    6161                options->Get(&cm,"central_meridian");
    62                 if (verbose) _printLine_("  cm=" << cm);
     62                if (verbose) _printString_("  cm=" << cm << "\n");
    6363                options->Get(&sp,"standard_parallel");
    64                 if (verbose) _printLine_("  sp=" << sp);
     64                if (verbose) _printString_("  sp=" << sp << "\n");
    6565        }
    6666

  • issm/trunk-jpl/src/wrappers/Kriging/Kriging.cpp

    r14056 r15099  
    99        num=_NUMTHREADS_;
    1010#endif
    11         _pprintLine_("");
    12         _pprintLine_("   usage: predictions=" << __FUNCT__ << "(x,y,observations,x_interp,y_interp,'options');");
    13         _pprintLine_("   available options:");
    14         _pprintLine_("      -'model': Available variogram models 'gaussian' (default),'spherical','power','exponential'");
    15         _pprintLine_("         -'nugget': nugget effect (default 0.2)");
    16         _pprintLine_("         -'range':  for gaussian, spherical and exponential models (default sqrt(3))");
    17         _pprintLine_("         -'sill':   for gaussian, spherical and exponential models (default 1)");
    18         _pprintLine_("         -'slope':  for power model (default 1)");
    19         _pprintLine_("         -'power':  for power model (default 1)");
    20         _pprintLine_("      -'searchradius': search radius for each prediction (default is observations span)");
    21         _pprintLine_("      -'boxlength':    minimum length of quadtree boxes (useful to decrease the number of observations)");
    22         _pprintLine_("      -'maxdata':      minimum number of observations for a prediction (default is 50)");
    23         _pprintLine_("      -'mindata':      maximum number of observations for a prediction (default is 1)");
    24         _pprintLine_("      -'maxtrimming':  maximum trimming value (default is -1.e+21)");
    25         _pprintLine_("      -'mintrimming':  minimum trimming value (default is +1.e+21)");
    26         _pprintLine_("      -'minspacing':   minimum distance between observation (default is 0.01)");
    27         _pprintLine_("      -'numthreads':   number of threads, default is "<<num);
    28         _pprintLine_("");
     11        _pprintString_("" << "\n");
     12        _pprintString_("   usage: predictions=" << __FUNCT__ << "(x,y,observations,x_interp,y_interp,'options');" << "\n");
     13        _pprintString_("   available options:" << "\n");
     14        _pprintString_("      -'model': Available variogram models 'gaussian' (default),'spherical','power','exponential'" << "\n");
     15        _pprintString_("         -'nugget': nugget effect (default 0.2)" << "\n");
     16        _pprintString_("         -'range':  for gaussian, spherical and exponential models (default sqrt(3))" << "\n");
     17        _pprintString_("         -'sill':   for gaussian, spherical and exponential models (default 1)" << "\n");
     18        _pprintString_("         -'slope':  for power model (default 1)" << "\n");
     19        _pprintString_("         -'power':  for power model (default 1)" << "\n");
     20        _pprintString_("      -'searchradius': search radius for each prediction (default is observations span)" << "\n");
     21        _pprintString_("      -'boxlength':    minimum length of quadtree boxes (useful to decrease the number of observations)" << "\n");
     22        _pprintString_("      -'maxdata':      minimum number of observations for a prediction (default is 50)" << "\n");
     23        _pprintString_("      -'mindata':      maximum number of observations for a prediction (default is 1)" << "\n");
     24        _pprintString_("      -'maxtrimming':  maximum trimming value (default is -1.e+21)" << "\n");
     25        _pprintString_("      -'mintrimming':  minimum trimming value (default is +1.e+21)" << "\n");
     26        _pprintString_("      -'minspacing':   minimum distance between observation (default is 0.01)" << "\n");
     27        _pprintString_("      -'numthreads':   number of threads, default is "<<num << "\n");
     28        _pprintString_("" << "\n");
    2929}/*}}}*/
    3030WRAPPER(Kriging){

  • issm/trunk-jpl/src/wrappers/Ll2xy/Ll2xy.cpp

    r13236 r15099  
    55
    66void Ll2xyUsage(void){/*{{{*/
    7         _pprintLine_("Ll2xy - lat/long to x/y coordinate transformation module:");
    8         _pprintLine_("");
    9         _pprintLine_("   This module transforms lat/long to x/y coordinates.");
    10         _pprintLine_("");
    11         _pprintLine_("   Usage:");
    12         _pprintLine_("      [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);");
    13         _pprintLine_("");
    14         _pprintLine_("      lat         latitude coordinates (double vector)");
    15         _pprintLine_("      lon         longitude coordinates (double vector)");
    16         _pprintLine_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))");
    17         _pprintLine_("");
    18         _pprintLine_("      central_meridian     central meridian (double, optional, but must specify with sp)");
    19         _pprintLine_("      standard_parallel    standard parallel (double, optional, but must specify with cm)");
    20         _pprintLine_("");
    21         _pprintLine_("      x           x coordinates (double vector)");
    22         _pprintLine_("      y           y coordinates (double vector)");
    23         _pprintLine_("");
    24         _pprintLine_("   Examples:");
    25         _pprintLine_("      [x,y]=Ll2xy(lat,lon, 1);");
    26         _pprintLine_("      [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);");
    27         _pprintLine_("      [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);");
    28         _pprintLine_("");
     7        _pprintString_("Ll2xy - lat/long to x/y coordinate transformation module:" << "\n");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   This module transforms lat/long to x/y coordinates." << "\n");
     10        _pprintString_("" << "\n");
     11        _pprintString_("   Usage:" << "\n");
     12        _pprintString_("      [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);" << "\n");
     13        _pprintString_("" << "\n");
     14        _pprintString_("      lat         latitude coordinates (double vector)" << "\n");
     15        _pprintString_("      lon         longitude coordinates (double vector)" << "\n");
     16        _pprintString_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))" << "\n");
     17        _pprintString_("" << "\n");
     18        _pprintString_("      central_meridian     central meridian (double, optional, but must specify with sp)" << "\n");
     19        _pprintString_("      standard_parallel    standard parallel (double, optional, but must specify with cm)" << "\n");
     20        _pprintString_("" << "\n");
     21        _pprintString_("      x           x coordinates (double vector)" << "\n");
     22        _pprintString_("      y           y coordinates (double vector)" << "\n");
     23        _pprintString_("" << "\n");
     24        _pprintString_("   Examples:" << "\n");
     25        _pprintString_("      [x,y]=Ll2xy(lat,lon, 1);" << "\n");
     26        _pprintString_("      [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);" << "\n");
     27        _pprintString_("      [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);" << "\n");
     28        _pprintString_("" << "\n");
    2929}/*}}}*/
    3030WRAPPER(Ll2xy){
    … …  
    6464        if(options->GetOption("central_meridian") || options->GetOption("standard_parallel")){
    6565                options->Get(&cm,"central_meridian");
    66                 if (verbose) _printLine_("  cm=" << cm);
     66                if (verbose) _printString_("  cm=" << cm << "\n");
    6767                options->Get(&sp,"standard_parallel");
    68                 if (verbose) _printLine_("  sp=" << sp);
     68                if (verbose) _printString_("  sp=" << sp << "\n");
    6969        }
    7070
    7171        /*some checks*/
    72         if (verbose) _printLine_("Checking inputs:");
     72        if (verbose) _printString_("Checking inputs:" << "\n");
    7373        if (nlat != nlon){_error_("Must have same number of lat[" << nlat << "] and lon[" << nlon << "] coordinates.");}
    7474        else                ncoord=nlat;

  • issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.cpp

    r13236 r15099  
    66
    77void MeshPartitionUsage(void){/*{{{*/
    8         _printLine_("   usage:");
     8        _printString_("   usage:" << "\n");
    99        _printString_("   [element_partitioning,node_partitioning]=MeshPartition(md.mesh,numpartitions)");
    10         _printLine_("   where:");
    11         _printLine_("      element_partitioning is a vector of partitioning area numbers, for every element.");
    12         _printLine_("      node_partitioning is a vector of partitioning area numbers, for every node.");
    13         _printLine_("");
     10        _printString_("   where:" << "\n");
     11        _printString_("      element_partitioning is a vector of partitioning area numbers, for every element." << "\n");
     12        _printString_("      node_partitioning is a vector of partitioning area numbers, for every node." << "\n");
     13        _printString_("" << "\n");
    1414}/*}}}*/
    1515WRAPPER(MeshPartition){

  • issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.cpp

    r14656 r15099  
    1919
    2020void MeshProfileIntersectionUsage(void){/*{{{*/
    21         _printLine_("   usage:");
    22         _printLine_("   [segments]=MeshProfileIntersection(index,x,y,filename);");
    23         _printLine_("   where:");
    24         _printLine_("   input:");
    25         _printLine_("        index,x,y is a triangulation");
    26         _printLine_("        filename: name of Argus style .exp file containing the segments (can be groups of disconnected segments)");
    27         _printLine_("   output:");
    28         _printLine_("        segments: array made of x1,y1,x2,y2,element_id lines (x1,y1) and (x2,y2) are segment extremities for a segment ");
    29         _printLine_("        belonging to the elemnt_id element. there are as many lines in segments as there are segments intersecting the ");
    30         _printLine_("        mesh.");
     21        _printString_("   usage:" << "\n");
     22        _printString_("   [segments]=MeshProfileIntersection(index,x,y,filename);" << "\n");
     23        _printString_("   where:" << "\n");
     24        _printString_("   input:" << "\n");
     25        _printString_("        index,x,y is a triangulation" << "\n");
     26        _printString_("        filename: name of Argus style .exp file containing the segments (can be groups of disconnected segments)" << "\n");
     27        _printString_("   output:" << "\n");
     28        _printString_("        segments: array made of x1,y1,x2,y2,element_id lines (x1,y1) and (x2,y2) are segment extremities for a segment " << "\n");
     29        _printString_("        belonging to the elemnt_id element. there are as many lines in segments as there are segments intersecting the " << "\n");
     30        _printString_("        mesh." << "\n");
    3131}/*}}}*/
    3232WRAPPER(MeshProfileIntersection){

  • issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp

    r14016 r15099  
    66
    77void NodeConnectivityUsage(void){/*{{{*/
    8         _pprintLine_("");
    9         _pprintLine_("   usage: connectivity = " << __FUNCT__ << "(elements, numnodes);");
    10         _pprintLine_("");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   usage: connectivity = " << __FUNCT__ << "(elements, numnodes);" << "\n");
     10        _pprintString_("" << "\n");
    1111}/*}}}*/
    1212WRAPPER(NodeConnectivity){

  • issm/trunk-jpl/src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp

    r14656 r15099  
    66
    77void PointCloudFindNeighborsUsage(void){/*{{{*/
    8         _printLine_("   usage:");
    9         _printLine_("   [flags]=PointCloudFindNeighbors(x,y,mindistance,multithread);\n");
    10         _printLine_("   where:");
    11         _printLine_("      x,y: list of points.");
    12         _printLine_("      mindistance: minimum distance that should exist between points in the cloud.");
    13         _printLine_("      multithread: run multithreaded or not. with multithreads, flags can get 1 and 2 values in duplicates.");
    14         _printLine_("      flags: array of flags (flag==1 means point is within mindistance of another point)");
    15         _printLine_("");
     8        _printString_("   usage:" << "\n");
     9        _printString_("   [flags]=PointCloudFindNeighbors(x,y,mindistance,multithread);" << "\n");
     10        _printString_("   where:" << "\n");
     11        _printString_("      x,y: list of points." << "\n");
     12        _printString_("      mindistance: minimum distance that should exist between points in the cloud." << "\n");
     13        _printString_("      multithread: run multithreaded or not. with multithreads, flags can get 1 and 2 values in duplicates." << "\n");
     14        _printString_("      flags: array of flags (flag==1 means point is within mindistance of another point)" << "\n");
     15        _printString_("" << "\n");
    1616}/*}}}*/
    1717WRAPPER(PointCloudFindNeighbors){

  • issm/trunk-jpl/src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp

    r13250 r15099  
    66
    77void PropagateFlagsFromConnectivityUsage(void) {/*{{{*/
    8         _printLine_("");
    9         _printLine_("   usage: [pool] = " << __FUNCT__ << "(connectivity,pool,index,flags);");;
    10         _printLine_("");
     8        _printString_("" << "\n");
     9        _printString_("   usage: [pool] = " << __FUNCT__ << "(connectivity,pool,index,flags);" << "\n");;
     10        _printString_("" << "\n");
    1111}/*}}}*/
    1212WRAPPER(PropagateFlagsFromConnectivity){

  • issm/trunk-jpl/src/wrappers/Shp2Exp/Shp2Exp.cpp

    r14283 r15099  
    1212
    1313void Shp2ExpUsage(void){/*{{{*/
    14         _pprintLine_("Shp2Exp - shp to exp file conversion module:");
    15         _pprintLine_("");
    16         _pprintLine_("   This module converts a file from shp to exp format.");
    17         _pprintLine_("");
    18         _pprintLine_("   Usage:");
    19         _pprintLine_("      [ret]=Shp2Exp(filshp,filexp,sgn,'param name',param,...);");
    20         _pprintLine_("");
    21         _pprintLine_("      filshp      file name of shp file to be read (char, extension optional)");
    22         _pprintLine_("      filexp      file name of exp file to be written (char)");
    23         _pprintLine_("");
    24         _pprintLine_("      ret         return code (non-zero for warning)");
    25         _pprintLine_("");
    26         _pprintLine_("   Examples:");
    27         _pprintLine_("      [ret]=Shp2Exp('file.shp','file.exp');");
    28         _pprintLine_("");
     14        _pprintString_("Shp2Exp - shp to exp file conversion module:" << "\n");
     15        _pprintString_("" << "\n");
     16        _pprintString_("   This module converts a file from shp to exp format." << "\n");
     17        _pprintString_("" << "\n");
     18        _pprintString_("   Usage:" << "\n");
     19        _pprintString_("      [ret]=Shp2Exp(filshp,filexp,sgn,'param name',param,...);" << "\n");
     20        _pprintString_("" << "\n");
     21        _pprintString_("      filshp      file name of shp file to be read (char, extension optional)" << "\n");
     22        _pprintString_("      filexp      file name of exp file to be written (char)" << "\n");
     23        _pprintString_("" << "\n");
     24        _pprintString_("      ret         return code (non-zero for warning)" << "\n");
     25        _pprintString_("" << "\n");
     26        _pprintString_("   Examples:" << "\n");
     27        _pprintString_("      [ret]=Shp2Exp('file.shp','file.exp');" << "\n");
     28        _pprintString_("" << "\n");
    2929}/*}}}*/
    3030WRAPPER(Shp2Exp){

  • issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.cpp

    r13250 r15099  
    1212
    1313void Shp2KmlUsage(void){/*{{{*/
    14         _pprintLine_("Shp2Kml - shp to kml file conversion module:");
    15         _pprintLine_("");
    16         _pprintLine_("   This module converts a file from shp to kml format.");
    17         _pprintLine_("");
    18         _pprintLine_("   Usage:");
    19         _pprintLine_("      [ret]=Shp2Kml(filshp,filkml,sgn,'param name',param,...);");
    20         _pprintLine_("");
    21         _pprintLine_("      filshp      file name of shp file to be read (char, extension optional)");
    22         _pprintLine_("      filkml      file name of kml file to be written (char)");
    23         _pprintLine_("      sgn         sign for hemisphere (double, +1 (north); -1 (south); or 0 (no translation))");
    24         _pprintLine_("");
    25         _pprintLine_("      central_meridian     central meridian (double, optional, but must specify with sp)");
    26         _pprintLine_("      standard_parallel    standard parallel (double, optional, but must specify with cm)");
    27         _pprintLine_("");
    28         _pprintLine_("      ret         return code (non-zero for warning)");
    29         _pprintLine_("");
    30         _pprintLine_("   Examples:");
    31         _pprintLine_("      [ret]=Shp2Kml('file.shp','file.kml', 0);");
    32         _pprintLine_("      [ret]=Shp2Kml('file.shp','file.kml', 1,'central_meridian',45,'standard_parallel',70);");
    33         _pprintLine_("      [ret]=Shp2Kml('file.shp','file.kml',-1,'central_meridian', 0,'standard_parallel',71);");
    34         _pprintLine_("");
     14        _pprintString_("Shp2Kml - shp to kml file conversion module:" << "\n");
     15        _pprintString_("" << "\n");
     16        _pprintString_("   This module converts a file from shp to kml format." << "\n");
     17        _pprintString_("" << "\n");
     18        _pprintString_("   Usage:" << "\n");
     19        _pprintString_("      [ret]=Shp2Kml(filshp,filkml,sgn,'param name',param,...);" << "\n");
     20        _pprintString_("" << "\n");
     21        _pprintString_("      filshp      file name of shp file to be read (char, extension optional)" << "\n");
     22        _pprintString_("      filkml      file name of kml file to be written (char)" << "\n");
     23        _pprintString_("      sgn         sign for hemisphere (double, +1 (north) -1 (south) or 0 (no translation))" << "\n");
     24        _pprintString_("" << "\n");
     25        _pprintString_("      central_meridian     central meridian (double, optional, but must specify with sp)" << "\n");
     26        _pprintString_("      standard_parallel    standard parallel (double, optional, but must specify with cm)" << "\n");
     27        _pprintString_("" << "\n");
     28        _pprintString_("      ret         return code (non-zero for warning)" << "\n");
     29        _pprintString_("" << "\n");
     30        _pprintString_("   Examples:" << "\n");
     31        _pprintString_("      [ret]=Shp2Kml('file.shp','file.kml', 0);" << "\n");
     32        _pprintString_("      [ret]=Shp2Kml('file.shp','file.kml', 1,'central_meridian',45,'standard_parallel',70);" << "\n");
     33        _pprintString_("      [ret]=Shp2Kml('file.shp','file.kml',-1,'central_meridian', 0,'standard_parallel',71);" << "\n");
     34        _pprintString_("" << "\n");
    3535}/*}}}*/
    3636WRAPPER(Shp2Kml){
    … …  
    7171        if (options->GetOption("central_meridian") || options->GetOption("standard_parallel")) {
    7272                options->Get(&cm,"central_meridian");
    73                 if (verbose) _printLine_("  cm=" << cm);
     73                if (verbose) _printString_("  cm=" << cm << "\n");
    7474                options->Get(&sp,"standard_parallel");
    75                 if (verbose) _printLine_("  sp=" << sp);
     75                if (verbose) _printString_("  sp=" << sp << "\n");
    7676        }
    7777

  • issm/trunk-jpl/src/wrappers/StringToEnum/StringToEnum.cpp

    r13236 r15099  
    66
    77void StringToEnumUsage(void){/*{{{*/
    8         _pprintLine_("");
    9         _pprintLine_("   usage: " << __FUNCT__ << "enum = StringToEnum(string);");
    10         _pprintLine_("");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   usage: " << __FUNCT__ << "enum = StringToEnum(string);" << "\n");
     10        _pprintString_("" << "\n");
    1111}/*}}}*/
    1212WRAPPER(StringToEnum){

  • issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.cpp

    r14956 r15099  
    66
    77void TriMeshUsage(void){/*{{{*/
    8         _printLine_("");
    9         _printLine_("   usage: [index,x,y,segments,segmentmarkers]=TriMesh(domainoutlinefilename,rifts,area) ");
    10         _printLine_("      where: index,x,y defines a triangulation, segments is an array made ");
    11         _printLine_("      of exterior segments to the mesh domain outline, segmentmarkers is an array flagging each segment, ");
    12         _printLine_("      outlinefilename an Argus domain outline file, ");
    13         _printLine_("      area is the maximum area desired for any element of the resulting mesh, ");
    14         _printLine_("");
     8        _printString_("" << "\n");
     9        _printString_("   usage: [index,x,y,segments,segmentmarkers]=TriMesh(domainoutlinefilename,rifts,area) " << "\n");
     10        _printString_("      where: index,x,y defines a triangulation, segments is an array made " << "\n");
     11        _printString_("      of exterior segments to the mesh domain outline, segmentmarkers is an array flagging each segment, " << "\n");
     12        _printString_("      outlinefilename an Argus domain outline file, " << "\n");
     13        _printString_("      area is the maximum area desired for any element of the resulting mesh, " << "\n");
     14        _printString_("" << "\n");
    1515}/*}}}*/
    1616WRAPPER(TriMesh){

  • issm/trunk-jpl/src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.cpp

    r14221 r15099  
    66
    77void TriMeshProcessRiftsUsage(void){/*{{{*/
    8         _printLine_("");
    9         _printLine_("   usage: [index2,x2,y2,segments2,segmentmarkers2,rifts2]=TriMeshProcessrifts(index1,x1,y1,segments1,segmentmarkers1) ");
    10         _printLine_("      where: (index1,x1,y1,segments1,segmentmarkers1) is an initial triangulation.");
    11         _printLine_("      index2,x2,y2,segments2,segmentmarkers2,rifts2 is the resulting triangulation where rifts have been processed.");
     8        _printString_("" << "\n");
     9        _printString_("   usage: [index2,x2,y2,segments2,segmentmarkers2,rifts2]=TriMeshProcessrifts(index1,x1,y1,segments1,segmentmarkers1) " << "\n");
     10        _printString_("      where: (index1,x1,y1,segments1,segmentmarkers1) is an initial triangulation." << "\n");
     11        _printString_("      index2,x2,y2,segments2,segmentmarkers2,rifts2 is the resulting triangulation where rifts have been processed." << "\n");
    1212}/*}}}*/
    1313WRAPPER(TriMeshProcessRifts){

  • issm/trunk-jpl/src/wrappers/TriaSearch/TriaSearch.cpp

    r13236 r15099  
    55
    66void TriaSearchUsage(void){/*{{{*/
    7         _pprintLine_("TriaSearch- find triangle holding a point (x0,y0) in a mesh");
    8         _pprintLine_("");
    9         _pprintLine_("   Usage:");
    10         _pprintLine_("         tria=TriaSearch(index,x,y,x0,y0);");
    11         _pprintLine_("      index,x,y: mesh triangulatrion");
    12         _pprintLine_("      x0,y0: coordinates of the point for which we are trying to find a triangle");
    13         _pprintLine_("      x0,y0 can be an array of points");
    14         _pprintLine_("");
     7        _pprintString_("TriaSearch- find triangle holding a point (x0,y0) in a mesh" << "\n");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   Usage:" << "\n");
     10        _pprintString_("         tria=TriaSearch(index,x,y,x0,y0);" << "\n");
     11        _pprintString_("      index,x,y: mesh triangulatrion" << "\n");
     12        _pprintString_("      x0,y0: coordinates of the point for which we are trying to find a triangle" << "\n");
     13        _pprintString_("      x0,y0 can be an array of points" << "\n");
     14        _pprintString_("" << "\n");
    1515}/*}}}*/
    1616WRAPPER(TriaSearch){

  • issm/trunk-jpl/src/wrappers/Xy2ll/Xy2ll.cpp

    r13236 r15099  
    55
    66void Xy2llUsage(void){/*{{{*/
    7         _pprintLine_("Xy2ll - x/y to lat/long coordinate transformation module:");
    8         _pprintLine_("");
    9         _pprintLine_("   This module transforms x/y to lat/long coordinates.");
    10         _pprintLine_("");
    11         _pprintLine_("   Usage:");
    12         _pprintLine_("      [lat,lon]=Xy2ll(x,y,sgn,'param name',param,...);");
    13         _pprintLine_("");
    14         _pprintLine_("      x           x coordinates (double vector)");
    15         _pprintLine_("      y           y coordinates (double vector)");
    16         _pprintLine_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))");
    17         _pprintLine_("");
    18         _pprintLine_("      central_meridian     central meridian (double, optional, but must specify with sp)");
    19         _pprintLine_("      standard_parallel    standard parallel (double, optional, but must specify with cm)");
    20         _pprintLine_("");
    21         _pprintLine_("      lat         latitude coordinates (double vector)");
    22         _pprintLine_("      lon         longitude coordinates (double vector)");
    23         _pprintLine_("");
    24         _pprintLine_("   Examples:");
    25         _pprintLine_("      [lat,lon]=Xy2ll(x,y, 1);");
    26         _pprintLine_("      [lat,lon]=Xy2ll(x,y, 1,'central_meridian',45,'standard_parallel',70);");
    27         _pprintLine_("      [lat,lon]=Xy2ll(x,y,-1,'central_meridian', 0,'standard_parallel',71);");
    28         _pprintLine_("");
     7        _pprintString_("Xy2ll - x/y to lat/long coordinate transformation module:" << "\n");
     8        _pprintString_("" << "\n");
     9        _pprintString_("   This module transforms x/y to lat/long coordinates." << "\n");
     10        _pprintString_("" << "\n");
     11        _pprintString_("   Usage:" << "\n");
     12        _pprintString_("      [lat,lon]=Xy2ll(x,y,sgn,'param name',param,...);" << "\n");
     13        _pprintString_("" << "\n");
     14        _pprintString_("      x           x coordinates (double vector)" << "\n");
     15        _pprintString_("      y           y coordinates (double vector)" << "\n");
     16        _pprintString_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))" << "\n");
     17        _pprintString_("" << "\n");
     18        _pprintString_("      central_meridian     central meridian (double, optional, but must specify with sp)" << "\n");
     19        _pprintString_("      standard_parallel    standard parallel (double, optional, but must specify with cm)" << "\n");
     20        _pprintString_("" << "\n");
     21        _pprintString_("      lat         latitude coordinates (double vector)" << "\n");
     22        _pprintString_("      lon         longitude coordinates (double vector)" << "\n");
     23        _pprintString_("" << "\n");
     24        _pprintString_("   Examples:" << "\n");
     25        _pprintString_("      [lat,lon]=Xy2ll(x,y, 1);" << "\n");
     26        _pprintString_("      [lat,lon]=Xy2ll(x,y, 1,'central_meridian',45,'standard_parallel',70);" << "\n");
     27        _pprintString_("      [lat,lon]=Xy2ll(x,y,-1,'central_meridian', 0,'standard_parallel',71);" << "\n");
     28        _pprintString_("" << "\n");
    2929}/*}}}*/
    3030WRAPPER(Xy2ll){
    … …  
    6363        if (options->GetOption("central_meridian") || options->GetOption("standard_parallel")) {
    6464                options->Get(&cm,"central_meridian");
    65                 if (verbose) _printLine_("  cm=" << cm);
     65                if (verbose) _printString_("  cm=" << cm << "\n");
    6666                options->Get(&sp,"standard_parallel");
    67                 if (verbose) _printLine_("  sp=" << sp);
     67                if (verbose) _printString_("  sp=" << sp << "\n");
    6868        }
    6969
    … …  
    7979
    8080        /* Run core computations: */
    81         if (verbose) _printLine_("Calling core:");
     81        if (verbose) _printString_("Calling core:" << "\n");
    8282        if (options->GetOption("central_meridian") && options->GetOption("standard_parallel"))
    8383                iret=Xy2llx(lat,lon,x,y,ncoord,sgn,cm,sp);

  • issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp

    r15049 r15099  
    3838                else{
    3939                        if(!mxIsClass(dataref,"double") && !mxIsClass(dataref,"single")){
    40                                 _printLine_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'");
     40                                _printString_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'" << "\n");
    4141                        }
    4242                        /*Convert matlab matrix to double* matrix: */
    … …  
    8585                else{
    8686                        if(!mxIsClass(dataref,"double") && !mxIsClass(dataref,"single")){
    87                                 _printLine_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'");
     87                                _printString_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'" << "\n");
    8888                        }
    8989                        /*Convert matlab n-dim array to double* matrix: */
    … …  
    132132                else{
    133133                        if(!mxIsClass(dataref,"double") && !mxIsClass(dataref,"single")){
    134                                 _printLine_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'");
     134                                _printString_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'" << "\n");
    135135                        }
    136136                        /*Convert matlab matrix to double* matrix: */

  • issm/trunk-jpl/src/wrappers/matlab/io/OptionParse.cpp

    r14950 r15099  
    190190         option=(Option*)OptionCellParse(name,prhs);
    191191        else {
    192                 _pprintLine_("  Converting value of option \"" << name << "\" from unrecognized class \"" << mxGetClassName(prhs[0]) << "\" to class \"" << "struct" << "\".");
     192                _pprintString_("  Converting value of option \"" << name << "\" from unrecognized class \"" << mxGetClassName(prhs[0]) << "\" to class \"" << "struct" << "\"." << "\n");
    193193                if (!mexCallMATLAB(1,lhs,1,(mxArray**)prhs,"struct")) {
    194194                        option=(Option*)OptionStructParse(name,(const mxArray**)lhs);

  • issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp

    r14917 r15099  
    728728                if(i+1 == nrhs) _error_("Argument " << i+2 << " must exist and be value of option \"" << name << "\".");
    729729
    730                 _pprintLine_("FetchData for Options not implemented yet, ignoring option \"" << name << "\"!");
     730                _pprintString_("FetchData for Options not implemented yet, ignoring option \"" << name << "\"!" << "\n");
    731731
    732732//              option=(Option*)OptionParse(name,&PyTuple_GetItem(py_tuple,(Py_ssize_t)(i+1)));
Note: See TracChangeset for help on using the changeset viewer.