Changeset 15099 for issm/trunk-jpl/src/c/analyses/hydrology_core.cpp

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_

File:

• issm/trunk-jpl/src/c/analyses/hydrology_core.cpp (modified) (6 diffs)

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

@@ -51 +51 @@
         for(i=0;i<nsteps;i++){
 
-                if(nsteps)if(VerboseSolution()) _pprintLine_("time step:" << i+1 << "/" << nsteps);
+                if(nsteps)if(VerboseSolution()) _pprintString_("time step:" << i+1 << "/" << nsteps << "\n");
                 time+=dt;
                 step+=1;
@@ -58 +58 @@
 
                 if (hydrology_model==HydrologyshreveEnum){
-                        if(VerboseSolution()) _pprintLine_("   computing water column");
+                        if(VerboseSolution()) _pprintString_("   computing water column" << "\n");
                         femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum);
                         solutionsequence_nonlinear(femmodel,modify_loads);
@@ -67 +67 @@
 
                         if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
-                                if(VerboseSolution()) _pprintLine_("   saving results ");
+                                if(VerboseSolution()) _pprintString_("   saving results " << "\n");
                                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum);
                                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVxEnum);
@@ -73 +73 @@
 
                                 /*unload results*/
-                                if(VerboseSolution()) _pprintLine_("   saving temporary results");
+                                if(VerboseSolution()) _pprintString_("   saving temporary results" << "\n");
                                 OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
                         }
@@ -82 +82 @@
                         femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
 
-                        if(VerboseSolution()) _pprintLine_("   computing water transfer");
+                        if(VerboseSolution()) _pprintString_("   computing water transfer" << "\n");
 
-                        if(VerboseSolution()) _pprintLine_("   computing water head");
+                        if(VerboseSolution()) _pprintString_("   computing water head" << "\n");
                         solutionsequence_hydro_nonlinear(femmodel);
                         if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
-                                if(VerboseSolution()) _pprintLine_("   saving results ");
+                                if(VerboseSolution()) _pprintString_("   saving results " << "\n");
                                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadEnum);
                                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadResidualEnum);
@@ -94 +94 @@
                                 }
                                 /*unload results*/
-                                if(VerboseSolution()) _pprintLine_("   saving temporary results");
+                                if(VerboseSolution()) _pprintString_("   saving temporary results" << "\n");
                                 OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
                         }