Index: /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 12520) @@ -111,6 +111,6 @@ if(my_rank==0){ _printString_(" responses: " << d_numresponses << ": "); - for(i=0;iparameters,solution_type); #ifdef _HAVE_CONTROL_ Index: /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 12520) @@ -277,5 +277,5 @@ #ifdef _DEBUG2_ - //_printLine_("" << temp << " " << elev << " " << range << " "); + //_printLine_(temp << " " << elev << " " << range << " "); #endif Index: /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 12520) @@ -43,5 +43,5 @@ } -// _pprintLine_("" << kstr); +// _pprintLine_(kstr); xDelete(kstr); } Index: /issm/trunk-jpl/src/c/modules/UpdateConstraintsx/UpdateConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/UpdateConstraintsx/UpdateConstraintsx.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/modules/UpdateConstraintsx/UpdateConstraintsx.cpp (revision 12520) @@ -22,5 +22,5 @@ /*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: */ Index: /issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp (revision 12520) @@ -2374,5 +2374,5 @@ } } - //_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,5 +4382,5 @@ || (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,5 +4390,5 @@ || (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"); } Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12520) @@ -68,5 +68,5 @@ _printLine_(" steps|times|values"); for(i=0;iM); for(i=0;iM;i++){ - _printLine_("" << i << " " << this->values[i]); + _printLine_(i << " " << this->values[i]); } _printLine_(" step: " << this->step); Index: /issm/trunk-jpl/src/c/objects/Hook.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Hook.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Hook.cpp (revision 12520) @@ -79,8 +79,8 @@ _printLine_(" num=" << this->num); _printString_(" ids: "); - for (i=0;inum;i++) _printString_("" << this->ids[i] << " "); + for (i=0;inum;i++) _printString_(this->ids[i] << " "); _printLine_(""); _printString_(" offsets: "); - for (i=0;inum;i++) _printString_("" << this->offsets[i] << " "); + for (i=0;inum;i++) _printString_(this->offsets[i] << " "); _printLine_(""); } @@ -98,8 +98,8 @@ _printLine_(" num=" << this->num); _printString_(" ids: "); - for (i=0;inum;i++) _printString_("" << this->ids[i] << " "); + for (i=0;inum;i++) _printString_(this->ids[i] << " "); _printLine_(""); _printString_(" offsets: "); - for (i=0;inum;i++) _printString_("" << this->offsets[i] << " "); + for (i=0;inum;i++) _printString_(this->offsets[i] << " "); _printLine_(""); if (!objects) _printLine_(" warning: object not hooked yet"); Index: /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp (revision 12520) @@ -130,5 +130,5 @@ // else if (ifield) // _pprintLine_("field buffer (length=" << ibuf << "):"); -// _pprintLine_("" << buffer); +// _pprintLine_(buffer); if (!ibuf) @@ -194,5 +194,5 @@ // _pprintLine_("comment buffer (length=" << ibuf << "):"); -// _pprintLine_("" << buffer); +// _pprintLine_(buffer); if (!ibuf) Index: /issm/trunk-jpl/src/c/objects/KML/KML_Attribute.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Attribute.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Attribute.cpp (revision 12520) @@ -48,5 +48,5 @@ for (i=0;i<10-strlen(name);i++) if(flag) _pprintString_(" "); - if(flag) _pprintLine_("" << name << ": \"" << value << "\""); + if(flag) _pprintLine_(name << ": \"" << value << "\""); return; @@ -69,8 +69,8 @@ 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp (revision 12520) @@ -68,6 +68,6 @@ 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); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Comment.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Comment.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Comment.cpp (revision 12520) @@ -43,5 +43,5 @@ if(flag) _pprintString_(" "); - if(flag) _pprintLine_("" << value); + if(flag) _pprintLine_(value); return; @@ -63,6 +63,6 @@ bool flag=true; - if(flag) _pprintString_("" << indent << " "); - if(flag) _pprintLine_("" << value); + if(flag) _pprintString_(indent << " "); + if(flag) _pprintLine_(value); return; Index: /issm/trunk-jpl/src/c/objects/KML/KML_Container.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Container.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Container.cpp (revision 12520) @@ -78,10 +78,10 @@ if (feature->Size()) for (i=0; iSize(); 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_Document.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Document.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Document.cpp (revision 12520) @@ -65,5 +65,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "KML_Document:"); + if(flag) _pprintLine_(indent << "KML_Document:"); KML_Container::DeepEcho(indent); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Feature.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Feature.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Feature.cpp (revision 12520) @@ -84,10 +84,10 @@ 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,10 +98,10 @@ if (style->Size()) for (i=0; iSize(); 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_File.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_File.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_File.cpp (revision 12520) @@ -63,5 +63,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "KML_File:"); + if(flag) _pprintLine_(indent << "KML_File:"); KML_Object::DeepEcho(indent); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Folder.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Folder.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Folder.cpp (revision 12520) @@ -65,5 +65,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "KML_Folder:"); + if(flag) _pprintLine_(indent << "KML_Folder:"); KML_Container::DeepEcho(indent); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Icon.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Icon.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Icon.cpp (revision 12520) @@ -79,15 +79,15 @@ 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_LineString.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_LineString.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_LineString.cpp (revision 12520) @@ -78,13 +78,13 @@ 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; iSize()) for (i=0; iSize(); 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 12520) @@ -86,5 +86,5 @@ } else - if(flag) _pprintLine_("" << indent << " attrib: [empty]"); + if(flag) _pprintLine_(indent << " attrib: [empty]"); /* loop over the comments for the object */ @@ -95,5 +95,5 @@ } else - if(flag) _pprintLine_("" << indent << " commnt: [empty]"); + if(flag) _pprintLine_(indent << " commnt: [empty]"); /* loop over the unknown objects for the object */ @@ -104,10 +104,10 @@ if (kmlobj->Size()) for (i=0; iSize(); 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_Overlay.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Overlay.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Overlay.cpp (revision 12520) @@ -72,10 +72,10 @@ 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); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Placemark.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Placemark.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Placemark.cpp (revision 12520) @@ -70,5 +70,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "KML_Placemark:"); + if(flag) _pprintLine_(indent << "KML_Placemark:"); KML_Feature::DeepEcho(indent); @@ -80,10 +80,10 @@ if (geometry->Size()) for (i=0; iSize(); 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_Point.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Point.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Point.cpp (revision 12520) @@ -73,10 +73,10 @@ 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.cpp (revision 12520) @@ -68,9 +68,9 @@ 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_Polygon.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Polygon.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Polygon.cpp (revision 12520) @@ -84,10 +84,10 @@ 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,19 +96,19 @@ if (outer->Size()) for (i=0; iSize(); 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; iSize(); 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_Style.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Style.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Style.cpp (revision 12520) @@ -103,5 +103,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "KML_Style:"); + if(flag) _pprintLine_(indent << "KML_Style:"); KML_StyleSelector::DeepEcho(indent); @@ -112,25 +112,25 @@ // 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; Index: /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 12520) @@ -73,5 +73,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "KML_Unknown " << name << ":"); + if(flag) _pprintLine_(indent << "KML_Unknown " << name << ":"); KML_Object::DeepEcho(indent); @@ -81,5 +81,5 @@ vtoken=strtok(valuei,nl); - if(flag) _pprintString_("" << indent << " value: \"" << vtoken); + if(flag) _pprintString_(indent << " value: \"" << vtoken); while (vtoken=strtok(NULL,nl)) @@ -90,5 +90,5 @@ } else - if(flag) _pprintLine_("" << indent << " value: [none]"); + if(flag) _pprintLine_(indent << " value: [none]"); return; Index: /issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp (revision 12520) @@ -133,5 +133,5 @@ for(i=0;iGetObjectByOffset(i))->DeepEcho(indent2); - if(flag) _pprintLine_("" << indent << " values: -------- end " << cstr << " --------"); + if(flag) _pprintLine_(indent << " values: -------- end " << cstr << " --------"); } xDelete(dims); } - else if(flag) _pprintLine_("" << indent << " values: [empty]"); + else if(flag) _pprintLine_(indent << " values: [empty]"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Options/OptionChar.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionChar.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Options/OptionChar.cpp (revision 12520) @@ -79,5 +79,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "OptionChar DeepEcho:"); + if(flag) _pprintLine_(indent << "OptionChar DeepEcho:"); Option::DeepEcho(indent); @@ -87,5 +87,5 @@ if (values) { if (ndims == 2 && size[0] == 1) { - if(flag) _pprintLine_("" << indent << " values: \"" << values << "\""); + if(flag) _pprintLine_(indent << " values: \"" << values << "\""); } else { @@ -97,5 +97,5 @@ 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,5 +103,5 @@ } } - else if(flag) _pprintLine_("" << indent << " values: [empty]"); + else if(flag) _pprintLine_(indent << " values: [empty]"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Options/OptionDouble.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionDouble.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Options/OptionDouble.cpp (revision 12520) @@ -75,5 +75,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "OptionDouble DeepEcho:"); + if(flag) _pprintLine_(indent << "OptionDouble DeepEcho:"); Option::DeepEcho(indent); @@ -83,15 +83,15 @@ if (values) { dims=xNew(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(dims); } - else if(flag) _pprintLine_("" << indent << " values: [empty]"); + else if(flag) _pprintLine_(indent << " values: [empty]"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Options/OptionLogical.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionLogical.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Options/OptionLogical.cpp (revision 12520) @@ -75,5 +75,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "OptionLogical DeepEcho:"); + if(flag) _pprintLine_(indent << "OptionLogical DeepEcho:"); Option::DeepEcho(indent); @@ -82,5 +82,5 @@ 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(ndims); @@ -88,10 +88,10 @@ 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(dims); } } - else if(flag) _pprintLine_("" << indent << " values: [empty]"); + else if(flag) _pprintLine_(indent << " values: [empty]"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Options/OptionStruct.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionStruct.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Options/OptionStruct.cpp (revision 12520) @@ -80,5 +80,5 @@ bool flag=true; - if(flag) _pprintLine_("" << indent << "OptionStruct DeepEcho:"); + if(flag) _pprintLine_(indent << "OptionStruct DeepEcho:"); Option::DeepEcho(indent); @@ -92,13 +92,13 @@ 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; jSize(); 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(dims); } - else if(flag) _pprintLine_("" << indent << " values: [empty]"); + else if(flag) _pprintLine_(indent << " values: [empty]"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12520) @@ -112,5 +112,5 @@ for(j=0;jM;i++){ for(i=0;iN;i++){ - _printLine_("" << i << " " << j << " " << *(this->value+N*i+j)); + _printLine_(i << " " << j << " " << *(this->value+N*i+j)); } } Index: /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12520) @@ -62,5 +62,5 @@ _printLine_(" vector size: " << this->M); for(i=0;iM;i++){ - _printLine_("" << i << " " << this->values[i]); + _printLine_(i << " " << this->values[i]); } } Index: /issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12520) @@ -78,5 +78,5 @@ _printLine_(" vector size: " << this->M); for(i=0;iM;i++){ - _printLine_("" << i << " " << this->values[i]); + _printLine_(i << " " << this->values[i]); } } Index: /issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp (revision 12520) @@ -44,10 +44,10 @@ 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{ Index: /issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp (revision 12520) @@ -15,5 +15,5 @@ int i; - if(VerboseSolution()) _pprintLine_("" << " updating boundary conditions..."); + if(VerboseSolution()) _pprintLine_(" updating boundary conditions..."); /*set current analysis: */ Index: /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp (revision 12520) @@ -22,5 +22,5 @@ /*compute thickness */ - if(VerboseSolution()) _pprintLine_("" << " computing thickness"); + if(VerboseSolution()) _pprintLine_(" computing thickness"); femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum); solver_linear(femmodel); @@ -30,5 +30,5 @@ /*compute adjoint*/ - if(VerboseSolution()) _pprintLine_("" << " computing adjoint"); + if(VerboseSolution()) _pprintLine_(" computing adjoint"); femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum,AdjointBalancethicknessAnalysisEnum); solver_adjoint_linear(femmodel); Index: /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp (revision 12520) @@ -25,5 +25,5 @@ /*Compute velocities*/ - if(VerboseSolution()) _pprintLine_("" << " computing velocities"); + if(VerboseSolution()) _pprintLine_(" computing velocities"); femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); solver_nonlinear(femmodel,conserve_loads); @@ -33,5 +33,5 @@ /*Compute adjoint*/ - if(VerboseSolution()) _pprintLine_("" << " computing adjoint"); + if(VerboseSolution()) _pprintLine_(" computing adjoint"); femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum); solver_adjoint_linear(femmodel); Index: /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp (revision 12520) @@ -19,5 +19,5 @@ femmodel->parameters->FindParam(&save_results,SaveResultsEnum); - if(VerboseSolution()) _pprintLine_("" << " computing slope"); + if(VerboseSolution()) _pprintLine_(" computing slope"); /*Call on core computations: */ Index: /issm/trunk-jpl/src/c/solutions/control_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/control_core.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/control_core.cpp (revision 12520) @@ -66,5 +66,5 @@ /*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,5 +88,5 @@ 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,9 +98,9 @@ } - 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,5 +108,5 @@ } - if(VerboseControl()) _pprintLine_("" << " preparing final solution"); + if(VerboseControl()) _pprintLine_(" preparing final solution"); femmodel->parameters->SetParam(true,SaveResultsEnum); solutioncore(femmodel); Index: /issm/trunk-jpl/src/c/solutions/controltao_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 12520) @@ -54,5 +54,5 @@ /*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,5 +78,5 @@ /*Solver optimization problem*/ - if(VerboseControl()) _pprintLine_("" << " Starting optimization"); + if(VerboseControl()) _pprintLine_(" Starting optimization"); TaoSolve(tao); TaoView(tao,PETSC_VIEWER_STDOUT_WORLD); @@ -88,5 +88,5 @@ /*Finalize*/ - if(VerboseControl()) _pprintLine_("" << " preparing final solution"); + if(VerboseControl()) _pprintLine_(" preparing final solution"); femmodel->parameters->SetParam(true,SaveResultsEnum); void (*solutioncore)(FemModel*)=NULL; Index: /issm/trunk-jpl/src/c/solutions/convergence.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 12520) @@ -81,9 +81,9 @@ //print if(res " << eps_res*100 << " %"); + if(VerboseConvergence()) _pprintLine_(" mechanical equilibrium convergence criterion" << "50s" << res*100 << " > " << eps_res*100 << " %"); converged=false; } @@ -104,12 +104,12 @@ if (!isnan(eps_rel)){ if((ndu/nu) " << 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,12 +129,12 @@ if (!isnan(eps_abs)){ if ((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"); } Index: /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp (revision 12520) @@ -59,5 +59,5 @@ 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,5 +72,5 @@ if (ismacayealpattyn ^ isstokes){ // ^ = xor - if(VerboseSolution()) _pprintLine_("" << " computing velocities"); + if(VerboseSolution()) _pprintLine_(" computing velocities"); femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); if(isnewton) @@ -82,5 +82,5 @@ 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,5 +88,5 @@ if (dim==3 & (ishutter || ismacayealpattyn)){ - if(VerboseSolution()) _pprintLine_("" << " computing vertical velocities"); + if(VerboseSolution()) _pprintLine_(" computing vertical velocities"); femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum); solver_linear(femmodel); Index: /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 12520) @@ -55,17 +55,17 @@ #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); Index: /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp (revision 12520) @@ -19,5 +19,5 @@ femmodel->parameters->FindParam(&save_results,SaveResultsEnum); - if(VerboseSolution()) _pprintLine_("" << "computing slope..."); + if(VerboseSolution()) _pprintLine_("computing slope..."); /*Call on core computations: */ Index: /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 12520) @@ -47,5 +47,5 @@ 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,5 +66,5 @@ 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){ Index: /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 12520) @@ -86,5 +86,5 @@ for(i=0;imatrix[N*i+j] << " "); + _printString_(this->matrix[N*i+j] << " "); } _printLine_(""); Index: /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 12519) +++ /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 12520) @@ -61,5 +61,5 @@ _printLine_("SeqVec size " << this->M); for(i=0;i