Changeset 12520

Timestamp:

06/22/12 17:29:55 (13 years ago)

Author:

Mathieu Morlighem

Message:

cosmetics

Location:

issm/trunk-jpl/src

Files:

• c/modules/DakotaResponsesx/DakotaResponsesx.cpp (modified) (1 diff)
• c/modules/Dakotax/SpawnCoreParallel.cpp (modified) (1 diff)
• c/modules/HoleFillerx/HoleFillerx.cpp (modified) (1 diff)
• c/modules/KMLFileReadx/KMLFileReadx.cpp (modified) (1 diff)
• c/modules/UpdateConstraintsx/UpdateConstraintsx.cpp (modified) (1 diff)
• c/objects/Bamg/Mesh.cpp (modified) (3 diffs)
• c/objects/Constraints/SpcTransient.cpp (modified) (1 diff)
• c/objects/ExternalResults/DoubleVecExternalResult.cpp (modified) (1 diff)
• c/objects/Hook.cpp (modified) (2 diffs)
• c/objects/KML/KMLFileReadUtils.cpp (modified) (2 diffs)
• c/objects/KML/KML_Attribute.cpp (modified) (2 diffs)
• c/objects/KML/KML_ColorStyle.cpp (modified) (1 diff)
• c/objects/KML/KML_Comment.cpp (modified) (2 diffs)
• c/objects/KML/KML_Container.cpp (modified) (1 diff)
• c/objects/KML/KML_Document.cpp (modified) (1 diff)
• c/objects/KML/KML_Feature.cpp (modified) (2 diffs)
• c/objects/KML/KML_File.cpp (modified) (1 diff)
• c/objects/KML/KML_Folder.cpp (modified) (1 diff)
• c/objects/KML/KML_Icon.cpp (modified) (1 diff)
• c/objects/KML/KML_LineString.cpp (modified) (1 diff)
• c/objects/KML/KML_LineStyle.cpp (modified) (1 diff)
• c/objects/KML/KML_LinearRing.cpp (modified) (1 diff)
• c/objects/KML/KML_MultiGeometry.cpp (modified) (2 diffs)
• c/objects/KML/KML_Object.cpp (modified) (3 diffs)
• c/objects/KML/KML_Overlay.cpp (modified) (1 diff)
• c/objects/KML/KML_Placemark.cpp (modified) (2 diffs)
• c/objects/KML/KML_Point.cpp (modified) (1 diff)
• c/objects/KML/KML_PolyStyle.cpp (modified) (1 diff)
• c/objects/KML/KML_Polygon.cpp (modified) (2 diffs)
• c/objects/KML/KML_Style.cpp (modified) (2 diffs)
• c/objects/KML/KML_Unknown.cpp (modified) (3 diffs)
• c/objects/Numerics/Matrix.cpp (modified) (1 diff)
• c/objects/Options/Option.cpp (modified) (1 diff)
• c/objects/Options/OptionCell.cpp (modified) (2 diffs)
• c/objects/Options/OptionChar.cpp (modified) (4 diffs)
• c/objects/Options/OptionDouble.cpp (modified) (2 diffs)
• c/objects/Options/OptionLogical.cpp (modified) (3 diffs)
• c/objects/Options/OptionStruct.cpp (modified) (2 diffs)
• c/objects/Params/DoubleMatArrayParam.cpp (modified) (1 diff)
• c/objects/Params/DoubleMatParam.cpp (modified) (1 diff)
• c/objects/Params/DoubleVecParam.cpp (modified) (1 diff)
• c/objects/Params/IntVecParam.cpp (modified) (1 diff)
• c/shared/Exceptions/Exceptions.cpp (modified) (1 diff)
• c/solutions/ResetBoundaryConditions.cpp (modified) (1 diff)
• c/solutions/adjointbalancethickness_core.cpp (modified) (2 diffs)
• c/solutions/adjointdiagnostic_core.cpp (modified) (2 diffs)
• c/solutions/bedslope_core.cpp (modified) (1 diff)
• c/solutions/control_core.cpp (modified) (4 diffs)
• c/solutions/controltao_core.cpp (modified) (3 diffs)
• c/solutions/convergence.cpp (modified) (3 diffs)
• c/solutions/diagnostic_core.cpp (modified) (4 diffs)
• c/solutions/steadystate_core.cpp (modified) (1 diff)
• c/solutions/surfaceslope_core.cpp (modified) (1 diff)
• c/solvers/solver_thermal_nonlinear.cpp (modified) (2 diffs)
• c/toolkits/issm/SeqMat.cpp (modified) (1 diff)
• c/toolkits/issm/SeqVec.cpp (modified) (1 diff)
• modules/Chaco/Chaco.cpp (modified) (2 diffs)
• modules/KMLOverlay/KMLOverlay.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp

@@ -111 +111 @@
         if(my_rank==0){
                 _printString_("   responses: " << d_numresponses << ": ");
-                for(i=0;i<d_numresponses-1;i++)_printString_("" << d_responses[i] << "|");
-                _printString_("" << d_responses[d_numresponses-1]);
+                for(i=0;i<d_numresponses-1;i++)_printString_(d_responses[i] << "|");
+                _printString_(d_responses[d_numresponses-1]);
                 _printLine_("");
         }

issm/trunk-jpl/src/c/modules/Dakotax/SpawnCoreParallel.cpp

@@ -67 +67 @@
 
         /*Determine solution sequence: */
-        if(VerboseQmu()) _pprintLine_("" << "Starting " << EnumToStringx(solution_type) << " core:");
+        if(VerboseQmu()) _pprintLine_("Starting " << EnumToStringx(solution_type) << " core:");
         CorePointerFromSolutionEnum(&solutioncore,femmodel->parameters,solution_type);
         #ifdef _HAVE_CONTROL_

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

@@ -277 +277 @@
                         
                         #ifdef _DEBUG2_
-                                //_printLine_("" << temp << " " << elev << " " << range << " ");
+                                //_printLine_(temp << " " << elev << " " << range << " ");
                         #endif
 

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

@@ -43 +43 @@
                 }
 
-//              _pprintLine_("" << kstr);
+//              _pprintLine_(kstr);
                 xDelete<char>(kstr);
         }

issm/trunk-jpl/src/c/modules/UpdateConstraintsx/UpdateConstraintsx.cpp

@@ -22 +22 @@
 
         /*start module: */
-        if(VerboseModule()) _pprintLine_("" << "   Updating constraints for time: " << time);
+        if(VerboseModule()) _pprintLine_("   Updating constraints for time: " << time);
         
         /*First, update dof constraints in nodes, using constraints: */

issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp

@@ -2374 +2374 @@
                                         }
                                 }
-                                //_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 << "]");
+                                //_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 << "]");
                                 ta = Next(ta).Adj(); 
                                 if (count++>50) _error2_("Maximum number of iteration exceeded");
@@ -4382 +4382 @@
                                                                                 ||   (bb=Area2( t[0].r , A.r    , t[2].r )) < 0.0  
                                                                                 ||   (cc=Area2( t[0].r , t[1].r , A.r    )) < 0.0)){
-                                                        _printLine_("" << ke + nbvold << " not in triangle " << i << " In= " << !!t.link << " " << aa << " " << bb << " " << cc << " " << dd);
+                                                        _printLine_(ke + nbvold << " not in triangle " << i << " In= " << !!t.link << " " << aa << " " << bb << " " << cc << " " << dd);
                                                         _error2_("Number of triangles with P2 interpolation Problem");
                                                 }
@@ -4390 +4390 @@
                                                                                 ||   (bb=Area2( tt[0].r , A.r     , tt[2].r )) < 0 
                                                                                 ||   (cc=Area2( tt[0].r , tt[1].r , A.r     )) < 0)){
-                                                        _printLine_("" << ke + nbvold << " not in triangle " << ii << " In= " << !!tt.link << " " << aa << " " << bb << " " << cc << " " << dd);
+                                                        _printLine_(ke + nbvold << " not in triangle " << ii << " In= " << !!tt.link << " " << aa << " " << bb << " " << cc << " " << dd);
                                                         _error2_("Number of triangles with P2 interpolation Problem");
                                                 }

issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp

@@ -68 +68 @@
         _printLine_("   steps|times|values");
         for(i=0;i<nsteps;i++){
-                _printLine_("" << i << "-" << times[i] << ":" << values[i]);
+                _printLine_(i << "-" << times[i] << ":" << values[i]);
         }
         return;

issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp

@@ -72 +72 @@
         _printLine_("   vector size: " << this->M);
         for(i=0;i<this->M;i++){
-                _printLine_("" << i << " " << this->values[i]);
+                _printLine_(i << " " << this->values[i]);
         }
         _printLine_("   step: " << this->step);

issm/trunk-jpl/src/c/objects/Hook.cpp

@@ -79 +79 @@
                 _printLine_("      num=" << this->num);
                 _printString_("      ids: ");
-                for (i=0;i<this->num;i++) _printString_("" << this->ids[i] << " ");
+                for (i=0;i<this->num;i++) _printString_(this->ids[i] << " ");
                 _printLine_("");
                 _printString_("      offsets: ");
-                for (i=0;i<this->num;i++) _printString_("" << this->offsets[i] << " ");
+                for (i=0;i<this->num;i++) _printString_(this->offsets[i] << " ");
                 _printLine_("");
         }
@@ -98 +98 @@
                 _printLine_("      num=" << this->num);
                 _printString_("      ids: ");
-                for (i=0;i<this->num;i++) _printString_("" << this->ids[i] << " ");
+                for (i=0;i<this->num;i++) _printString_(this->ids[i] << " ");
                 _printLine_("");
                 _printString_("      offsets: ");
-                for (i=0;i<this->num;i++) _printString_("" << this->offsets[i] << " ");
+                for (i=0;i<this->num;i++) _printString_(this->offsets[i] << " ");
                 _printLine_("");
                 if (!objects) _printLine_("      warning: object not hooked yet");

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

@@ -130 +130 @@
 //      else if (ifield)
 //              _pprintLine_("field buffer (length=" << ibuf << "):");
-//      _pprintLine_("" << buffer);
+//      _pprintLine_(buffer);
 
         if (!ibuf)
@@ -194 +194 @@
 
 //      _pprintLine_("comment buffer (length=" << ibuf << "):");
-//      _pprintLine_("" << buffer);
+//      _pprintLine_(buffer);
 
         if (!ibuf)

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

@@ -48 +48 @@
         for (i=0;i<10-strlen(name);i++)
                 if(flag) _pprintString_(" ");
-        if(flag) _pprintLine_("" << name << ": \"" << value << "\"");
+        if(flag) _pprintLine_(name << ": \"" << value << "\"");
 
         return;
@@ -69 +69 @@
         bool  flag=true;
 
-        if(flag) _pprintString_("" << indent << "    ");
+        if(flag) _pprintString_(indent << "    ");
         for (i=0;i<10-strlen(name);i++)
                 if(flag) _pprintString_(" ");
-        if(flag) _pprintLine_("" << name << ": \"" << value << "\"");
+        if(flag) _pprintLine_(name << ": \"" << value << "\"");
 
         return;

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

@@ -68 +68 @@
         KML_SubStyle::DeepEcho(indent);
 
-        if(flag) _pprintLine_("" << indent << "         color: " << color);
-        if(flag) _pprintLine_("" << indent << "     colormode: " << colormode);
+        if(flag) _pprintLine_(indent << "         color: " << color);
+        if(flag) _pprintLine_(indent << "     colormode: " << colormode);
 }
 /*}}}*/

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

@@ -43 +43 @@
 
         if(flag) _pprintString_("    ");
-        if(flag) _pprintLine_("" << value);
+        if(flag) _pprintLine_(value);
 
         return;
@@ -63 +63 @@
         bool  flag=true;
 
-        if(flag) _pprintString_("" << indent << "    ");
-        if(flag) _pprintLine_("" << value);
+        if(flag) _pprintString_(indent << "    ");
+        if(flag) _pprintLine_(value);
 
         return;

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

@@ -78 +78 @@
         if (feature->Size())
                 for (i=0; i<feature->Size(); i++) {
-                        if(flag) _pprintLine_("" << indent << "       feature: -------- begin [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "       feature: -------- begin [" << i << "] --------");
                         ((KML_Feature *)feature->GetObjectByOffset(i))->DeepEcho(indent2);
-                        if(flag) _pprintLine_("" << indent << "       feature: --------  end  [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "       feature: --------  end  [" << i << "] --------");
                 }
         else
-                if(flag) _pprintLine_("" << indent << "       feature: [empty]");
+                if(flag) _pprintLine_(indent << "       feature: [empty]");
 
         return;

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

@@ -65 +65 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_Document:");
+        if(flag) _pprintLine_(indent << "KML_Document:");
         KML_Container::DeepEcho(indent);
 

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

@@ -84 +84 @@
         KML_Object::DeepEcho(indent);
 
-        if(flag) _pprintLine_("" << indent << "          name: \"" << name << "\"");
-        if(flag) _pprintLine_("" << indent << "    visibility: " << (visibility ? "true" : "false"));
-        if(flag) _pprintLine_("" << indent << "          open: " << (open ? "true" : "false"));
-        if(flag) _pprintLine_("" << indent << "       snippet: \"" << snippet << "\"");
-        if(flag) _pprintLine_("" << indent << "      descript: \"" << descript << "\"");
-        if(flag) _pprintLine_("" << indent << "      styleurl: \"" << styleurl << "\"");
+        if(flag) _pprintLine_(indent << "          name: \"" << name << "\"");
+        if(flag) _pprintLine_(indent << "    visibility: " << (visibility ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "          open: " << (open ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "       snippet: \"" << snippet << "\"");
+        if(flag) _pprintLine_(indent << "      descript: \"" << descript << "\"");
+        if(flag) _pprintLine_(indent << "      styleurl: \"" << styleurl << "\"");
 
 /*  loop over any styles for the feature  */
@@ -98 +98 @@
         if (style->Size())
                 for (i=0; i<style->Size(); i++) {
-                        if(flag) _pprintLine_("" << indent << "         style: -------- begin [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "         style: -------- begin [" << i << "] --------");
                         ((KML_Style *)style->GetObjectByOffset(i))->DeepEcho(indent2);
-                        if(flag) _pprintLine_("" << indent << "         style: --------  end  [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "         style: --------  end  [" << i << "] --------");
                 }
         else
-                if(flag) _pprintLine_("" << indent << "         style: [empty]");
+                if(flag) _pprintLine_(indent << "         style: [empty]");
 
         return;

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

@@ -63 +63 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_File:");
+        if(flag) _pprintLine_(indent << "KML_File:");
         KML_Object::DeepEcho(indent);
 

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

@@ -65 +65 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_Folder:");
+        if(flag) _pprintLine_(indent << "KML_Folder:");
         KML_Container::DeepEcho(indent);
 

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

@@ -79 +79 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_Icon:");
+        if(flag) _pprintLine_(indent << "KML_Icon:");
         KML_Object::DeepEcho(indent);
 
-        if(flag) _pprintLine_("" << indent << "          href: \"" << href << "\"");
-        if(flag) _pprintLine_("" << indent << "       refmode: \"" << refmode << "\"");
-        if(flag) _pprintLine_("" << indent << "        refint: " << refint);
-        if(flag) _pprintLine_("" << indent << "      vrefmode: \"" << vrefmode << "\"");
-        if(flag) _pprintLine_("" << indent << "      vreftime: " << vreftime);
-        if(flag) _pprintLine_("" << indent << "      vboundsc: " << vboundsc);
-        if(flag) _pprintLine_("" << indent << "       vformat: \"" << vformat << "\"");
-        if(flag) _pprintLine_("" << indent << "        hquery: \"" << hquery << "\"");
+        if(flag) _pprintLine_(indent << "          href: \"" << href << "\"");
+        if(flag) _pprintLine_(indent << "       refmode: \"" << refmode << "\"");
+        if(flag) _pprintLine_(indent << "        refint: " << refint);
+        if(flag) _pprintLine_(indent << "      vrefmode: \"" << vrefmode << "\"");
+        if(flag) _pprintLine_(indent << "      vreftime: " << vreftime);
+        if(flag) _pprintLine_(indent << "      vboundsc: " << vboundsc);
+        if(flag) _pprintLine_(indent << "       vformat: \"" << vformat << "\"");
+        if(flag) _pprintLine_(indent << "        hquery: \"" << hquery << "\"");
 
         return;

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

@@ -78 +78 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_LineString:");
+        if(flag) _pprintLine_(indent << "KML_LineString:");
         KML_Geometry::DeepEcho(indent);
 
-        if(flag) _pprintLine_("" << indent << "       extrude: " << (extrude ? "true" : "false"));
-        if(flag) _pprintLine_("" << indent << "    tessellate: " << (tessellate ? "true" : "false"));
-        if(flag) _pprintLine_("" << indent << "       altmode: \"" << altmode << "\"");
-        if(flag) _pprintLine_("" << indent << "        coords: (ncoord=" << ncoord << ")");
+        if(flag) _pprintLine_(indent << "       extrude: " << (extrude ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "    tessellate: " << (tessellate ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "       altmode: \"" << altmode << "\"");
+        if(flag) _pprintLine_(indent << "        coords: (ncoord=" << ncoord << ")");
         for (i=0; i<ncoord; i++)
-                if(flag) _pprintLine_("" << indent << "                (" << coords[3*i+0] << "," << coords[3*i+1] << "," << coords[3*i+2] << ")");
+                if(flag) _pprintLine_(indent << "                (" << coords[3*i+0] << "," << coords[3*i+1] << "," << coords[3*i+2] << ")");
 
         return;

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

@@ -66 +66 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_LineStyle:");
+        if(flag) _pprintLine_(indent << "KML_LineStyle:");
         KML_ColorStyle::DeepEcho(indent);
 
-        if(flag) _pprintLine_("" << indent << "         width: " << width);
+        if(flag) _pprintLine_(indent << "         width: " << width);
 
         return;

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

@@ -78 +78 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_LinearRing:");
+        if(flag) _pprintLine_(indent << "KML_LinearRing:");
         KML_Geometry::DeepEcho(indent);
 
-        if(flag) _pprintLine_("" << indent << "       extrude: " << (extrude ? "true" : "false"));
-        if(flag) _pprintLine_("" << indent << "    tessellate: " << (tessellate ? "true" : "false"));
-        if(flag) _pprintLine_("" << indent << "       altmode: \"" << altmode << "\"");
-        if(flag) _pprintLine_("" << indent << "        coords: (ncoord=" << ncoord << ")");
+        if(flag) _pprintLine_(indent << "       extrude: " << (extrude ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "    tessellate: " << (tessellate ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "       altmode: \"" << altmode << "\"");
+        if(flag) _pprintLine_(indent << "        coords: (ncoord=" << ncoord << ")");
         for (i=0; i<ncoord; i++)
                 _printf_(flag,"%s                (%g,%g,%g)\n",indent,

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

@@ -70 +70 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_Multigeometry:");
+        if(flag) _pprintLine_(indent << "KML_Multigeometry:");
         KML_Geometry::DeepEcho(indent);
 
@@ -80 +80 @@
         if (geometry->Size())
                 for (i=0; i<geometry->Size(); i++) {
-                        if(flag) _pprintLine_("" << indent << "      geometry: -------- begin [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "      geometry: -------- begin [" << i << "] --------");
                         ((KML_Geometry *)geometry->GetObjectByOffset(i))->DeepEcho(indent2);
-                        if(flag) _pprintLine_("" << indent << "      geometry: --------  end  [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "      geometry: --------  end  [" << i << "] --------");
                 }
         else
-                if(flag) _pprintLine_("" << indent << "      geometry: [empty]");
+                if(flag) _pprintLine_(indent << "      geometry: [empty]");
 
         return;

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

@@ -86 +86 @@
                 }
         else
-                if(flag) _pprintLine_("" << indent << "        attrib: [empty]");
+                if(flag) _pprintLine_(indent << "        attrib: [empty]");
 
 /*  loop over the comments for the object  */
@@ -95 +95 @@
                 }
         else
-                if(flag) _pprintLine_("" << indent << "        commnt: [empty]");
+                if(flag) _pprintLine_(indent << "        commnt: [empty]");
 
 /*  loop over the unknown objects for the object  */
@@ -104 +104 @@
         if (kmlobj->Size())
                 for (i=0; i<kmlobj->Size(); i++) {
-            if(flag) _pprintLine_("" << indent << "        kmlobj: -------- begin [" << i << "] --------");
+            if(flag) _pprintLine_(indent << "        kmlobj: -------- begin [" << i << "] --------");
                         ((KML_Unknown *)kmlobj->GetObjectByOffset(i))->DeepEcho(indent2);
-            if(flag) _pprintLine_("" << indent << "        kmlobj: --------  end  [" << i << "] --------");
+            if(flag) _pprintLine_(indent << "        kmlobj: --------  end  [" << i << "] --------");
                 }
         else
-                if(flag) _pprintLine_("" << indent << "        kmlobj: [empty]");
+                if(flag) _pprintLine_(indent << "        kmlobj: [empty]");
 
         return;

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

@@ -72 +72 @@
         strcat(indent2,"  ");
 
-        _pprintLine_("" << indent << "         color: " << color);
-        _pprintLine_("" << indent << "       draword: " << draword);
+        _pprintLine_(indent << "         color: " << color);
+        _pprintLine_(indent << "       draword: " << draword);
         if (icon)
                 icon->DeepEcho(indent2);
         else
-                _pprintLine_("" << indent << "          icon: " << icon);
+                _pprintLine_(indent << "          icon: " << icon);
 }
 /*}}}*/

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

@@ -70 +70 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_Placemark:");
+        if(flag) _pprintLine_(indent << "KML_Placemark:");
         KML_Feature::DeepEcho(indent);
 
@@ -80 +80 @@
         if (geometry->Size())
                 for (i=0; i<geometry->Size(); i++) {
-                        if(flag) _pprintLine_("" << indent << "      geometry: -------- begin [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "      geometry: -------- begin [" << i << "] --------");
                         ((KML_Geometry *)geometry->GetObjectByOffset(i))->DeepEcho(indent2);
-                        if(flag) _pprintLine_("" << indent << "      geometry: --------  end  [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "      geometry: --------  end  [" << i << "] --------");
                 }
         else
-                if(flag) _pprintLine_("" << indent << "      geometry: [empty]");
+                if(flag) _pprintLine_(indent << "      geometry: [empty]");
 
         return;

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

@@ -73 +73 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_Point:");
+        if(flag) _pprintLine_(indent << "KML_Point:");
         KML_Geometry::DeepEcho(indent);
 
-        if(flag) _pprintLine_("" << indent << "       extrude: " << (extrude ? "true" : "false"));
-        if(flag) _pprintLine_("" << indent << "       altmode: \"" << altmode << "\"");
-        if(flag) _pprintLine_("" << indent << "        coords: (" << coords[0] << "," << coords[1] << "," << coords[2] << ")");
+        if(flag) _pprintLine_(indent << "       extrude: " << (extrude ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "       altmode: \"" << altmode << "\"");
+        if(flag) _pprintLine_(indent << "        coords: (" << coords[0] << "," << coords[1] << "," << coords[2] << ")");
 
         return;

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

@@ -68 +68 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_PolyStyle:");
+        if(flag) _pprintLine_(indent << "KML_PolyStyle:");
         KML_ColorStyle::DeepEcho(indent);
 
-        if(flag) _pprintLine_("" << indent << "          fill: " << fill);
-        if(flag) _pprintLine_("" << indent << "       outline: " << outline);
+        if(flag) _pprintLine_(indent << "          fill: " << fill);
+        if(flag) _pprintLine_(indent << "       outline: " << outline);
 
         return;

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

@@ -84 +84 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_Polygon:");
+        if(flag) _pprintLine_(indent << "KML_Polygon:");
         KML_Geometry::DeepEcho(indent);
 
-        if(flag) _pprintLine_("" << indent << "       extrude: " << (extrude ? "true" : "false"));
-        if(flag) _pprintLine_("" << indent << "    tessellate: " << (tessellate ? "true" : "false"));
-        if(flag) _pprintLine_("" << indent << "       altmode: \"" << altmode << "\"");
+        if(flag) _pprintLine_(indent << "       extrude: " << (extrude ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "    tessellate: " << (tessellate ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "       altmode: \"" << altmode << "\"");
 
         memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char));
@@ -96 +96 @@
         if (outer->Size())
                 for (i=0; i<outer->Size(); i++) {
-                        if(flag) _pprintLine_("" << indent << "         outer: -------- begin [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "         outer: -------- begin [" << i << "] --------");
                         ((KML_LinearRing *)outer->GetObjectByOffset(i))->DeepEcho(indent2);
-                        if(flag) _pprintLine_("" << indent << "         outer: --------  end  [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "         outer: --------  end  [" << i << "] --------");
                 }
         else
-                if(flag) _pprintLine_("" << indent << "         outer: [empty]");
+                if(flag) _pprintLine_(indent << "         outer: [empty]");
 
         if (inner->Size())
                 for (i=0; i<inner->Size(); i++) {
-                        if(flag) _pprintLine_("" << indent << "         inner: -------- begin [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "         inner: -------- begin [" << i << "] --------");
                         ((KML_LinearRing *)inner->GetObjectByOffset(i))->DeepEcho(indent2);
-                        if(flag) _pprintLine_("" << indent << "         inner: --------  end  [" << i << "] --------");
+                        if(flag) _pprintLine_(indent << "         inner: --------  end  [" << i << "] --------");
                 }
         else
-                if(flag) _pprintLine_("" << indent << "         inner: [empty]");
+                if(flag) _pprintLine_(indent << "         inner: [empty]");
 
         return;

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

@@ -103 +103 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_Style:");
+        if(flag) _pprintLine_(indent << "KML_Style:");
         KML_StyleSelector::DeepEcho(indent);
 
@@ -112 +112 @@
 //              icon->DeepEcho(indent2);
 //      else
-                if(flag) _pprintLine_("" << indent << "          icon: " << icon);
+                if(flag) _pprintLine_(indent << "          icon: " << icon);
 //      if (label)
 //              label->DeepEcho(indent2);
 //      else
-                if(flag) _pprintLine_("" << indent << "         label: " << label);
+                if(flag) _pprintLine_(indent << "         label: " << label);
         if (line)
                 line->DeepEcho(indent2);
         else
-                if(flag) _pprintLine_("" << indent << "          line: " << line);
+                if(flag) _pprintLine_(indent << "          line: " << line);
         if (poly)
                 poly->DeepEcho(indent2);
         else
-                if(flag) _pprintLine_("" << indent << "          poly: " << poly);
+                if(flag) _pprintLine_(indent << "          poly: " << poly);
 //      if (balloon)
 //              balloon->DeepEcho(indent2);
 //      else
-                if(flag) _pprintLine_("" << indent << "       balloon: " << balloon);
+                if(flag) _pprintLine_(indent << "       balloon: " << balloon);
 //      if (list)
 //              list->DeepEcho(indent2);
 //      else
-                if(flag) _pprintLine_("" << indent << "          list: " << list);
+                if(flag) _pprintLine_(indent << "          list: " << list);
 
         return;

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

@@ -73 +73 @@
         bool         flag=true;
 
-        if(flag) _pprintLine_("" << indent << "KML_Unknown " << name << ":");
+        if(flag) _pprintLine_(indent << "KML_Unknown " << name << ":");
         KML_Object::DeepEcho(indent);
 
@@ -81 +81 @@
         
                 vtoken=strtok(valuei,nl);
-                if(flag) _pprintString_("" << indent << "         value: \"" << vtoken);
+                if(flag) _pprintString_(indent << "         value: \"" << vtoken);
     
                 while (vtoken=strtok(NULL,nl))
@@ -90 +90 @@
         }
     else
-        if(flag) _pprintLine_("" << indent << "         value: [none]");
+        if(flag) _pprintLine_(indent << "         value: [none]");
 
         return;

issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp

@@ -133 +133 @@
         for(i=0;i<M;i++){
                 for(j=0;j<N;j++){
-                        _printString_("" << *(amatrix+N*i+j) << " ");
+                        _printString_(*(amatrix+N*i+j) << " ");
                 }
                 _printLine_("");

issm/trunk-jpl/src/c/objects/Options/Option.cpp

@@ -73 +73 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "          name: \"" << name << "\"");
-        if(flag) _pprintLine_("" << indent << "         numel: " << numel);
-        if(flag) _pprintLine_("" << indent << "         ndims: " << ndims);
+        if(flag) _pprintLine_(indent << "          name: \"" << name << "\"");
+        if(flag) _pprintLine_(indent << "         numel: " << numel);
+        if(flag) _pprintLine_(indent << "         ndims: " << ndims);
         if(size){
                 StringFromSize(cstr,size,ndims);
-                if(flag) _pprintLine_("" << indent << "          size: " << cstr);
+                if(flag) _pprintLine_(indent << "          size: " << cstr);
         }
-        else if(flag) _pprintLine_("" << indent << "          size: [empty]");
+        else if(flag) _pprintLine_(indent << "          size: [empty]");
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Options/OptionCell.cpp

@@ -75 +75 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "OptionCell DeepEcho:");
+        if(flag) _pprintLine_(indent << "OptionCell DeepEcho:");
         Option::DeepEcho(indent);
 
@@ -86 +86 @@
                         ColumnWiseDimsFromIndex(dims,i,size,ndims);
                         StringFromDims(cstr,dims,ndims);
-                        if(flag) _pprintLine_("" << indent << "        values: -------- begin " << cstr << " --------");
+                        if(flag) _pprintLine_(indent << "        values: -------- begin " << cstr << " --------");
                         ((Option *)values->GetObjectByOffset(i))->DeepEcho(indent2);
-                        if(flag) _pprintLine_("" << indent << "        values: --------  end  " << cstr << " --------");
+                        if(flag) _pprintLine_(indent << "        values: --------  end  " << cstr << " --------");
                 }
                 xDelete<int>(dims);
         }
-        else if(flag) _pprintLine_("" << indent << "        values: [empty]");
+        else if(flag) _pprintLine_(indent << "        values: [empty]");
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Options/OptionChar.cpp

@@ -79 +79 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "OptionChar DeepEcho:");
+        if(flag) _pprintLine_(indent << "OptionChar DeepEcho:");
         Option::DeepEcho(indent);
 
@@ -87 +87 @@
         if (values) {
                 if (ndims == 2 && size[0] == 1) {
-                        if(flag) _pprintLine_("" << indent << "        values: \"" << values << "\"");
+                        if(flag) _pprintLine_(indent << "        values: \"" << values << "\"");
                 }
                 else {
@@ -97 +97 @@
                                 RowWiseDimsFromIndex(dims,ipt,size,ndims);
                                 StringFromDims(cstr,dims,ndims);
-                                if(flag) _pprintLine_("" << indent << "        values" << cstr << ": \"" << size[1] << "*s\"");
+                                if(flag) _pprintLine_(indent << "        values" << cstr << ": \"" << size[1] << "*s\"");
                                 ipt+=size[1];
                         }
@@ -103 +103 @@
                 }
         }
-        else if(flag) _pprintLine_("" << indent << "        values: [empty]");
+        else if(flag) _pprintLine_(indent << "        values: [empty]");
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Options/OptionDouble.cpp

@@ -75 +75 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "OptionDouble DeepEcho:");
+        if(flag) _pprintLine_(indent << "OptionDouble DeepEcho:");
         Option::DeepEcho(indent);
 
@@ -83 +83 @@
         if (values) {
                 dims=xNew<int>(ndims);
-                if(numel==1) if(flag) _pprintLine_("" << indent << "        values: " << values[0]);
+                if(numel==1) if(flag) _pprintLine_(indent << "        values: " << values[0]);
                 else{
                         for (i=0; i<numel; i++) {
                                 RowWiseDimsFromIndex(dims,i,size,ndims);
                                 StringFromDims(cstr,dims,ndims);
-                                if(flag) _pprintLine_("" << indent << "        values" << cstr << ": " << values[i]);
+                                if(flag) _pprintLine_(indent << "        values" << cstr << ": " << values[i]);
                         }
                 }
                 xDelete<int>(dims);
         }
-        else if(flag) _pprintLine_("" << indent << "        values: [empty]");
+        else if(flag) _pprintLine_(indent << "        values: [empty]");
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Options/OptionLogical.cpp

@@ -75 +75 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "OptionLogical DeepEcho:");
+        if(flag) _pprintLine_(indent << "OptionLogical DeepEcho:");
         Option::DeepEcho(indent);
 
@@ -82 +82 @@
 
         if (values) {
-                if(numel==1) if(flag) _pprintLine_("" << indent << "        values: " << (values[0] ? "true" : "false"));
+                if(numel==1) if(flag) _pprintLine_(indent << "        values: " << (values[0] ? "true" : "false"));
                 else{
                         dims=xNew<int>(ndims);
@@ -88 +88 @@
                                 RowWiseDimsFromIndex(dims,i,size,ndims);
                                 StringFromDims(cstr,dims,ndims);
-                                if(flag) _pprintLine_("" << indent << "        values" << cstr << ": " << (values[i] ? "true" : "false"));
+                                if(flag) _pprintLine_(indent << "        values" << cstr << ": " << (values[i] ? "true" : "false"));
                         }
                         xDelete<int>(dims);
                 }
         }
-        else if(flag) _pprintLine_("" << indent << "        values: [empty]");
+        else if(flag) _pprintLine_(indent << "        values: [empty]");
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Options/OptionStruct.cpp

@@ -80 +80 @@
         bool  flag=true;
 
-        if(flag) _pprintLine_("" << indent << "OptionStruct DeepEcho:");
+        if(flag) _pprintLine_(indent << "OptionStruct DeepEcho:");
         Option::DeepEcho(indent);
 
@@ -92 +92 @@
                         StringFromDims(cstr,dims,ndims);
                         if (values[i]->Size()){
-                                if(flag) _pprintLine_("" << indent << "        values: -------- begin " << cstr << " --------");
+                                if(flag) _pprintLine_(indent << "        values: -------- begin " << cstr << " --------");
                                 for (j=0; j<values[i]->Size(); j++) ((Option *)values[i]->GetObjectByOffset(j))->DeepEcho(indent2);
-                                if(flag) _pprintLine_("" << indent << "        values: --------  end  " << cstr << " --------");
+                                if(flag) _pprintLine_(indent << "        values: --------  end  " << cstr << " --------");
                         }
-                        else if(flag) _pprintLine_("" << indent << "        values: " << cstr << " [empty]");
+                        else if(flag) _pprintLine_(indent << "        values: " << cstr << " [empty]");
                 }
                 xDelete<int>(dims);
         }
-        else if(flag) _pprintLine_("" << indent << "        values: [empty]");
+        else if(flag) _pprintLine_(indent << "        values: [empty]");
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp

@@ -112 +112 @@
                 for(j=0;j<m;j++){
                         _printString_("   ");
-                        for(k=0;k<n;k++)_printString_("" << *(matrix+n*j+k) << " ");
+                        for(k=0;k<n;k++)_printString_(*(matrix+n*j+k) << " ");
                         _printLine_("");
                 }

issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp

@@ -64 +64 @@
         for(i=0;i<this->M;i++){
                 for(i=0;i<this->N;i++){
-                        _printLine_("" << i << " " << j << " " << *(this->value+N*i+j));
+                        _printLine_(i << " " << j << " " << *(this->value+N*i+j));
                 }
         }

issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp

@@ -62 +62 @@
         _printLine_("   vector size: " << this->M);
         for(i=0;i<this->M;i++){
-                _printLine_("" << i << " " << this->values[i]);
+                _printLine_(i << " " << this->values[i]);
         }
 }

issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp

@@ -78 +78 @@
         _printLine_("   vector size: " << this->M);
         for(i=0;i<this->M;i++){
-                _printLine_("" << i << " " << this->values[i]);
+                _printLine_(i << " " << this->values[i]);
         }
 }

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

@@ -44 +44 @@
 
         if (function_name=="" || file_line==0){ //WINDOWS
-                _printString_("" << "Error message: " << what());
+                _printString_("Error message: " << what());
         }
         else{
                 if(num_procs==1){
                         _printLine_("\n??? Error using ==> " << file_name.c_str() << ":" << file_line);
-                        _printLine_("" << function_name.c_str() << " error message: " << what() << "\n");
+                        _printLine_(function_name.c_str() << " error message: " << what() << "\n");
                 }
                 else{

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

@@ -15 +15 @@
         int    i;
 
-        if(VerboseSolution()) _pprintLine_("" << "   updating boundary conditions...");
+        if(VerboseSolution()) _pprintLine_("   updating boundary conditions...");
                         
         /*set current analysis: */

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

@@ -22 +22 @@
 
         /*compute thickness */
-        if(VerboseSolution()) _pprintLine_("" << "   computing thickness");
+        if(VerboseSolution()) _pprintLine_("   computing thickness");
         femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum);
         solver_linear(femmodel);
@@ -30 +30 @@
 
         /*compute adjoint*/
-        if(VerboseSolution()) _pprintLine_("" << "   computing adjoint");
+        if(VerboseSolution()) _pprintLine_("   computing adjoint");
         femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum,AdjointBalancethicknessAnalysisEnum);
         solver_adjoint_linear(femmodel);

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

@@ -25 +25 @@
 
         /*Compute velocities*/
-        if(VerboseSolution()) _pprintLine_("" << "   computing velocities");
+        if(VerboseSolution()) _pprintLine_("   computing velocities");
         femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
         solver_nonlinear(femmodel,conserve_loads); 
@@ -33 +33 @@
 
         /*Compute adjoint*/
-        if(VerboseSolution()) _pprintLine_("" << "   computing adjoint");
+        if(VerboseSolution()) _pprintLine_("   computing adjoint");
         femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum);
         solver_adjoint_linear(femmodel);

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

@@ -19 +19 @@
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
 
-        if(VerboseSolution()) _pprintLine_("" << "   computing slope");
+        if(VerboseSolution()) _pprintLine_("   computing slope");
 
         /*Call on core computations: */

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

@@ -66 +66 @@
 
         /*Launch once a complete solution to set up all inputs*/
-        if(VerboseControl()) _pprintLine_("" << "   preparing initial solution");
+        if(VerboseControl()) _pprintLine_("   preparing initial solution");
         if(isstokes) solutioncore(femmodel);
 
@@ -88 +88 @@
                 if(solution_type==SteadystateSolutionEnum) solutioncore(femmodel);
 
-                if(VerboseControl()) _pprintLine_("" << "   compute adjoint state:");
+                if(VerboseControl()) _pprintLine_("   compute adjoint state:");
                 adjointcore(femmodel);
                 gradient_core(femmodel,n,search_scalar==0);
@@ -98 +98 @@
                 }
 
-                if(VerboseControl()) _pprintLine_("" << "   optimizing along gradient direction");
+                if(VerboseControl()) _pprintLine_("   optimizing along gradient direction");
                 optpars.maxiter=(int)maxiter[n]; optpars.cm_jump=cm_jump[n];
                 BrentSearch(&search_scalar,J+n,&optpars,&objectivefunction,&optargs);
 
-                if(VerboseControl()) _pprintLine_("" << "   updating parameter using optimized search scalar"); //true means update save controls
+                if(VerboseControl()) _pprintLine_("   updating parameter using optimized search scalar"); //true means update save controls
                 InputControlUpdatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,search_scalar,true);
                 
@@ -108 +108 @@
         }
 
-        if(VerboseControl()) _pprintLine_("" << "   preparing final solution");
+        if(VerboseControl()) _pprintLine_("   preparing final solution");
         femmodel->parameters->SetParam(true,SaveResultsEnum);
         solutioncore(femmodel);

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

@@ -54 +54 @@
         /*Initialize TAO*/
         TaoCreate(PETSC_COMM_WORLD,&tao);
-        if(VerboseControl()) _pprintLine_("" << "   Initializing the Toolkit for Advanced Optimization (TAO)");
+        if(VerboseControl()) _pprintLine_("   Initializing the Toolkit for Advanced Optimization (TAO)");
         TaoSetFromOptions(tao);
         TaoSetType(tao,"tao_blmvm");
@@ -78 +78 @@
 
         /*Solver optimization problem*/
-        if(VerboseControl()) _pprintLine_("" << "   Starting optimization");
+        if(VerboseControl()) _pprintLine_("   Starting optimization");
         TaoSolve(tao);
         TaoView(tao,PETSC_VIEWER_STDOUT_WORLD);
@@ -88 +88 @@
 
         /*Finalize*/
-        if(VerboseControl()) _pprintLine_("" << "   preparing final solution");
+        if(VerboseControl()) _pprintLine_("   preparing final solution");
         femmodel->parameters->SetParam(true,SaveResultsEnum);
         void (*solutioncore)(FemModel*)=NULL;

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

@@ -81 +81 @@
         //print
         if(res<eps_res){
-                if(VerboseConvergence()) _pprintLine_("" << "   mechanical equilibrium convergence criterion" << "50s" << res*100 << " < " << eps_res*100 << " %");
+                if(VerboseConvergence()) _pprintLine_("   mechanical equilibrium convergence criterion" << "50s" << res*100 << " < " << eps_res*100 << " %");
                 converged=true;
         }
         else{ 
-                if(VerboseConvergence()) _pprintLine_("" << "   mechanical equilibrium convergence criterion" << "50s" << res*100 << " > " << eps_res*100 << " %");
+                if(VerboseConvergence()) _pprintLine_("   mechanical equilibrium convergence criterion" << "50s" << res*100 << " > " << eps_res*100 << " %");
                 converged=false;
         }
@@ -104 +104 @@
                 if (!isnan(eps_rel)){
                         if((ndu/nu)<eps_rel){
-                                if(VerboseConvergence()) _pprintLine_("" << "   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " < " << eps_rel*100 << " %");
+                                if(VerboseConvergence()) _pprintLine_("   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " < " << eps_rel*100 << " %");
                         }
                         else{ 
-                                if(VerboseConvergence()) _pprintLine_("" << "   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " > " << eps_rel*100 << " %");
+                                if(VerboseConvergence()) _pprintLine_("   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " > " << eps_rel*100 << " %");
                                 converged=false;
                         }
                 }
-                else _pprintLine_("" << "   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " %");
+                else _pprintLine_("   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " %");
 
         }
@@ -129 +129 @@
                 if (!isnan(eps_abs)){
                         if ((nduinf*yts)<eps_abs){
-                                if(VerboseConvergence()) _pprintLine_("" << "   Convergence criterion: max(du)" << "50s" << nduinf*yts << " < " << eps_abs << " m/yr");
+                                if(VerboseConvergence()) _pprintLine_("   Convergence criterion: max(du)" << "50s" << nduinf*yts << " < " << eps_abs << " m/yr");
                         }
                         else{
-                                if(VerboseConvergence()) _pprintLine_("" << "   Convergence criterion: max(du)" << "50s" << nduinf*yts << " > " << eps_abs << " m/yr");
+                                if(VerboseConvergence()) _pprintLine_("   Convergence criterion: max(du)" << "50s" << nduinf*yts << " > " << eps_abs << " m/yr");
                                 converged=false;
                         }
                 }
-                else  _pprintLine_("" << "   Convergence criterion: max(du)" << "50s" << nduinf*yts << " m/yr");
+                else  _pprintLine_("   Convergence criterion: max(du)" << "50s" << nduinf*yts << " m/yr");
 
         }

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

@@ -59 +59 @@
         if(ishutter){
                         
-                if(VerboseSolution()) _pprintLine_("" << "   computing hutter velocities");
+                if(VerboseSolution()) _pprintLine_("   computing hutter velocities");
 
                 //Take the last velocity into account so that the velocity on the MacAyeal domain is not zero
@@ -72 +72 @@
         if (ismacayealpattyn ^ isstokes){ // ^ = xor
                 
-                if(VerboseSolution()) _pprintLine_("" << "   computing velocities");
+                if(VerboseSolution()) _pprintLine_("   computing velocities");
                 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
                 if(isnewton)
@@ -82 +82 @@
         if (ismacayealpattyn && isstokes){
 
-                if(VerboseSolution()) _pprintLine_("" << "   computing coupling macayealpattyn and stokes velocities and pressure ");
+                if(VerboseSolution()) _pprintLine_("   computing coupling macayealpattyn and stokes velocities and pressure ");
                 solver_stokescoupling_nonlinear(femmodel,conserve_loads);
         }
@@ -88 +88 @@
         if (dim==3 & (ishutter || ismacayealpattyn)){
 
-                if(VerboseSolution()) _pprintLine_("" << "   computing vertical velocities");
+                if(VerboseSolution()) _pprintLine_("   computing vertical velocities");
                 femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
                 solver_linear(femmodel);

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

@@ -55 +55 @@
                 #endif
 
-                if(VerboseSolution()) _pprintLine_("" << "   computing new velocity");
+                if(VerboseSolution()) _pprintLine_("   computing new velocity");
                 diagnostic_core(femmodel);
 
                 if (step>1){
-                        if(VerboseSolution()) _pprintLine_("" << "   checking velocity, temperature and pressure convergence");
+                        if(VerboseSolution()) _pprintLine_("   checking velocity, temperature and pressure convergence");
                         if(steadystateconvergence(femmodel)) break;
                 }
                 if(step>maxiter){
-                        if(VerboseSolution()) _pprintLine_("" << "   maximum number steadystate iterations " << maxiter << " reached");
+                        if(VerboseSolution()) _pprintLine_("   maximum number steadystate iterations " << maxiter << " reached");
                         break;
                 }
                 
-                if(VerboseSolution()) _pprintLine_("" << "   saving velocity, temperature and pressure to check for convergence at next step");
+                if(VerboseSolution()) _pprintLine_("   saving velocity, temperature and pressure to check for convergence at next step");
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,VxPicardEnum);
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,VyPicardEnum);

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

@@ -19 +19 @@
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
 
-        if(VerboseSolution()) _pprintLine_("" << "computing slope...");
+        if(VerboseSolution()) _pprintLine_("computing slope...");
 
         /*Call on core computations: */

issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp

@@ -47 +47 @@
         converged=false;
 
-        if(VerboseSolution()) _pprintLine_("" << "starting direct shooting method");
+        if(VerboseSolution()) _pprintLine_("starting direct shooting method");
         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,true,ResetPenaltiesEnum);
         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,false,ConvergedEnum);
@@ -66 +66 @@
 
                 if (!converged){
-                        if(VerboseConvergence()) _pprintLine_("" << "   #unstable constraints = " << num_unstable_constraints);
+                        if(VerboseConvergence()) _pprintLine_("   #unstable constraints = " << num_unstable_constraints);
                         if (num_unstable_constraints <= thermal_penalty_threshold)converged=true;
                         if (count>=thermal_maxiter){

issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp

@@ -86 +86 @@
         for(i=0;i<M;i++){
                 for(j=0;j<N;j++){
-                        _printString_("" << this->matrix[N*i+j] << " ");
+                        _printString_(this->matrix[N*i+j] << " ");
                 }
                 _printLine_("");

issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp

@@ -61 +61 @@
         _printLine_("SeqVec size " << this->M);
         for(i=0;i<M;i++){
-                _printString_("" << vector[i] << "\n ");
+                _printString_(vector[i] << "\n ");
         }
 }

issm/trunk-jpl/src/modules/Chaco/Chaco.cpp

@@ -84 +84 @@
         _printLine_("nvtxs: " << nvtxs);
         _printString_("options: [");
-        for(i=0;i<10;i++)_printString_("" << options[i] << "|");
+        for(i=0;i<10;i++)_printString_(options[i] << "|");
         _printLine_("]");
         _printLine_("start: ");
-        for (i=0; i<nvtxs+1;i++)_printString_("" << start[i] << " ");
+        for (i=0; i<nvtxs+1;i++)_printString_(start[i] << " ");
         _printLine_("");
         _printLine_("adjacency: ");
@@ -93 +93 @@
         _printLine_("");
         _printLine_("nedges: " << nedges << " " << ewgts);
-        if(ewgts) for (i = 0; i < nedges; i++)_printString_("" << ewgts[i] << " ");
+        if(ewgts) for (i = 0; i < nedges; i++)_printString_(ewgts[i] << " ");
         _printLine_("");
         _printLine_("vwgts:");
-        for (i = 0; i < nvtxs; i++)_printString_("" << vwgts[i] << " ");
+        for (i = 0; i < nvtxs; i++)_printString_(vwgts[i] << " ");
         _printLine_("");
         _printLine_("nparts: " << nparts[0]);

issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp

@@ -88 +88 @@
                         }
                 if (verbose) _printLine_("Zipping file \"" << filkmz << "\".");
-                if (verbose) _printLine_("" << czip);
+                if (verbose) _printLine_(czip);
 
                 if (mexEvalString(czip)) _error2_("Error zipping file \"" << filkmz << "\".");