Changeset 12513

Timestamp:

06/22/12 16:26:04 (13 years ago)

Author:

Mathieu Morlighem

Message:

Starting to replace _printf by _pprintString

Location:

issm/trunk-jpl/src/c

Files:

• include/macros.h (modified) (1 diff)
• io/PrintfFunction.cpp (modified) (1 diff)
• io/io.h (modified) (1 diff)
• objects/KML/KML_GroundOverlay.cpp (modified) (5 diffs)
• objects/KML/KML_LatLonBox.cpp (modified) (1 diff)
• shared/Numerics/OptimalSearch.cpp (modified) (2 diffs)
• solutions/controltao_core.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/include/macros.h

@@ -69 +69 @@
   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
           aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
-          PrintfFunction(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
+          PrintfFunction2(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
 /*}}}*/
 /* _assert_ {{{*/

issm/trunk-jpl/src/c/io/PrintfFunction.cpp

@@ -57 +57 @@
         }
 }
+int PrintfFunction2(const string & message){
+        extern int  my_rank;
+        if(my_rank==0){
+                printf("%s",message.c_str());
+        }
+}

issm/trunk-jpl/src/c/io/io.h

@@ -16 +16 @@
 int PrintfFunction(const char* format,...);
 int PrintfFunction(const string & message);
+int PrintfFunction2(const string & message);
 
 #endif  /* _IO_H_ */

issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.cpp

@@ -46 +46 @@
 void  KML_GroundOverlay::Echo(){
 
-        bool  flag=true;
-
-        _printf_(flag,"KML_GroundOverlay:\n");
+        _printLine_("KML_GroundOverlay:");
         KML_Overlay::Echo();
 
-        _printf_(flag,"      altitude: %0.16g\n"      ,altitude);
-        _printf_(flag,"       altmode: \"%s\"\n"      ,altmode);
-        _printf_(flag,"         llbox: %p\n"          ,llbox);
-
-        return;
+        _printLine_("         altitude: " << altitude);
+        _printLine_("          altmode: " << altmode);
+        _printLine_("            llbox: " << llbox);
 }
 /*}}}*/
-
 /*FUNCTION KML_GroundOverlay::DeepEcho {{{*/
 void  KML_GroundOverlay::DeepEcho(){
@@ -69 +64 @@
 }
 /*}}}*/
-
 /*FUNCTION KML_GroundOverlay::DeepEcho {{{*/
 void  KML_GroundOverlay::DeepEcho(const char* indent){
@@ -92 +86 @@
 }
 /*}}}*/
-
 /*FUNCTION KML_GroundOverlay::Write {{{*/
 void  KML_GroundOverlay::Write(FILE* filout,const char* indent){
@@ -119 +112 @@
 }
 /*}}}*/
-
 /*FUNCTION KML_GroundOverlay::Read {{{*/
 void  KML_GroundOverlay::Read(FILE* fid,char* kstr){
@@ -174 +166 @@
 }
 /*}}}*/
-

issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.cpp

@@ -67 +67 @@
 /*FUNCTION KML_LatLonBox::DeepEcho {{{*/
 void  KML_LatLonBox::DeepEcho(const char* indent){
-
-        bool  flag=true;
 
         _printLine_(indent << "KML_LatLonBox:");

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

@@ -42 +42 @@
         fx1= (*f)(x1,optargs);
         if (isnan(fx1)) _error2_("Function evaluation returned NaN");
-        _printf_(VerboseControl(),"\n        Iteration         x           f(x)       Tolerance\n\n");
-        _printf_(VerboseControl(),"        %s    %12.6g  %12.6g  %s","   N/A",x1,fx1,"         N/A\n");
+        cout<<setprecision(5);
+        if(VerboseControl()) _pprintLine_("");
+        if(VerboseControl()) _pprintLine_("       Iteration         x           f(x)       Tolerance");
+        if(VerboseControl()) _pprintLine_("");
+        if(VerboseControl()) _pprintLine_("           N/A    "<<setw(12)<<x1<<"  "<<setw(12)<<fx1<<"           N/A");
 
         //update tolerances
@@ -55 +58 @@
                 fx2 = (*f)(x2,optargs);
                 if (isnan(fx2)) _error2_("Function evaluation returned NaN");
-                _printf_(VerboseControl(),"         %5i    %12.6g  %12.6g  %12.6g\n",iter,x2,fx2,fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1));
+                if(VerboseControl())
+                 _pprintLine_("         "<<setw(5)<<iter<<"    "<<setw(12)<<x2<<"  "<<setw(12)<<fx2<<"  "<<(fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1)));
 
                 //Stop the optimization?

issm/trunk-jpl/src/c/solutions/controltao_core.cpp

@@ -30 +30 @@
         int        nsteps,maxiter;
         AppCtx     user;
-        TaoSolver  tao;
+        TaoSolver  tao = 0;
         IssmDouble    *dummy          = NULL;
         int       *control_list   = NULL;
@@ -53 +53 @@
 
         /*Initialize TAO*/
+        TaoCreate(PETSC_COMM_WORLD,&tao);
         _printf_(VerboseControl(),"%s\n","   Initializing the Toolkit for Advanced Optimization (TAO)");
-        TaoCreate(PETSC_COMM_WORLD,&tao);
         TaoSetFromOptions(tao);
         TaoSetType(tao,"tao_blmvm");
@@ -165 +165 @@
         if(its==0) _printf_(true,"Iter       Function      Residual  |  List of contributions\n");
         if(its==0) _printf_(true,"-----------------------------------+-----------------------\n");
-        _printf_(true,"%4i   %12.7g  %12.7g  | ",its,f,gnorm);
+        _pprintString_(setw(4)<<its<<"   "<<setw(12)<<setprecision(7)<<f<<"  "<<setw(12)<<setprecision(7)<<gnorm<<"  | ");
 
         /*Retrieve objective functions independently*/
         for(i=0;i<num_responses;i++){
                 Responsex(&f,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnumToStringx(responses[i]),false,i);
-                _printf_(true," %12.7g ","",f);
+                _pprintString_(" "<<setw(12)<<setprecision(7)<<f);
         }
-        _printf_(true,"\n");
+        _pprintLine_("");
 
         /*Clean-up and return*/