kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

replace endl with std::endl

Browse Source
This commit is contained in:
MA-DEVELOP\apeltauer
2019-04-03 09:06:10 +02:00
committed by wmayer
parent f1cb7f35c7
commit 48d64b4d5e
3 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp vendored
View File

@@ -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 = " <<minh << endl;
//cout << "BND BOX minh = " <<minh << std::endl;
}
else
{
minh = 3 * sqrt( minh ); // triangulation for visualization is rather fine
//cout << "TRIANGULATION minh = " <<minh << endl;
//cout << "TRIANGULATION minh = " <<minh << std::endl;
}
if ( minh > 0.5 * maxSize )
minh = maxSize / 3.;
@@ -877,16 +877,16 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom,
RestrictLocalSize( ngMesh, 0.5*(np1+np2), (np1-np2).Modulus() );
#ifdef DUMP_SEGMENTS
cout << "Segment: " << seg.edgenr << " on SMESH face " << helper.GetMeshDS()->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="<<isInternalFace << endl;
<< " internal="<<isInternalFace << std::endl;
#endif
if ( proxyMesh )
smDS = proxyMesh->GetSubMesh( geomFace );
@@ -1046,7 +1046,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom,
ngMesh.AddSurfaceElement (tri);
#ifdef DUMP_TRIANGLES
cout << tri << endl;
cout << tri << std::endl;
#endif
if ( isInternalFace )
@@ -1054,7 +1054,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom,
swap( tri[1], tri[2] );
ngMesh.AddSurfaceElement (tri);
#ifdef DUMP_TRIANGLES
cout << tri << endl;
cout << tri << std::endl;
#endif
}
}
@@ -1470,11 +1470,11 @@ void NETGENPlugin_Mesher::AddIntVerticesInFaces(const netgen::OCCGeometry& o
netgen::MeshPoint mp( netgen::Point<3> (P.X(), P.Y(), P.Z()));
ngMesh.AddPoint ( mp, 1, netgen::EDGEPOINT );
segEnd2 = ngMesh.GetNP();
//cout << "Middle " << r << " uv " << uvP.X() << "," << uvP.Y() << "( " << ngMesh.Point(segEnd2).X()<<","<<ngMesh.Point(segEnd2).Y()<<","<<ngMesh.Point(segEnd2).Z()<<" )"<< endl;
//cout << "Middle " << r << " uv " << uvP.X() << "," << uvP.Y() << "( " << ngMesh.Point(segEnd2).X()<<","<<ngMesh.Point(segEnd2).Y()<<","<<ngMesh.Point(segEnd2).Z()<<" )"<< std::endl;
SMDS_MeshNode * nP = helper.AddNode(P.X(), P.Y(), P.Z());
nodeVec.push_back( nP );
}
//else cout << "at Node " << " uv " << uvP.X() << "," << uvP.Y() << endl;
//else cout << "at Node " << " uv " << uvP.X() << "," << uvP.Y() << std::endl;
// Add the segment
netgen::Segment seg;
@@ -1524,10 +1524,10 @@ void NETGENPlugin_Mesher::AddIntVerticesInSolids(const netgen::OCCGeometry&
#ifdef DUMP_TRIANGLES_SCRIPT
// create a python script making a mesh containing triangles added for internal vertices
ofstream py(DUMP_TRIANGLES_SCRIPT);
py << "import SMESH"<< endl
<< "from salome.smesh import smeshBuilder"<<endl
<< "smesh = smeshBuilder.New(salome.myStudy)"<<endl
<< "m = smesh.Mesh(name='triangles')" << endl;
py << "import SMESH"<< std::endl
<< "from salome.smesh import smeshBuilder"<<std::endl
<< "smesh = smeshBuilder.New(salome.myStudy)"<<std::endl
<< "m = smesh.Mesh(name='triangles')" << std::endl;
#endif
if ( nodeVec.size() < ngMesh.GetNP() )
nodeVec.resize( ngMesh.GetNP(), 0 );
@@ -1725,10 +1725,10 @@ void NETGENPlugin_Mesher::AddIntVerticesInSolids(const netgen::OCCGeometry&
ngMesh.AddSurfaceElement (tri);
#ifdef DUMP_TRIANGLES_SCRIPT
py << "n1 = m.AddNode( "<< mpV(0)<<", "<< mpV(1)<<", "<< mpV(2)<<") "<< endl
<< "n2 = m.AddNode( "<< mp[0](0)<<", "<< mp[0](1)<<", "<< mp[0](2)<<") "<< endl
<< "n3 = m.AddNode( "<< mp[1](0)<<", "<< mp[1](1)<<", "<< mp[1](2)<<" )" << endl
<< "m.AddFace([n1,n2,n3])" << endl;
py << "n1 = m.AddNode( "<< mpV(0)<<", "<< mpV(1)<<", "<< mpV(2)<<") "<< std::endl
<< "n2 = m.AddNode( "<< mp[0](0)<<", "<< mp[0](1)<<", "<< mp[0](2)<<") "<< std::endl
<< "n3 = m.AddNode( "<< mp[1](0)<<", "<< mp[1](1)<<", "<< mp[1](2)<<" )" << std::endl
<< "m.AddFace([n1,n2,n3])" << std::endl;
#endif
} // loop on internal vertices of a solid
@@ -1945,7 +1945,7 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh,
}
#ifdef DUMP_SEGMENTS
cout << "BEGIN WIRE " << iW << endl;
cout << "BEGIN WIRE " << iW << std::endl;
for ( int i = prevNbNGSeg+1; i <= ngMesh.GetNSeg(); ++i )
{
netgen::Segment& seg = ngMesh.LineSegment( i );
@@ -1953,21 +1953,21 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh,
netgen::Segment& prevSeg = ngMesh.LineSegment( i-1 );
if ( seg[0] == prevSeg[1] && seg[1] == prevSeg[0] )
{
cout << "Segment: " << seg.edgenr << endl << "\tis REVRESE of the previous one" << endl;
cout << "Segment: " << seg.edgenr << std::endl << "\tis REVRESE of the previous one" << std::endl;
continue;
}
}
cout << "Segment: " << seg.edgenr << endl
<< "\tp1: " << seg[0] << " n" << nodeVec[ seg[0]]->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 "<<ev_face->first<<" on face "<<ev_face->second<<endl;
//cout<<"INTERNAL EDGE or VERTEX "<<ev_face->first<<" on face "<<ev_face->second<<std::endl;
smToPrecompute[ MeshDim_1D ].push_back( _mesh.GetSubMeshContaining( ev_face->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

4
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp vendored
View File

@@ -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<NETGENPlugin_NETGEN_2D_ONLY*>( 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 );
}

12
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp vendored
View File

@@ -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 );
}