From 48d64b4d5e20cf0480386193720389ebf6f3a5c0 Mon Sep 17 00:00:00 2001 From: "MA-DEVELOP\\apeltauer" Date: Wed, 3 Apr 2019 09:06:10 +0200 Subject: [PATCH] replace endl with std::endl --- .../src/NETGENPlugin/NETGENPlugin_Mesher.cpp | 114 +++++++++--------- .../NETGENPlugin_NETGEN_2D_ONLY.cpp | 4 +- .../NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp | 12 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp index 19dd0c4186..a6605f36bc 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp @@ -695,12 +695,12 @@ double NETGENPlugin_Mesher::GetDefaultMinSize(const TopoDS_Shape& geom, if ( minh > 0.25 * bb.SquareExtent() ) // simple geometry, rough triangulation { minh = 1e-3 * sqrt( bb.SquareExtent()); - //cout << "BND BOX minh = " <ShapeToIndex( face ) << endl - << "\tface index: " << seg.si << endl - << "\tp1: " << seg[0] << endl - << "\tp2: " << seg[1] << endl - << "\tp0 param: " << seg.epgeominfo[ 0 ].dist << endl - << "\tp0 uv: " << seg.epgeominfo[ 0 ].u <<", "<< seg.epgeominfo[ 0 ].v << endl - //<< "\tp0 edge: " << seg.epgeominfo[ 0 ].edgenr << endl - << "\tp1 param: " << seg.epgeominfo[ 1 ].dist << endl - << "\tp1 uv: " << seg.epgeominfo[ 1 ].u <<", "<< seg.epgeominfo[ 1 ].v << endl; - //<< "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << endl; + cout << "Segment: " << seg.edgenr << " on SMESH face " << helper.GetMeshDS()->ShapeToIndex( face ) << std::endl + << "\tface index: " << seg.si << std::endl + << "\tp1: " << seg[0] << std::endl + << "\tp2: " << seg[1] << std::endl + << "\tp0 param: " << seg.epgeominfo[ 0 ].dist << std::endl + << "\tp0 uv: " << seg.epgeominfo[ 0 ].u <<", "<< seg.epgeominfo[ 0 ].v << std::endl + //<< "\tp0 edge: " << seg.epgeominfo[ 0 ].edgenr << std::endl + << "\tp1 param: " << seg.epgeominfo[ 1 ].dist << std::endl + << "\tp1 uv: " << seg.epgeominfo[ 1 ].u <<", "<< seg.epgeominfo[ 1 ].v << std::endl; + //<< "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << std::endl; #endif if ( isSeam ) { @@ -904,10 +904,10 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, seg.edgenr = ngMesh.GetNSeg() + 1; // segment id ngMesh.AddSegment (seg); #ifdef DUMP_SEGMENTS - cout << "Segment: " << seg.edgenr << endl + cout << "Segment: " << seg.edgenr << std::endl << "\t is SEAM (reverse) of the previous. " << " Other " << (helper.GetPeriodicIndex() & 1 ? "U" : "V") - << " = " << otherSeamParam << endl; + << " = " << otherSeamParam << std::endl; #endif } else if ( fOri == TopAbs_INTERNAL ) @@ -917,7 +917,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, seg.edgenr = ngMesh.GetNSeg() + 1; // segment id ngMesh.AddSegment (seg); #ifdef DUMP_SEGMENTS - cout << "Segment: " << seg.edgenr << endl << "\t is REVERSE of the previous" << endl; + cout << "Segment: " << seg.edgenr << std::endl << "\t is REVERSE of the previous" << std::endl; #endif } } @@ -995,7 +995,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, #ifdef DUMP_TRIANGLES cout << "SMESH face " << helper.GetMeshDS()->ShapeToIndex( geomFace ) - << " internal="<GetID() << endl - << "\tp2: " << seg[1] << " n" << nodeVec[ seg[1]]->GetID() << endl - << "\tp0 param: " << seg.epgeominfo[ 0 ].dist << endl - << "\tp0 uv: " << seg.epgeominfo[ 0 ].u <<", "<< seg.epgeominfo[ 0 ].v << endl - << "\tp0 edge: " << seg.epgeominfo[ 0 ].edgenr << endl - << "\tp1 param: " << seg.epgeominfo[ 1 ].dist << endl - << "\tp1 uv: " << seg.epgeominfo[ 1 ].u <<", "<< seg.epgeominfo[ 1 ].v << endl - << "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << endl; + cout << "Segment: " << seg.edgenr << std::endl + << "\tp1: " << seg[0] << " n" << nodeVec[ seg[0]]->GetID() << std::endl + << "\tp2: " << seg[1] << " n" << nodeVec[ seg[1]]->GetID() << std::endl + << "\tp0 param: " << seg.epgeominfo[ 0 ].dist << std::endl + << "\tp0 uv: " << seg.epgeominfo[ 0 ].u <<", "<< seg.epgeominfo[ 0 ].v << std::endl + << "\tp0 edge: " << seg.epgeominfo[ 0 ].edgenr << std::endl + << "\tp1 param: " << seg.epgeominfo[ 1 ].dist << std::endl + << "\tp1 uv: " << seg.epgeominfo[ 1 ].u <<", "<< seg.epgeominfo[ 1 ].v << std::endl + << "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << std::endl; } - cout << "--END WIRE " << iW << endl; + cout << "--END WIRE " << iW << std::endl; #endif } // loop on WIREs of a FACE @@ -3447,7 +3447,7 @@ double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder, double doneTime = edgeMeshingTime + doneShapeRate * faceMeshingTime; ((double&) _ticTime) = doneTime / _totalTime / _progressTic; // cout << "shape " << _curShapeIndex << " _ticTime " << _ticTime - // << " " << doneTime / _totalTime / _progressTic << endl; + // << " " << doneTime / _totalTime / _progressTic << std::endl; } } } @@ -3466,7 +3466,7 @@ double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder, double doneTime = edgeFaceMeshingTime + doneShapeRate * voluMeshingTime; ((double&) _ticTime) = doneTime / _totalTime / _progressTic; // cout << "shape " << _curShapeIndex << " _ticTime " << _ticTime - // << " " << doneTime / _totalTime / _progressTic << endl; + // << " " << doneTime / _totalTime / _progressTic << std::endl; } } if ( _ticTime > 0 ) @@ -3476,7 +3476,7 @@ double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder, ((int&) *algoProgressTic )++; ((double&) *algoProgress) = progress; } - //cout << progress << " " << *algoProgressTic << " " << netgen::multithread.task << " "<< _ticTime << endl; + //cout << progress << " " << *algoProgressTic << " " << netgen::multithread.task << " "<< _ticTime << std::endl; return Min( progress, 0.99 ); } @@ -3587,10 +3587,10 @@ void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh, ofstream outfile(pyFile.c_str(), ios::out); if ( !outfile ) return; - outfile << "import SMESH" << endl - << "from salome.smesh import smeshBuilder" << endl - << "smesh = smeshBuilder.New(salome.myStudy)" << endl - << "mesh = smesh.Mesh()" << endl << endl; + outfile << "import SMESH" << std::endl + << "from salome.smesh import smeshBuilder" << std::endl + << "smesh = smeshBuilder.New(salome.myStudy)" << std::endl + << "mesh = smesh.Mesh()" << std::endl << std::endl; using namespace netgen; PointIndex pi; @@ -3600,12 +3600,12 @@ void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh, outfile << "mesh.AddNode( "; outfile << (*ngMesh)[pi](0) << ", "; outfile << (*ngMesh)[pi](1) << ", "; - outfile << (*ngMesh)[pi](2) << ") ## "<< pi << endl; + outfile << (*ngMesh)[pi](2) << ") ## "<< pi << std::endl; } int nbDom = ngMesh->GetNDomains(); for ( int i = 0; i < nbDom; ++i ) - outfile<< "grp" << i+1 << " = mesh.CreateEmptyGroup( SMESH.FACE, 'domain"<< i+1 << "')"<< endl; + outfile<< "grp" << i+1 << " = mesh.CreateEmptyGroup( SMESH.FACE, 'domain"<< i+1 << "')"<< std::endl; SurfaceElementIndex sei; for (sei = 0; sei < ngMesh->GetNSE(); sei++) @@ -3615,14 +3615,14 @@ void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh, for (int j = 0; j < sel.GetNP(); j++) outfile << sel[j] << ( j+1 < sel.GetNP() ? ", " : " ])"); if ( sel.IsDeleted() ) outfile << " ## IsDeleted "; - outfile << endl; + outfile << std::endl; if ((*ngMesh)[sei].GetIndex()) { if ( int dom1 = ngMesh->GetFaceDescriptor((*ngMesh)[sei].GetIndex ()).DomainIn()) - outfile << "grp"<< dom1 <<".Add([ " << (int)sei+1 << " ])" << endl; + outfile << "grp"<< dom1 <<".Add([ " << (int)sei+1 << " ])" << std::endl; if ( int dom2 = ngMesh->GetFaceDescriptor((*ngMesh)[sei].GetIndex ()).DomainOut()) - outfile << "grp"<< dom2 <<".Add([ " << (int)sei+1 << " ])" << endl; + outfile << "grp"<< dom2 <<".Add([ " << (int)sei+1 << " ])" << std::endl; } } @@ -3632,7 +3632,7 @@ void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh, outfile << "mesh.AddVolume([ "; for (int j = 0; j < el.GetNP(); j++) outfile << el[j] << ( j+1 < el.GetNP() ? ", " : " ])"); - outfile << endl; + outfile << std::endl; } for (int i = 1; i <= ngMesh->GetNSeg(); i++) @@ -3640,9 +3640,9 @@ void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh, const Segment & seg = ngMesh->LineSegment (i); outfile << "mesh.AddEdge([ " << seg[0] << ", " - << seg[1] << " ])" << endl; + << seg[1] << " ])" << std::endl; } - cout << "Write " << pyFile << endl; + cout << "Write " << pyFile << std::endl; } //================================================================================ @@ -3954,7 +3954,7 @@ void NETGENPlugin_Internals::getInternalEdges( TopTools_IndexedMapOfShape& fmap, ( ev.ShapeType() == TopAbs_EDGE ? emap : vmap ).Add( ev ); fmap.Add( face ); - //cout<<"INTERNAL EDGE or VERTEX "<first<<" on face "<second<first<<" on face "<second<first )); } @@ -4070,7 +4070,7 @@ NETGENPlugin_NetgenLibWrapper::NETGENPlugin_NetgenLibWrapper() netgen::myerr = netgen::mycout; _coutBuffer = std::cout.rdbuf(); #ifdef _DEBUG_ - cout << "NOTE: netgen output is redirected to file " << _outputFileName << endl; + cout << "NOTE: netgen output is redirected to file " << _outputFileName << std::endl; #else std::cout.rdbuf( netgen::mycout->rdbuf() ); #endif diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp index 986c19a9b7..2c0184495a 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp @@ -538,7 +538,7 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh& aMesh, netgen::mparam.maxh = Max( netgen::mparam.maxh, segLen ); } } - //cerr << "min " << netgen::mparam.minh << " max " << netgen::mparam.maxh << endl; + //cerr << "min " << netgen::mparam.minh << " max " << netgen::mparam.maxh << std::endl; netgen::mparam.minh *= 0.9; netgen::mparam.maxh *= 1.1; continue; @@ -637,7 +637,7 @@ double NETGENPlugin_NETGEN_2D_ONLY::GetProgress() const // const_cast( this )->_progressTic++; // progress = Max( progress, _progressByTic * _progressTic ); // } - // //cout << netgen::multithread.task << " " << _progressTic << endl; + // //cout << netgen::multithread.task << " " << _progressTic << std::endl; // return Min( progress, 0.99 ); } diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp index 6e21884d59..fdcb0a4371 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp @@ -378,15 +378,15 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh, // if ( faceh < 0.5 * maxh ) compareh = -1; // else if ( faceh > 1.5 * maxh ) compareh = 1; // else compareh = 0; -// // cerr << "faceh " << faceh << endl; -// // cerr << "init maxh " << maxh << endl; -// // cerr << "compareh " << compareh << endl; +// // cerr << "faceh " << faceh << std::endl; +// // cerr << "init maxh " << maxh << std::endl; +// // cerr << "compareh " << compareh << std::endl; // if ( compareh > 0 ) // maxh *= 1.2; // else // maxh *= 0.8; -// // cerr << "maxh " << maxh << endl; +// // cerr << "maxh " << maxh << std::endl; // // get bnd box // netgen::Point3d pmin, pmax; @@ -707,14 +707,14 @@ double NETGENPlugin_NETGEN_3D::GetProgress() const strncmp( netgen::multithread.task, volMeshing, 3 ) == 0 )) { res = 0.001 + meshingRatio * netgen::multithread.percent / 100.; - //cout << netgen::multithread.task << " " <<_progressTic << "-" << netgen::multithread.percent << endl; + //cout << netgen::multithread.task << " " <<_progressTic << "-" << netgen::multithread.percent << std::endl; } else // different otimizations { if ( _progressByTic < 0. ) ((NETGENPlugin_NETGEN_3D*)this)->_progressByTic = meshingRatio / _progressTic; res = _progressByTic * _progressTic; - //cout << netgen::multithread.task << " " << _progressTic << " " << res << endl; + //cout << netgen::multithread.task << " " << _progressTic << " " << res << std::endl; } return Min ( res, 0.98 ); }