X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FNETGENPlugin%2FNETGENPlugin_Mesher.cxx;h=73e8c6d89387e14aa11aab0cc125c5ecad149264;hb=1b359b696a744f5cefdd5185651b466a78e5812f;hp=0bfc1782f62b2194f511cb64091922bdafbd33ab;hpb=fd0f83d500bec2be3b3663a22331f2bf9cd24c67;p=plugins%2Fnetgenplugin.git diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index 0bfc178..73e8c6d 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -32,12 +32,14 @@ #include "NETGENPlugin_SimpleHypothesis_3D.hxx" #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -56,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -64,8 +67,6 @@ #include #include #include -#include -#include // Netgen include files #ifndef OCCGEOMETRY @@ -81,9 +82,25 @@ namespace netgen { extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*); #endif //extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh); +#if defined(NETGEN_V5) && defined(WIN32) + DLL_HEADER +#endif extern MeshingParameters mparam; +#if defined(NETGEN_V5) && defined(WIN32) + DLL_HEADER +#endif extern volatile multithreadt multithread; + +#if defined(NETGEN_V5) && defined(WIN32) + DLL_HEADER +#endif extern bool merge_solids; + + // values used for occgeo.facemeshstatus + enum EFaceMeshStatus { FACE_NOT_TREATED = 0, + FACE_FAILED = -1, + FACE_MESHED_OK = 1, + }; } #include @@ -103,15 +120,21 @@ using namespace std; #define NGPOINT_COORDS(p) p(0),p(1),p(2) +#ifdef _DEBUG_ // dump elements added to ng mesh //#define DUMP_SEGMENTS //#define DUMP_TRIANGLES //#define DUMP_TRIANGLES_SCRIPT "/tmp/trias.py" //!< debug AddIntVerticesInSolids() +#endif TopTools_IndexedMapOfShape ShapesWithLocalSize; std::map VertexId2LocalSize; std::map EdgeId2LocalSize; std::map FaceId2LocalSize; +std::map SolidId2LocalSize; + +std::vector ControlPoints; +std::set ShapesWithControlPoints; // <-- allows calling SetLocalSize() several times w/o recomputing ControlPoints //============================================================================= /*! @@ -134,6 +157,7 @@ NETGENPlugin_Mesher::NETGENPlugin_Mesher (SMESH_Mesh* mesh, _progressTic(1), _totalTime(1.0), _simpleHyp(NULL), + _viscousLayersHyp(NULL), _ptrToMe(NULL) { SetDefaultParameters(); @@ -141,6 +165,9 @@ NETGENPlugin_Mesher::NETGENPlugin_Mesher (SMESH_Mesh* mesh, VertexId2LocalSize.clear(); EdgeId2LocalSize.clear(); FaceId2LocalSize.clear(); + SolidId2LocalSize.clear(); + ControlPoints.clear(); + ShapesWithControlPoints.clear(); } //================================================================================ @@ -210,8 +237,10 @@ void NETGENPlugin_Mesher::SetDefaultParameters() * */ //============================================================================= + void SetLocalSize(TopoDS_Shape GeomShape, double LocalSize) { + if ( GeomShape.IsNull() ) return; TopAbs_ShapeEnum GeomType = GeomShape.ShapeType(); if (GeomType == TopAbs_COMPOUND) { for (TopoDS_Iterator it (GeomShape); it.More(); it.Next()) { @@ -230,6 +259,8 @@ void SetLocalSize(TopoDS_Shape GeomShape, double LocalSize) EdgeId2LocalSize[key] = LocalSize; } else if (GeomType == TopAbs_FACE) { FaceId2LocalSize[key] = LocalSize; + } else if (GeomType == TopAbs_SOLID) { + SolidId2LocalSize[key] = LocalSize; } } @@ -257,40 +288,34 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp) // create elements of second order mparams.secondorder = hyp->GetSecondOrder() ? 1 : 0; // quad-dominated surface meshing - // only triangles are allowed for volumic mesh (before realizing IMP 0021676) - //if (!_isVolume) - mparams.quad = hyp->GetQuadAllowed() ? 1 : 0; + mparams.quad = hyp->GetQuadAllowed() ? 1 : 0; _optimize = hyp->GetOptimize(); _fineness = hyp->GetFineness(); mparams.uselocalh = hyp->GetSurfaceCurvature(); netgen::merge_solids = hyp->GetFuseEdges(); - _simpleHyp = NULL; + _simpleHyp = NULL; + // mesh size file + mparams.meshsizefilename= hyp->GetMeshSizeFile().empty() ? 0 : hyp->GetMeshSizeFile().c_str(); - SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen(); - CORBA::Object_var anObject = smeshGen_i->GetNS()->Resolve("/myStudyManager"); - SALOMEDS::StudyManager_var aStudyMgr = SALOMEDS::StudyManager::_narrow(anObject); - SALOMEDS::Study_var myStudy = aStudyMgr->GetStudyByID(hyp->GetStudyId()); - - const NETGENPlugin_Hypothesis::TLocalSize localSizes = hyp->GetLocalSizesAndEntries(); + SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen(); + + const NETGENPlugin_Hypothesis::TLocalSize localSizes = hyp->GetLocalSizesAndEntries(); NETGENPlugin_Hypothesis::TLocalSize::const_iterator it = localSizes.begin(); - for (it ; it != localSizes.end() ; it++) - { - std::string entry = (*it).first; - double val = (*it).second; - // -- - GEOM::GEOM_Object_var aGeomObj; - TopoDS_Shape S = TopoDS_Shape(); - SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() ); - if (!aSObj->_is_nil()) { - CORBA::Object_var obj = aSObj->GetObject(); - aGeomObj = GEOM::GEOM_Object::_narrow(obj); - aSObj->UnRegister(); - } - if ( !aGeomObj->_is_nil() ) - S = smeshGen_i->GeomObjectToShape( aGeomObj.in() ); - // -- - SetLocalSize(S, val); + for ( ; it != localSizes.end() ; it++) + { + std::string entry = (*it).first; + double val = (*it).second; + // -- + GEOM::GEOM_Object_var aGeomObj; + SALOMEDS::SObject_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( entry.c_str() ); + if ( !aSObj->_is_nil() ) { + CORBA::Object_var obj = aSObj->GetObject(); + aGeomObj = GEOM::GEOM_Object::_narrow(obj); + aSObj->UnRegister(); } + TopoDS_Shape S = smeshGen_i->GeomObjectToShape( aGeomObj.in() ); + ::SetLocalSize(S, val); + } } } @@ -307,6 +332,17 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_SimpleHypothesis_2D* SetDefaultParameters(); } +//================================================================================ +/*! + * \brief Store a Viscous Layers hypothesis + */ +//================================================================================ + +void NETGENPlugin_Mesher::SetParameters(const StdMeshers_ViscousLayers* hyp ) +{ + _viscousLayersHyp = hyp; +} + //============================================================================= /*! * Link - a pair of integer numbers @@ -317,6 +353,11 @@ struct Link int n1, n2; Link(int _n1, int _n2) : n1(_n1), n2(_n2) {} Link() : n1(0), n2(0) {} + bool Contains( int n ) const { return n == n1 || n == n2; } + bool IsConnected( const Link& other ) const + { + return (( Contains( other.n1 ) || Contains( other.n2 )) && ( this != &other )); + } }; int HashCode(const Link& aLink, int aLimit) @@ -326,8 +367,8 @@ int HashCode(const Link& aLink, int aLimit) Standard_Boolean IsEqual(const Link& aLink1, const Link& aLink2) { - return (aLink1.n1 == aLink2.n1 && aLink1.n2 == aLink2.n2 || - aLink1.n1 == aLink2.n2 && aLink1.n2 == aLink2.n1); + return (( aLink1.n1 == aLink2.n1 && aLink1.n2 == aLink2.n2 ) || + ( aLink1.n1 == aLink2.n2 && aLink1.n2 == aLink2.n1 )); } namespace @@ -373,7 +414,7 @@ namespace // get ordered EDGEs list< TopoDS_Edge > edges; list< int > nbEdgesInWire; - int nbWires = SMESH_Block::GetOrderedEdges( face, edges, nbEdgesInWire); + /*int nbWires =*/ SMESH_Block::GetOrderedEdges( face, edges, nbEdgesInWire); // find within list< TopoDS_Edge >::iterator eItFwd = edges.begin(); @@ -489,6 +530,159 @@ namespace // } // } } + //================================================================================ + /*! + * \brief Returns a medium node either existing in SMESH of created by NETGEN + * \param [in] corner1 - corner node 1 + * \param [in] corner2 - corner node 2 + * \param [in] defaultMedium - the node created by NETGEN + * \param [in] helper - holder of medium nodes existing in SMESH + * \return const SMDS_MeshNode* - the result node + */ + //================================================================================ + + const SMDS_MeshNode* mediumNode( const SMDS_MeshNode* corner1, + const SMDS_MeshNode* corner2, + const SMDS_MeshNode* defaultMedium, + const SMESH_MesherHelper* helper) + { + if ( helper ) + { + TLinkNodeMap::const_iterator l2n = + helper->GetTLinkNodeMap().find( SMESH_TLink( corner1, corner2 )); + if ( l2n != helper->GetTLinkNodeMap().end() ) + defaultMedium = l2n->second; + } + return defaultMedium; + } + + //================================================================================ + /*! + * \brief Assure that mesh on given shapes is quadratic + */ + //================================================================================ + + // void makeQuadratic( const TopTools_IndexedMapOfShape& shapes, + // SMESH_Mesh* mesh ) + // { + // for ( int i = 1; i <= shapes.Extent(); ++i ) + // { + // SMESHDS_SubMesh* smDS = mesh->GetMeshDS()->MeshElements( shapes(i) ); + // if ( !smDS ) continue; + // SMDS_ElemIteratorPtr elemIt = smDS->GetElements(); + // if ( !elemIt->more() ) continue; + // const SMDS_MeshElement* e = elemIt->next(); + // if ( !e || e->IsQuadratic() ) + // continue; + + // TIDSortedElemSet elems; + // elems.insert( e ); + // while ( elemIt->more() ) + // elems.insert( elems.end(), elemIt->next() ); + + // SMESH_MeshEditor( mesh ).ConvertToQuadratic( /*3d=*/false, elems, /*biQuad=*/false ); + // } + // } + + //================================================================================ + /*! + * \brief Restrict size of elements on the given edge + */ + //================================================================================ + + void setLocalSize(const TopoDS_Edge& edge, + double size, + netgen::Mesh& mesh) + { + if ( size <= std::numeric_limits::min() ) + return; + Standard_Real u1, u2; + Handle(Geom_Curve) curve = BRep_Tool::Curve(edge, u1, u2); + if ( curve.IsNull() ) + { + TopoDS_Iterator vIt( edge ); + if ( !vIt.More() ) return; + gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( vIt.Value() )); + NETGENPlugin_Mesher::RestrictLocalSize( mesh, p.XYZ(), size ); + } + else + { + const int nb = (int)( 1.5 * SMESH_Algo::EdgeLength( edge ) / size ); + Standard_Real delta = (u2-u1)/nb; + for(int i=0; iValue(u); + NETGENPlugin_Mesher::RestrictLocalSize( mesh, p.XYZ(), size ); + netgen::Point3d pi(p.X(), p.Y(), p.Z()); + double resultSize = mesh.GetH(pi); + if ( resultSize - size > 0.1*size ) + // netgen does restriction iff oldH/newH > 1.2 (localh.cpp:136) + NETGENPlugin_Mesher::RestrictLocalSize( mesh, p.XYZ(), resultSize/1.201 ); + } + } + } +} // namespace + +//================================================================================ +/*! + * \brief Set local size on shapes defined by SetParameters() + */ +//================================================================================ + +void NETGENPlugin_Mesher::SetLocalSize( netgen::OCCGeometry& occgeo, + netgen::Mesh& ngMesh ) +{ + for(std::map::const_iterator it=EdgeId2LocalSize.begin(); it!=EdgeId2LocalSize.end(); it++) + { + int key = (*it).first; + double hi = (*it).second; + const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); + setLocalSize( TopoDS::Edge(shape), hi, ngMesh ); + } + for(std::map::const_iterator it=VertexId2LocalSize.begin(); it!=VertexId2LocalSize.end(); it++) + { + int key = (*it).first; + double hi = (*it).second; + const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); + gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex(shape) ); + NETGENPlugin_Mesher::RestrictLocalSize( ngMesh, p.XYZ(), hi ); + } + for(map::const_iterator it=FaceId2LocalSize.begin(); it!=FaceId2LocalSize.end(); it++) + { + int key = (*it).first; + double val = (*it).second; + const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); + int faceNgID = occgeo.fmap.FindIndex(shape); + if ( faceNgID >= 1 ) + { + occgeo.SetFaceMaxH(faceNgID, val); + for ( TopExp_Explorer edgeExp( shape, TopAbs_EDGE ); edgeExp.More(); edgeExp.Next() ) + setLocalSize( TopoDS::Edge( edgeExp.Current() ), val, ngMesh ); + } + else if ( !ShapesWithControlPoints.count( key )) + { + SMESHUtils::createPointsSampleFromFace( TopoDS::Face( shape ), val, ControlPoints ); + ShapesWithControlPoints.insert( key ); + } + } + for(map::const_iterator it=SolidId2LocalSize.begin(); it!=SolidId2LocalSize.end(); it++) + { + int key = (*it).first; + double val = (*it).second; + if ( !ShapesWithControlPoints.count( key )) + { + const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); + SMESHUtils::createPointsSampleFromSolid( TopoDS::Solid( shape ), val, ControlPoints ); + ShapesWithControlPoints.insert( key ); + } + } + + if ( !ControlPoints.empty() ) + { + for ( size_t i = 0; i < ControlPoints.size(); ++i ) + NETGENPlugin_Mesher::RestrictLocalSize( ngMesh, ControlPoints[i].XYZ(), ControlPoints[i].Size() ); + } } //================================================================================ @@ -509,9 +703,6 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo, BRepBndLib::Add (shape, bb); double x1,y1,z1,x2,y2,z2; bb.Get (x1,y1,z1,x2,y2,z2); - MESSAGE("shape bounding box:\n" << - "(" << x1 << " " << y1 << " " << z1 << ") " << - "(" << x2 << " " << y2 << " " << z2 << ")"); netgen::Point<3> p1 = netgen::Point<3> (x1,y1,z1); netgen::Point<3> p2 = netgen::Point<3> (x2,y2,z2); occgeo.boundingbox = netgen::Box<3> (p1,p2); @@ -532,6 +723,8 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo, rootSM.push_back( mesh.GetSubMesh( it.Value() )); } + int totNbFaces = 0; + // add subshapes of empty submeshes list< SMESH_subMesh* >::iterator rootIt = rootSM.begin(), rootEnd = rootSM.end(); for ( ; rootIt != rootEnd; ++rootIt ) { @@ -543,8 +736,9 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo, TopExp::MapShapes(root->GetSubShape(), subShapes); while ( smIt->more() ) { - SMESH_subMesh* sm = smIt->next(); + SMESH_subMesh* sm = smIt->next(); TopoDS_Shape shape = sm->GetSubShape(); + totNbFaces += ( shape.ShapeType() == TopAbs_FACE ); if ( intern && intern->isShapeToPrecompute( shape )) continue; if ( !meshedSM || sm->IsEmpty() ) @@ -569,11 +763,11 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo, } } } - occgeo.facemeshstatus.SetSize (occgeo.fmap.Extent()); + occgeo.facemeshstatus.SetSize (totNbFaces); occgeo.facemeshstatus = 0; - occgeo.face_maxh_modified.SetSize(occgeo.fmap.Extent()); + occgeo.face_maxh_modified.SetSize(totNbFaces); occgeo.face_maxh_modified = 0; - occgeo.face_maxh.SetSize(occgeo.fmap.Extent()); + occgeo.face_maxh.SetSize(totNbFaces); occgeo.face_maxh = netgen::mparam.maxh; } @@ -621,7 +815,7 @@ double NETGENPlugin_Mesher::GetDefaultMinSize(const TopoDS_Shape& geom, } else { - minh = 3 * sqrt( minh ); // triangulation for visualization is rather fine + minh = sqrt( minh ); // triangulation for visualization is rather fine //cout << "TRIANGULATION minh = " < 0.5 * maxSize ) @@ -636,12 +830,24 @@ double NETGENPlugin_Mesher::GetDefaultMinSize(const TopoDS_Shape& geom, */ //================================================================================ -void NETGENPlugin_Mesher::RestrictLocalSize(netgen::Mesh& ngMesh, const gp_XYZ& p, const double size) +void NETGENPlugin_Mesher::RestrictLocalSize(netgen::Mesh& ngMesh, + const gp_XYZ& p, + double size, + const bool overrideMinH) { + if ( size <= std::numeric_limits::min() ) + return; if ( netgen::mparam.minh > size ) { - ngMesh.SetMinimalH( size ); - netgen::mparam.minh = size; + if ( overrideMinH ) + { + ngMesh.SetMinimalH( size ); + netgen::mparam.minh = size; + } + else + { + size = netgen::mparam.minh; + } } netgen::Point3d pi(p.X(), p.Y(), p.Z()); ngMesh.RestrictLocalH( pi, size ); @@ -657,10 +863,11 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, netgen::Mesh& ngMesh, vector& nodeVec, const list< SMESH_subMesh* > & meshedSM, + SMESH_MesherHelper* quadHelper, SMESH_ProxyMesh::Ptr proxyMesh) { TNode2IdMap nodeNgIdMap; - for ( int i = 1; i < nodeVec.size(); ++i ) + for ( size_t i = 1; i < nodeVec.size(); ++i ) nodeNgIdMap.insert( make_pair( nodeVec[i], i )); TopTools_MapOfShape visitedShapes; @@ -725,9 +932,11 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, bool isForwad = ( fOri == eNotSeam.Orientation() || fOri >= TopAbs_INTERNAL ); // get all nodes from connected - bool isQuad = smDS->NbElements() ? smDS->GetElements()->next()->IsQuadratic() : false; - StdMeshers_FaceSide fSide( face, edges, _mesh, isForwad, isQuad ); + const bool isQuad = smDS->IsQuadratic(); + StdMeshers_FaceSide fSide( face, edges, _mesh, isForwad, isQuad, &helper ); const vector& points = fSide.GetUVPtStruct(); + if ( points.empty() ) + return false; // invalid node params? int i, nbSeg = fSide.NbSegments(); // remember EDGEs of fSide to treat only once @@ -806,10 +1015,10 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, seg.epgeominfo[ 1 ].v = otherSeamParam; swap (seg.epgeominfo[0].u, seg.epgeominfo[1].u); } - swap (seg[0], seg[1]); - swap (seg.epgeominfo[0].dist, seg.epgeominfo[1].dist); + swap( seg[0], seg[1] ); + swap( seg.epgeominfo[0].dist, seg.epgeominfo[1].dist ); seg.edgenr = ngMesh.GetNSeg() + 1; // segment id - ngMesh.AddSegment (seg); + ngMesh.AddSegment( seg ); #ifdef DUMP_SEGMENTS cout << "Segment: " << seg.edgenr << endl << "\t is SEAM (reverse) of the previous. " @@ -819,10 +1028,10 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, } else if ( fOri == TopAbs_INTERNAL ) { - swap (seg[0], seg[1]); + swap( seg[0], seg[1] ); swap( seg.epgeominfo[0], seg.epgeominfo[1] ); seg.edgenr = ngMesh.GetNSeg() + 1; // segment id - ngMesh.AddSegment (seg); + ngMesh.AddSegment( seg ); #ifdef DUMP_SEGMENTS cout << "Segment: " << seg.edgenr << endl << "\t is REVERSE of the previous" << endl; #endif @@ -830,6 +1039,17 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, } } // loop on geomEdge ancestors + if ( quadHelper ) // remember medium nodes of sub-meshes + { + SMDS_ElemIteratorPtr edges = smDS->GetElements(); + while ( edges->more() ) + { + const SMDS_MeshElement* e = edges->next(); + if ( !quadHelper->AddTLinks( static_cast< const SMDS_MeshEdge*>( e ))) + break; + } + } + break; } // case TopAbs_EDGE @@ -841,14 +1061,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, // Find solids the geomFace bounds int solidID1 = 0, solidID2 = 0; - StdMeshers_QuadToTriaAdaptor* quadAdaptor = - dynamic_cast( proxyMesh.get() ); - if ( quadAdaptor ) { - solidID1 = occgeom.somap.FindIndex( quadAdaptor->GetShape() ); - } - else - { PShapeIteratorPtr solidIt = helper.GetAncestors( geomFace, *sm->GetFather(), TopAbs_SOLID); while ( const TopoDS_Shape * solid = solidIt->next() ) { @@ -857,20 +1070,101 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, else solidID1 = id; } } + if ( proxyMesh && proxyMesh->GetProxySubMesh( geomFace )) + { + // if a proxy sub-mesh contains temporary faces, then these faces + // should be used to mesh only one SOLID + bool hasTmp = false; + smDS = proxyMesh->GetSubMesh( geomFace ); + SMDS_ElemIteratorPtr faces = smDS->GetElements(); + while ( faces->more() ) + { + const SMDS_MeshElement* f = faces->next(); + if ( proxyMesh->IsTemporary( f )) + { + hasTmp = true; + std::vector fNodes( f->begin_nodes(), f->end_nodes() ); + std::vector vols; + if ( _mesh->GetMeshDS()->GetElementsByNodes( fNodes, vols, SMDSAbs_Volume ) == 1 ) + { + int geomID = vols[0]->getshapeId(); + const TopoDS_Shape& solid = helper.GetMeshDS()->IndexToShape( geomID ); + if ( !solid.IsNull() ) + solidID1 = occgeom.somap.FindIndex ( solid ); + solidID2 = 0; + break; + } + } + } + // exclude faces generated by NETGEN from computation of 3D mesh + const int fID = occgeom.fmap.FindIndex( geomFace ); + if ( !hasTmp ) // shrunk mesh + { + // move netgen points according to moved nodes + SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(/*includeSelf=*/true); + while ( smIt->more() ) + { + SMESH_subMesh* sub = smIt->next(); + if ( !sub->GetSubMeshDS() ) continue; + SMDS_NodeIteratorPtr nodeIt = sub->GetSubMeshDS()->GetNodes(); + while ( nodeIt->more() ) + { + const SMDS_MeshNode* n = nodeIt->next(); + int ngID = ngNodeId( n, ngMesh, nodeNgIdMap ); + netgen::MeshPoint& ngPoint = ngMesh.Point( ngID ); + ngPoint(0) = n->X(); + ngPoint(1) = n->Y(); + ngPoint(2) = n->Z(); + } + } + // remove faces near boundary to avoid their overlapping + // with shrunk faces + for ( int i = 1; i <= ngMesh.GetNSE(); ++i ) + { + const netgen::Element2d& elem = ngMesh.SurfaceElement(i); + if ( elem.GetIndex() == fID ) + { + for ( int iN = 0; iN < elem.GetNP(); ++iN ) + if ( ngMesh[ elem[ iN ]].Type() != netgen::SURFACEPOINT ) + { + ngMesh.DeleteSurfaceElement( i ); + break; + } + } + } + } + //if ( hasTmp ) + { + faceNgID++; + ngMesh.AddFaceDescriptor( netgen::FaceDescriptor( faceNgID,/*solid1=*/0,/*solid2=*/0,0 )); + for (int i = 1; i <= ngMesh.GetNSE(); ++i ) + { + const netgen::Element2d& elem = ngMesh.SurfaceElement(i); + if ( elem.GetIndex() == fID ) + const_cast< netgen::Element2d& >( elem ).SetIndex( faceNgID ); + } + } + } // Add ng face descriptors of meshed faces faceNgID++; - ngMesh.AddFaceDescriptor (netgen::FaceDescriptor(faceNgID, solidID1, solidID2, 0)); + ngMesh.AddFaceDescriptor( netgen::FaceDescriptor( faceNgID, solidID1, solidID2, 0 )); // if second oreder is required, even already meshed faces must be passed to NETGEN int fID = occgeom.fmap.Add( geomFace ); + if ( occgeom.facemeshstatus.Size() < fID ) occgeom.facemeshstatus.SetSize( fID ); + occgeom.facemeshstatus[ fID-1 ] = netgen::FACE_MESHED_OK; while ( fID < faceNgID ) // geomFace is already in occgeom.fmap, add a copy + { fID = occgeom.fmap.Add( BRepBuilderAPI_Copy( geomFace, /*copyGeom=*/false )); + if ( occgeom.facemeshstatus.Size() < fID ) occgeom.facemeshstatus.SetSize( fID ); + occgeom.facemeshstatus[ fID-1 ] = netgen::FACE_MESHED_OK; + } // Problem with the second order in a quadrangular mesh remains. - // 1) All quadrangles geberated by NETGEN are moved to an inexistent face - // by FillSMesh() (find AddFaceDescriptor) + // 1) All quadrangles generated by NETGEN are moved to an inexistent face + // by FillSMesh() (find "AddFaceDescriptor") // 2) Temporary triangles generated by StdMeshers_QuadToTriaAdaptor // are on faces where quadrangles were. - // Due to these 2 points, wrong geom faces are used while conversion to qudratic + // Due to these 2 points, wrong geom faces are used while conversion to quadratic // of the mentioned above quadrangles and triangles // Orient the face correctly in solidID1 (issue 0020206) @@ -886,15 +1180,13 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, // Add surface elements netgen::Element2d tri(3); - tri.SetIndex ( faceNgID ); - + tri.SetIndex( faceNgID ); + SMESH_TNodeXYZ xyz[3]; #ifdef DUMP_TRIANGLES cout << "SMESH face " << helper.GetMeshDS()->ShapeToIndex( geomFace ) << " internal="<GetSubMesh( geomFace ); SMDS_ElemIteratorPtr faces = smDS->GetElements(); while ( faces->more() ) @@ -906,7 +1198,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, if ( const TopoDS_Shape * solid = solidIt->next() ) sm = _mesh->GetSubMesh( *solid ); SMESH_ComputeErrorPtr& smError = sm->GetComputeError(); - smError.reset( new SMESH_ComputeError(COMPERR_BAD_INPUT_MESH,"Not triangle submesh")); + smError.reset( new SMESH_ComputeError(COMPERR_BAD_INPUT_MESH,"Not triangle sub-mesh")); smError->myBadElements.push_back( f ); return false; } @@ -914,14 +1206,17 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, for ( int i = 0; i < 3; ++i ) { const SMDS_MeshNode* node = f->GetNode( i ), * inFaceNode=0; + xyz[i].Set( node ); // get node UV on face int shapeID = node->getshapeId(); if ( helper.IsSeamShape( shapeID )) + { if ( helper.IsSeamShape( f->GetNodeWrap( i+1 )->getshapeId() )) inFaceNode = f->GetNodeWrap( i-1 ); - else + else inFaceNode = f->GetNodeWrap( i+1 ); + } gp_XY uv = helper.GetNodeUV( geomFace, node, inFaceNode ); int ind = reverse ? 3-i : i+1; @@ -930,6 +1225,13 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, tri.PNum (ind) = ngNodeId( node, ngMesh, nodeNgIdMap ); } + // pass a triangle size to NG size-map + double size = ( ( xyz[0] - xyz[1] ).Modulus() + + ( xyz[1] - xyz[2] ).Modulus() + + ( xyz[2] - xyz[0] ).Modulus() ) / 3; + gp_XYZ gc = ( xyz[0] + xyz[1] + xyz[2] ) / 3; + RestrictLocalSize( ngMesh, gc, size, /*overrideMinH=*/false ); + ngMesh.AddSurfaceElement (tri); #ifdef DUMP_TRIANGLES cout << tri << endl; @@ -940,10 +1242,22 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, swap( tri[1], tri[2] ); ngMesh.AddSurfaceElement (tri); #ifdef DUMP_TRIANGLES - cout << tri << endl; + cout << tri << endl; #endif } } + + if ( quadHelper ) // remember medium nodes of sub-meshes + { + SMDS_ElemIteratorPtr faces = smDS->GetElements(); + while ( faces->more() ) + { + const SMDS_MeshElement* f = faces->next(); + if ( !quadHelper->AddTLinks( static_cast< const SMDS_MeshFace*>( f ))) + break; + } + } + break; } // case TopAbs_FACE @@ -958,7 +1272,8 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, while ( const TopoDS_Shape* e = ansIt->next() ) { SMESH_subMesh* eSub = helper.GetMesh()->GetSubMesh( *e ); - if (( toAdd = eSub->IsEmpty() )) break; + if (( toAdd = ( eSub->IsEmpty() && !SMESH_Algo::isDegenerated( TopoDS::Edge( *e ))))) + break; } if ( toAdd ) { @@ -1005,7 +1320,7 @@ void NETGENPlugin_Mesher::FixIntFaces(const netgen::OCCGeometry& occgeom, { // duplicate faces int i, nbFaces = ngMesh.GetNSE(); - for (int i = 1; i <= nbFaces; ++i) + for ( i = 1; i <= nbFaces; ++i) { netgen::Element2d elem = ngMesh.SurfaceElement(i); if ( ngFaceIds.count( elem.GetIndex() )) @@ -1017,6 +1332,115 @@ void NETGENPlugin_Mesher::FixIntFaces(const netgen::OCCGeometry& occgeom, } } +//================================================================================ +/*! + * \brief Tries to heal the mesh on a FACE. The FACE is supposed to be partially + * meshed due to NETGEN failure + * \param [in] occgeom - geometry + * \param [in,out] ngMesh - the mesh to fix + * \param [inout] faceID - ID of the FACE to fix the mesh on + * \return bool - is mesh is or becomes OK + */ +//================================================================================ + +bool NETGENPlugin_Mesher::FixFaceMesh(const netgen::OCCGeometry& occgeom, + netgen::Mesh& ngMesh, + const int faceID) +{ + // we address a case where the FACE is almost fully meshed except small holes + // of usually triangular shape at FACE boundary (IPAL52861) + + // The case appeared to be not simple: holes only look triangular but + // indeed are a self intersecting polygon. A reason of the bug was in coincident + // NG points on a seam edge. But the code below is very nice, leave it for + // another case. + return false; + + + if ( occgeom.fmap.Extent() < faceID ) + return false; + //const TopoDS_Face& face = TopoDS::Face( occgeom.fmap( faceID )); + + // find free links on the FACE + NCollection_Map linkMap; + for ( int iF = 1; iF <= ngMesh.GetNSE(); ++iF ) + { + const netgen::Element2d& elem = ngMesh.SurfaceElement(iF); + if ( faceID != elem.GetIndex() ) + continue; + int n0 = elem[ elem.GetNP() - 1 ]; + for ( int i = 0; i < elem.GetNP(); ++i ) + { + int n1 = elem[i]; + Link link( n0, n1 ); + if ( !linkMap.Add( link )) + linkMap.Remove( link ); + n0 = n1; + } + } + // add/remove boundary links + for ( int iSeg = 1; iSeg <= ngMesh.GetNSeg(); ++iSeg ) + { + const netgen::Segment& seg = ngMesh.LineSegment( iSeg ); + if ( seg.si != faceID ) // !edgeIDs.Contains( seg.edgenr )) + continue; + Link link( seg[1], seg[0] ); // reverse!!! + if ( !linkMap.Add( link )) + linkMap.Remove( link ); + } + if ( linkMap.IsEmpty() ) + return true; + if ( linkMap.Extent() < 3 ) + return false; + + // make triangles of the links + + netgen::Element2d tri(3); + tri.SetIndex ( faceID ); + + NCollection_Map::Iterator linkIt( linkMap ); + Link link1 = linkIt.Value(); + // look for a link connected to link1 + NCollection_Map::Iterator linkIt2 = linkIt; + for ( linkIt2.Next(); linkIt2.More(); linkIt2.Next() ) + { + const Link& link2 = linkIt2.Value(); + if ( link2.IsConnected( link1 )) + { + // look for a link connected to both link1 and link2 + NCollection_Map::Iterator linkIt3 = linkIt2; + for ( linkIt3.Next(); linkIt3.More(); linkIt3.Next() ) + { + const Link& link3 = linkIt3.Value(); + if ( link3.IsConnected( link1 ) && + link3.IsConnected( link2 ) ) + { + // add a triangle + tri[0] = link1.n2; + tri[1] = link1.n1; + tri[2] = ( link2.Contains( link1.n1 ) ? link2.n1 : link3.n1 ); + if ( tri[0] == tri[2] || tri[1] == tri[2] ) + return false; + ngMesh.AddSurfaceElement( tri ); + + // prepare for the next tria search + if ( linkMap.Extent() == 3 ) + return true; + linkMap.Remove( link3 ); + linkMap.Remove( link2 ); + linkIt.Next(); + linkMap.Remove( link1 ); + link1 = linkIt.Value(); + linkIt2 = linkIt; + break; + } + } + } + } + return false; + +} // FixFaceMesh() + namespace { //================================================================================ @@ -1045,7 +1469,7 @@ namespace return dist3D; // start recursion if necessary - double dist2D = SMESH_MesherHelper::applyIn2D(surf, uv1, uv2, gp_XY_Subtracted, 0).Modulus(); + double dist2D = SMESH_MesherHelper::ApplyIn2D(surf, uv1, uv2, gp_XY_Subtracted, 0).Modulus(); if ( fabs( dist3D - dist2D ) < dist2D * 1e-10 ) return dist3D; // equal parametrization of a planar surface @@ -1079,10 +1503,15 @@ namespace int ngIdCloseN; //!< ng id of closest node of the closest 2d mesh element }; - inline double dist2(const netgen::MeshPoint& p1, const netgen::MeshPoint& p2) + inline double dist2( const netgen::MeshPoint& p1, const netgen::MeshPoint& p2 ) { return gp_Pnt( NGPOINT_COORDS(p1)).SquareDistance( gp_Pnt( NGPOINT_COORDS(p2))); } + + // inline double dist2(const netgen::MeshPoint& p, const SMDS_MeshNode* n ) + // { + // return gp_Pnt( NGPOINT_COORDS(p)).SquareDistance( SMESH_NodeXYZ(n)); + // } } //================================================================================ @@ -1099,7 +1528,7 @@ void NETGENPlugin_Mesher::AddIntVerticesInFaces(const netgen::OCCGeometry& o vector& nodeVec, NETGENPlugin_Internals& internalShapes) { - if ( nodeVec.size() < ngMesh.GetNP() ) + if ((int) nodeVec.size() < ngMesh.GetNP() ) nodeVec.resize( ngMesh.GetNP(), 0 ); SMESHDS_Mesh* meshDS = internalShapes.getMesh().GetMeshDS(); @@ -1152,7 +1581,7 @@ void NETGENPlugin_Mesher::AddIntVerticesInFaces(const netgen::OCCGeometry& o nodeVec.push_back( nV ); // get node UV - bool uvOK = false; + bool uvOK = true; vData.uv = helper.GetNodeUV( face, nV, 0, &uvOK ); if ( !uvOK ) helper.CheckNodeUV( face, nV, vData.uv, BRep_Tool::Tolerance(V),/*force=*/1); @@ -1169,14 +1598,14 @@ void NETGENPlugin_Mesher::AddIntVerticesInFaces(const netgen::OCCGeometry& o { uv[iEnd].SetCoord( seg.epgeominfo[iEnd].u, seg.epgeominfo[iEnd].v ); if ( ngIdLast == seg[ iEnd ] ) continue; - dist2 = helper.applyIn2D(surf, uv[iEnd], vData.uv, gp_XY_Subtracted,0).SquareModulus(); + dist2 = helper.ApplyIn2D(surf, uv[iEnd], vData.uv, gp_XY_Subtracted,0).SquareModulus(); if ( dist2 < closeDist2 ) vData.ngIdClose = seg[ iEnd ], vData.uvClose = uv[iEnd], closeDist2 = dist2; ngIdLast = seg[ iEnd ]; } if ( !nbV ) { - totSegLen2D += helper.applyIn2D(surf, uv[0], uv[1], gp_XY_Subtracted, false).Modulus(); + totSegLen2D += helper.ApplyIn2D(surf, uv[0], uv[1], gp_XY_Subtracted, false).Modulus(); totNbSeg++; } } @@ -1203,7 +1632,7 @@ void NETGENPlugin_Mesher::AddIntVerticesInFaces(const netgen::OCCGeometry& o for ( int iEnd = 0; iEnd < 2; ++iEnd) { uv[iEnd].SetCoord( seg.epgeominfo[iEnd].u, seg.epgeominfo[iEnd].v ); - dist2 = helper.applyIn2D(surf, uv[iEnd], vData.uv, gp_XY_Subtracted,0).SquareModulus(); + dist2 = helper.ApplyIn2D(surf, uv[iEnd], vData.uv, gp_XY_Subtracted,0).SquareModulus(); if ( dist2 < closeDist2 ) vData.ngIdClose = seg[ iEnd ], vData.uvClose = uv[iEnd], closeDist2 = dist2; } @@ -1226,7 +1655,7 @@ void NETGENPlugin_Mesher::AddIntVerticesInFaces(const netgen::OCCGeometry& o // how far from V double r = min( 0.5, ( hintLenOK ? segLenHint/nodeDist3D : avgSegLen2d/nodeDist2D )); // direction from V to closet node in 2D - gp_Dir2d v2n( helper.applyIn2D(surf, uvP, uvV, gp_XY_Subtracted, false )); + gp_Dir2d v2n( helper.ApplyIn2D(surf, uvP, uvV, gp_XY_Subtracted, false )); // new point uvP = vData.uv + r * nodeDist2D * v2n.XY(); gp_Pnt P = surf->Value( uvP.X(), uvP.Y() ).Transformed( loc ); @@ -1262,7 +1691,7 @@ void NETGENPlugin_Mesher::AddIntVerticesInFaces(const netgen::OCCGeometry& o ngMesh.AddSegment (seg); // add reverse segment - swap (seg[0], seg[1]); + swap( seg[0], seg[1] ); swap( seg.epgeominfo[0], seg.epgeominfo[1] ); seg.edgenr = ngMesh.GetNSeg() + 1; // segment id ngMesh.AddSegment (seg); @@ -1290,10 +1719,10 @@ void NETGENPlugin_Mesher::AddIntVerticesInSolids(const netgen::OCCGeometry& ofstream py(DUMP_TRIANGLES_SCRIPT); py << "import SMESH"<< endl << "from salome.smesh import smeshBuilder"< & nodeVec) + vector< const SMDS_MeshNode* > & nodeVec, + const bool overrideMinH) { // ---------------------------- // Check wires and count nodes // ---------------------------- int nbNodes = 0; - for ( int iW = 0; iW < wires.size(); ++iW ) + for ( size_t iW = 0; iW < wires.size(); ++iW ) { StdMeshers_FaceSidePtr wire = wires[ iW ]; if ( wire->MissVertexNode() ) @@ -1533,7 +1963,7 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, // (new SMESH_ComputeError(COMPERR_BAD_INPUT_MESH, "Missing nodes on vertices")); } const vector& uvPtVec = wire->GetUVPtStruct(); - if ( uvPtVec.size() != wire->NbPoints() ) + if ((int) uvPtVec.size() != wire->NbPoints() ) return SMESH_ComputeError::New(COMPERR_BAD_INPUT_MESH, SMESH_Comment("Unexpected nb of points on wire ") << iW << ": " << uvPtVec.size()<<" != "<NbPoints()); @@ -1556,7 +1986,7 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, if ( !wasNgMeshEmpty ) // fill node2ngID with nodes built by NETGEN { set< int > subIDs; // ids of sub-shapes of the FACE - for ( int iW = 0; iW < wires.size(); ++iW ) + for ( size_t iW = 0; iW < wires.size(); ++iW ) { StdMeshers_FaceSidePtr wire = wires[ iW ]; for ( int iE = 0, nbE = wire->NbEdges(); iE < nbE; ++iE ) @@ -1572,13 +2002,13 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, const int solidID = 0, faceID = geom.fmap.FindIndex( helper.GetSubShape() ); if ( ngMesh.GetNFD() < 1 ) - ngMesh.AddFaceDescriptor (netgen::FaceDescriptor(faceID, solidID, solidID, 0)); + ngMesh.AddFaceDescriptor( netgen::FaceDescriptor( faceID, solidID, solidID, 0 )); - for ( int iW = 0; iW < wires.size(); ++iW ) + for ( size_t iW = 0; iW < wires.size(); ++iW ) { - StdMeshers_FaceSidePtr wire = wires[ iW ]; + StdMeshers_FaceSidePtr wire = wires[ iW ]; const vector& uvPtVec = wire->GetUVPtStruct(); - const int nbSegments = wire->NbPoints() - 1; + const int nbSegments = wire->NbPoints() - 1; // assure the 1st node to be in node2ngID, which is needed to correctly // "close chain of segments" (see below) in case if the 1st node is not @@ -1609,7 +2039,7 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, continue; int ngID1 = ngMesh.GetNP() + 1, ngID2 = ngID1+1; - if ( onVertex || ( !wasNgMeshEmpty && onEdge )) + if ( onVertex || ( !wasNgMeshEmpty && onEdge ) || helper.IsRealSeam( posShapeID )) ngID1 = node2ngID.insert( make_pair( n, ngID1 )).first->second; if ( ngID1 > ngMesh.GetNP() ) { @@ -1672,12 +2102,12 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, // element size (regression on issue 0020452, note 0010898) int iPrev = SMESH_MesherHelper::WrapIndex( i-1, nbSegments ); int iNext = SMESH_MesherHelper::WrapIndex( i+1, nbSegments ); - double sunH = segLen[ iPrev ] + segLen[ i ] + segLen[ iNext ]; - int nbSeg = ( int( segLen[ iPrev ] > sunH / 100.) + - int( segLen[ i ] > sunH / 100.) + - int( segLen[ iNext ] > sunH / 100.)); + double sumH = segLen[ iPrev ] + segLen[ i ] + segLen[ iNext ]; + int nbSeg = ( int( segLen[ iPrev ] > sumH / 100.) + + int( segLen[ i ] > sumH / 100.) + + int( segLen[ iNext ] > sumH / 100.)); if ( nbSeg > 0 ) - RestrictLocalSize( ngMesh, 0.5*(np1+np2), sunH / nbSeg ); + RestrictLocalSize( ngMesh, 0.5*(np1+np2), sumH / nbSeg, overrideMinH ); } if ( isInternalWire ) { @@ -1691,7 +2121,7 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, // close chain of segments if ( nbSegments > 0 ) { - netgen::Segment& lastSeg = ngMesh.LineSegment( ngMesh.GetNSeg() - int( isInternalWire)); + netgen::Segment& lastSeg = ngMesh.LineSegment( ngMesh.GetNSeg() - int( isInternalWire )); const SMDS_MeshNode * lastNode = uvPtVec.back().node; lastSeg[1] = node2ngID.insert( make_pair( lastNode, lastSeg[1] )).first->second; if ( lastSeg[1] > ngMesh.GetNP() ) @@ -1721,8 +2151,8 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, } } cout << "Segment: " << seg.edgenr << endl - << "\tp1: " << seg[0] << endl - << "\tp2: " << seg[1] << 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 @@ -1731,6 +2161,8 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, << "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << endl; } cout << "--END WIRE " << iW << endl; +#else + SMESH_Comment __not_unused_variable( prevNbNGSeg ); #endif } // loop on WIREs of a FACE @@ -1754,6 +2186,8 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, * \param initState - bn of entities in netgen mesh before computing * \param sMesh - SMESH mesh to fill in * \param nodeVec - vector of nodes in which node index == netgen ID + * \param comment - returns problem description + * \param quadHelper - holder of medium nodes of sub-meshes * \retval int - error */ //================================================================================ @@ -1763,7 +2197,8 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, const NETGENPlugin_ngMeshInfo& initState, SMESH_Mesh& sMesh, std::vector& nodeVec, - SMESH_Comment& comment) + SMESH_Comment& comment, + SMESH_MesherHelper* quadHelper) { int nbNod = ngMesh.GetNP(); int nbSeg = ngMesh.GetNSeg(); @@ -1772,13 +2207,42 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, SMESHDS_Mesh* meshDS = sMesh.GetMeshDS(); + // quadHelper is used for either + // 1) making quadratic elements when a lower dimention mesh is loaded + // to SMESH before convertion to quadratic by NETGEN + // 2) sewing of quadratic elements with quadratic elements of sub-meshes + if ( quadHelper && !quadHelper->GetIsQuadratic() && quadHelper->GetTLinkNodeMap().empty() ) + quadHelper = 0; + + int i, nbInitNod = initState._nbNodes; + if ( initState._elementsRemoved ) + { + // PAL23427. Update nodeVec to track removal of netgen free points as a result + // of removal of faces in FillNgMesh() in the case of a shrunk sub-mesh + int ngID, nodeVecSize = nodeVec.size(); + const double eps = std::numeric_limits::min(); + for ( ngID = i = 1; i < nodeVecSize; ++ngID, ++i ) + { + gp_Pnt ngPnt( NGPOINT_COORDS( ngMesh.Point( ngID ))); + gp_Pnt node ( SMESH_NodeXYZ ( nodeVec[ i ])); + if ( ngPnt.SquareDistance( node ) < eps ) + { + nodeVec[ ngID ] = nodeVec[ i ]; + } + else + { + --ngID; + } + } + nodeVec.resize( ngID ); + nbInitNod = ngID - 1; + } // ------------------------------------- // Create and insert nodes into nodeVec // ------------------------------------- nodeVec.resize( nbNod + 1 ); - int i, nbInitNod = initState._nbNodes; - for (i = nbInitNod+1; i <= nbNod; ++i ) + for ( i = nbInitNod+1; i <= nbNod; ++i ) { const netgen::MeshPoint& ngPoint = ngMesh.Point(i); SMDS_MeshNode* node = NULL; @@ -1791,7 +2255,7 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, gp_Pnt p ( NGPOINT_COORDS(ngPoint) ); for (int iV = i-nbInitNod; aVert.IsNull() && iV <= occgeo.vmap.Extent(); ++iV) { - aVert = TopoDS::Vertex( occgeo.vmap( iV ) ); + aVert = TopoDS::Vertex( occgeo.vmap( iV )); gp_Pnt pV = BRep_Tool::Pnt( aVert ); if ( p.SquareDistance( pV ) > 1e-20 ) aVert.Nullify(); @@ -1854,7 +2318,10 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, { if ( meshDS->FindEdge( nodeVec_ACCESS(pinds[0]), nodeVec_ACCESS(pinds[1]))) continue; - edge = meshDS->AddEdge(nodeVec_ACCESS(pinds[0]), nodeVec_ACCESS(pinds[1])); + if ( quadHelper ) // final mesh must be quadratic + edge = quadHelper->AddEdge(nodeVec_ACCESS(pinds[0]), nodeVec_ACCESS(pinds[1])); + else + edge = meshDS->AddEdge(nodeVec_ACCESS(pinds[0]), nodeVec_ACCESS(pinds[1])); } else { @@ -1891,22 +2358,23 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, // from computation of 3D mesh ngMesh.AddFaceDescriptor (netgen::FaceDescriptor(quadFaceID, /*solid1=*/0, /*solid2=*/0, 0)); + vector nodes; for (i = nbInitFac+1; i <= nbFac; ++i ) { const netgen::Element2d& elem = ngMesh.SurfaceElement(i); - int aGeomFaceInd = elem.GetIndex(); + const int aGeomFaceInd = elem.GetIndex(); TopoDS_Face aFace; if (aGeomFaceInd > 0 && aGeomFaceInd <= occgeo.fmap.Extent()) aFace = TopoDS::Face(occgeo.fmap(aGeomFaceInd)); - vector nodes; - for (int j=1; j <= elem.GetNP(); ++j) + nodes.clear(); + for ( int j = 1; j <= elem.GetNP(); ++j ) { int pind = elem.PNum(j); - if ( pind < 1 || pind >= nodeVec.size() ) + if ( pind < 1 || pind >= (int) nodeVec.size() ) break; if ( SMDS_MeshNode* node = nodeVec_ACCESS(pind)) { - nodes.push_back(node); + nodes.push_back( node ); if (!aFace.IsNull() && node->getshapeId() < 1) { const netgen::PointGeomInfo& pgi = elem.GeomInfoPi(j); @@ -1914,7 +2382,7 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, } } } - if ( nodes.size() != elem.GetNP() ) + if ((int) nodes.size() != elem.GetNP() ) { if ( comment.empty() ) comment << "Invalid netgen 2d element #" << i; @@ -1924,17 +2392,30 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, switch (elem.GetType()) { case netgen::TRIG: - face = meshDS->AddFace(nodes[0],nodes[1],nodes[2]); + if ( quadHelper ) // final mesh must be quadratic + face = quadHelper->AddFace(nodes[0],nodes[1],nodes[2]); + else + face = meshDS->AddFace(nodes[0],nodes[1],nodes[2]); break; case netgen::QUAD: - face = meshDS->AddFace(nodes[0],nodes[1],nodes[2],nodes[3]); + if ( quadHelper ) // final mesh must be quadratic + face = quadHelper->AddFace(nodes[0],nodes[1],nodes[2],nodes[3]); + else + face = meshDS->AddFace(nodes[0],nodes[1],nodes[2],nodes[3]); // exclude qudrangle elements from computation of 3D mesh const_cast< netgen::Element2d& >( elem ).SetIndex( quadFaceID ); break; case netgen::TRIG6: + nodes[5] = mediumNode( nodes[0],nodes[1],nodes[5], quadHelper ); + nodes[3] = mediumNode( nodes[1],nodes[2],nodes[3], quadHelper ); + nodes[4] = mediumNode( nodes[2],nodes[0],nodes[4], quadHelper ); face = meshDS->AddFace(nodes[0],nodes[1],nodes[2],nodes[5],nodes[3],nodes[4]); break; case netgen::QUAD8: + nodes[4] = mediumNode( nodes[0],nodes[1],nodes[4], quadHelper ); + nodes[7] = mediumNode( nodes[1],nodes[2],nodes[7], quadHelper ); + nodes[5] = mediumNode( nodes[2],nodes[3],nodes[5], quadHelper ); + nodes[6] = mediumNode( nodes[3],nodes[0],nodes[6], quadHelper ); face = meshDS->AddFace(nodes[0],nodes[1],nodes[2],nodes[3], nodes[4],nodes[7],nodes[5],nodes[6]); // exclude qudrangle elements from computation of 3D mesh @@ -1944,33 +2425,33 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, MESSAGE("NETGEN created a face of unexpected type, ignoring"); continue; } - if (!face) + if ( !face ) { if ( comment.empty() ) comment << "Cannot create a mesh face"; MESSAGE("Cannot create a mesh face"); nbSeg = nbFac = nbVol = 0; break; } - if (!aFace.IsNull()) - meshDS->SetMeshElementOnShape(face, aFace); + if ( !aFace.IsNull() ) + meshDS->SetMeshElementOnShape( face, aFace ); } // ------------------ // Create tetrahedra // ------------------ - for (i = 1; i <= nbVol; ++i) + for ( i = 1; i <= nbVol; ++i ) { const netgen::Element& elem = ngMesh.VolumeElement(i); int aSolidInd = elem.GetIndex(); TopoDS_Solid aSolid; - if (aSolidInd > 0 && aSolidInd <= occgeo.somap.Extent()) + if ( aSolidInd > 0 && aSolidInd <= occgeo.somap.Extent() ) aSolid = TopoDS::Solid(occgeo.somap(aSolidInd)); - vector nodes; - for (int j=1; j <= elem.GetNP(); ++j) + nodes.clear(); + for ( int j = 1; j <= elem.GetNP(); ++j ) { int pind = elem.PNum(j); - if ( pind < 1 || pind >= nodeVec.size() ) + if ( pind < 1 || pind >= (int)nodeVec.size() ) break; if ( SMDS_MeshNode* node = nodeVec_ACCESS(pind) ) { @@ -1979,19 +2460,25 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, meshDS->SetNodeInVolume(node, aSolid); } } - if ( nodes.size() != elem.GetNP() ) + if ((int) nodes.size() != elem.GetNP() ) { if ( comment.empty() ) comment << "Invalid netgen 3d element #" << i; continue; } SMDS_MeshVolume* vol = NULL; - switch (elem.GetType()) + switch ( elem.GetType() ) { case netgen::TET: vol = meshDS->AddVolume(nodes[0],nodes[1],nodes[2],nodes[3]); break; case netgen::TET10: + nodes[4] = mediumNode( nodes[0],nodes[1],nodes[4], quadHelper ); + nodes[7] = mediumNode( nodes[1],nodes[2],nodes[7], quadHelper ); + nodes[5] = mediumNode( nodes[2],nodes[0],nodes[5], quadHelper ); + nodes[6] = mediumNode( nodes[0],nodes[3],nodes[6], quadHelper ); + nodes[8] = mediumNode( nodes[1],nodes[3],nodes[8], quadHelper ); + nodes[9] = mediumNode( nodes[2],nodes[3],nodes[9], quadHelper ); vol = meshDS->AddVolume(nodes[0],nodes[1],nodes[2],nodes[3], nodes[4],nodes[7],nodes[5],nodes[6],nodes[8],nodes[9]); break; @@ -2014,43 +2501,6 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, namespace { - //================================================================================ - /*! - * \brief Restrict size of elements on the given edge - */ - //================================================================================ - - void setLocalSize(const TopoDS_Edge& edge, - double size, - netgen::Mesh& mesh) - { - const int nb = 1000; - Standard_Real u1, u2; - Handle(Geom_Curve) curve = BRep_Tool::Curve(edge, u1, u2); - if ( curve.IsNull() ) - { - TopoDS_Iterator vIt( edge ); - if ( !vIt.More() ) return; - gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( vIt.Value() )); - NETGENPlugin_Mesher::RestrictLocalSize( mesh, p.XYZ(), size ); - } - else - { - Standard_Real delta = (u2-u1)/nb; - for(int i=0; iValue(u); - NETGENPlugin_Mesher::RestrictLocalSize( mesh, p.XYZ(), size ); - netgen::Point3d pi(p.X(), p.Y(), p.Z()); - double resultSize = mesh.GetH(pi); - if ( resultSize - size > 0.1*size ) - // netgen does restriction iff oldH/newH > 1.2 (localh.cpp:136) - NETGENPlugin_Mesher::RestrictLocalSize( mesh, p.XYZ(), resultSize/1.201 ); - } - } - } - //================================================================================ /*! * \brief Convert error into text @@ -2095,6 +2545,40 @@ namespace return str; } + //================================================================================ + /*! + * \brief Looks for triangles lying on a SOLID + */ + //================================================================================ + + bool hasBadElemOnSolid( const list& elems, + SMESH_subMesh* solidSM ) + { + TopTools_IndexedMapOfShape solidSubs; + TopExp::MapShapes( solidSM->GetSubShape(), solidSubs ); + SMESHDS_Mesh* mesh = solidSM->GetFather()->GetMeshDS(); + + list::const_iterator e = elems.begin(); + for ( ; e != elems.end(); ++e ) + { + const SMDS_MeshElement* elem = *e; + // if ( elem->GetType() != SMDSAbs_Face ) -- 23047 + // continue; + int nbNodesOnSolid = 0, nbNodes = elem->NbNodes(); + SMDS_NodeIteratorPtr nIt = elem->nodeIterator(); + while ( nIt->more() ) + { + const SMDS_MeshNode* n = nIt->next(); + const TopoDS_Shape& s = mesh->IndexToShape( n->getshapeId() ); + nbNodesOnSolid += ( !s.IsNull() && solidSubs.Contains( s )); + if ( nbNodesOnSolid > 2 || + nbNodesOnSolid == nbNodes) + return true; + } + } + return false; + } + const double edgeMeshingTime = 0.001; const double faceMeshingTime = 0.019; const double edgeFaceMeshingTime = edgeMeshingTime + faceMeshingTime; @@ -2114,21 +2598,11 @@ bool NETGENPlugin_Mesher::Compute() NETGENPlugin_NetgenLibWrapper ngLib; netgen::MeshingParameters& mparams = netgen::mparam; - MESSAGE("Compute with:\n" - " max size = " << mparams.maxh << "\n" - " segments per edge = " << mparams.segmentsperedge); - MESSAGE("\n" - " growth rate = " << mparams.grading << "\n" - " elements per radius = " << mparams.curvaturesafety << "\n" - " second order = " << mparams.secondorder << "\n" - " quad allowed = " << mparams.quad << "\n" - " surface curvature = " << mparams.uselocalh << "\n" - " fuse edges = " << netgen::merge_solids); SMESH_ComputeErrorPtr error = SMESH_ComputeError::New(); + SMESH_MesherHelper quadHelper( *_mesh ); + quadHelper.SetIsQuadratic( mparams.secondorder ); - static string debugFile = "/tmp/ngMesh.py"; /* to call toPython( ngMesh, debugFile ) - while debugging netgen */ // ------------------------- // Prepare OCC geometry // ------------------------- @@ -2211,6 +2685,12 @@ bool NETGENPlugin_Mesher::Compute() { comment << text(ex); } + catch (netgen::NgException & ex) + { + comment << text(ex); + if ( mparams.meshsizefilename ) + throw SMESH_ComputeError(COMPERR_BAD_PARMETERS, comment ); + } err = 0; //- MESHCONST_ANALYSE isn't so important step if ( !_ngMesh ) return false; @@ -2218,6 +2698,9 @@ bool NETGENPlugin_Mesher::Compute() _ngMesh->ClearFaceDescriptors(); // we make descriptors our-self + if ( !mparams.uselocalh ) // mparams.grading is not taken into account yet + _ngMesh->LocalHFunction().SetGrading( mparams.grading ); + if ( _simpleHyp ) { // Pass 1D simple parameters to NETGEN @@ -2234,36 +2717,8 @@ bool NETGENPlugin_Mesher::Compute() } else // if ( ! _simpleHyp ) { - // Local size on vertices and edges - // -------------------------------- - for(std::map::const_iterator it=EdgeId2LocalSize.begin(); it!=EdgeId2LocalSize.end(); it++) - { - int key = (*it).first; - double hi = (*it).second; - const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); - const TopoDS_Edge& e = TopoDS::Edge(shape); - setLocalSize( e, hi, *_ngMesh ); - } - for(std::map::const_iterator it=VertexId2LocalSize.begin(); it!=VertexId2LocalSize.end(); it++) - { - int key = (*it).first; - double hi = (*it).second; - const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); - const TopoDS_Vertex& v = TopoDS::Vertex(shape); - gp_Pnt p = BRep_Tool::Pnt(v); - NETGENPlugin_Mesher::RestrictLocalSize( *_ngMesh, p.XYZ(), hi ); - } - for(map::const_iterator it=FaceId2LocalSize.begin(); - it!=FaceId2LocalSize.end(); it++) - { - int key = (*it).first; - double val = (*it).second; - const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); - int faceNgID = occgeo.fmap.FindIndex(shape); - occgeo.SetFaceMaxH(faceNgID, val); - for ( TopExp_Explorer edgeExp( shape, TopAbs_EDGE ); edgeExp.More(); edgeExp.Next() ) - setLocalSize( TopoDS::Edge( edgeExp.Current() ), val, *_ngMesh ); - } + // Local size on shapes + SetLocalSize( occgeo, *_ngMesh ); } // Precompute internal edges (issue 0020676) in order to @@ -2324,7 +2779,7 @@ bool NETGENPlugin_Mesher::Compute() if ( !err ) { err = ! ( FillNgMesh(occgeo, *_ngMesh, nodeVec, meshedSM[ MeshDim_0D ]) && - FillNgMesh(occgeo, *_ngMesh, nodeVec, meshedSM[ MeshDim_1D ])); + FillNgMesh(occgeo, *_ngMesh, nodeVec, meshedSM[ MeshDim_1D ], &quadHelper)); } initState = NETGENPlugin_ngMeshInfo(_ngMesh); @@ -2406,7 +2861,8 @@ bool NETGENPlugin_Mesher::Compute() } // Build viscous layers - if ( _isViscousLayers2D ) + if ( _isViscousLayers2D || + StdMeshers_ViscousLayers2D::HasProxyMesh( TopoDS::Face( occgeo.fmap(1) ), *_mesh )) { if ( !internals.hasInternalVertexInFace() ) { FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment ); @@ -2420,6 +2876,8 @@ bool NETGENPlugin_Mesher::Compute() viscousMesh = StdMeshers_ViscousLayers2D::Compute( *_mesh, F ); if ( !viscousMesh ) return false; + if ( viscousMesh->NbProxySubMeshes() == 0 ) + continue; // exclude from computation ng segments built on EDGEs of F for (int i = 1; i <= _ngMesh->GetNSeg(); i++) { @@ -2431,7 +2889,7 @@ bool NETGENPlugin_Mesher::Compute() helper.SetSubShape( F ); TSideVector wires = StdMeshers_FaceSide::GetFaceWires( F, *_mesh, /*skipMediumNodes=*/true, - error, viscousMesh ); + error, &helper, viscousMesh ); error = AddSegmentsToMesh( *_ngMesh, occgeo, wires, helper, nodeVec ); if ( !error ) error = SMESH_ComputeError::New(); @@ -2475,37 +2933,58 @@ bool NETGENPlugin_Mesher::Compute() // generate volume mesh // --------------------- // Fill _ngMesh with nodes and faces of computed 2D submeshes - if ( !err && _isVolume && ( !meshedSM[ MeshDim_2D ].empty() || mparams.quad )) + if ( !err && _isVolume && + ( !meshedSM[ MeshDim_2D ].empty() || mparams.quad || _viscousLayersHyp )) { // load SMESH with computed segments and faces - FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment ); + FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment, &quadHelper ); + // compute prismatic boundary volumes + int nbQuad = _mesh->NbQuadrangles(); + SMESH_ProxyMesh::Ptr viscousMesh; + if ( _viscousLayersHyp ) + { + viscousMesh = _viscousLayersHyp->Compute( *_mesh, _shape ); + if ( !viscousMesh ) + return false; + } // compute pyramids on quadrangles - SMESH_ProxyMesh::Ptr proxyMesh; - if ( _mesh->NbQuadrangles() > 0 ) + vector pyramidMeshes( occgeo.somap.Extent() ); + if ( nbQuad > 0 ) for ( int iS = 1; iS <= occgeo.somap.Extent(); ++iS ) { - StdMeshers_QuadToTriaAdaptor* Adaptor = new StdMeshers_QuadToTriaAdaptor; - proxyMesh.reset( Adaptor ); - - int nbPyrams = _mesh->NbPyramids(); - Adaptor->Compute( *_mesh, occgeo.somap(iS) ); - if ( nbPyrams != _mesh->NbPyramids() ) + StdMeshers_QuadToTriaAdaptor* adaptor = new StdMeshers_QuadToTriaAdaptor; + pyramidMeshes[ iS-1 ].reset( adaptor ); + bool ok = adaptor->Compute( *_mesh, occgeo.somap(iS), viscousMesh.get() ); + if ( !ok ) + return false; + } + // add proxy faces to NG mesh + list< SMESH_subMesh* > viscousSM; + for ( int iS = 1; iS <= occgeo.somap.Extent(); ++iS ) + { + list< SMESH_subMesh* > quadFaceSM; + for (TopExp_Explorer face(occgeo.somap(iS), TopAbs_FACE); face.More(); face.Next()) + if ( pyramidMeshes[iS-1] && pyramidMeshes[iS-1]->GetProxySubMesh( face.Current() )) { - list< SMESH_subMesh* > quadFaceSM; - for (TopExp_Explorer face(occgeo.somap(iS), TopAbs_FACE); face.More(); face.Next()) - if ( Adaptor->GetProxySubMesh( face.Current() )) - { - quadFaceSM.push_back( _mesh->GetSubMesh( face.Current() )); - meshedSM[ MeshDim_2D ].remove( quadFaceSM.back() ); - } - FillNgMesh(occgeo, *_ngMesh, nodeVec, quadFaceSM, proxyMesh); + quadFaceSM.push_back( _mesh->GetSubMesh( face.Current() )); + meshedSM[ MeshDim_2D ].remove( quadFaceSM.back() ); } - } + else if ( viscousMesh && viscousMesh->GetProxySubMesh( face.Current() )) + { + viscousSM.push_back( _mesh->GetSubMesh( face.Current() )); + meshedSM[ MeshDim_2D ].remove( viscousSM.back() ); + } + if ( !quadFaceSM.empty() ) + FillNgMesh(occgeo, *_ngMesh, nodeVec, quadFaceSM, &quadHelper, pyramidMeshes[iS-1]); + } + if ( !viscousSM.empty() ) + FillNgMesh(occgeo, *_ngMesh, nodeVec, viscousSM, &quadHelper, viscousMesh ); + // fill _ngMesh with faces of sub-meshes - err = ! ( FillNgMesh(occgeo, *_ngMesh, nodeVec, meshedSM[ MeshDim_2D ])); - initState = NETGENPlugin_ngMeshInfo(_ngMesh); - //toPython( _ngMesh, "/tmp/ngPython.py"); + err = ! ( FillNgMesh(occgeo, *_ngMesh, nodeVec, meshedSM[ MeshDim_2D ], &quadHelper)); + initState = NETGENPlugin_ngMeshInfo(_ngMesh, /*checkRemovedElems=*/true); + // toPython( _ngMesh ); } if (!err && _isVolume) { @@ -2535,7 +3014,7 @@ bool NETGENPlugin_Mesher::Compute() { // store computed faces in SMESH in order not to create SMESH // faces for ng faces added here - FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment ); + FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment, &quadHelper ); // add ng faces to solids with internal vertices AddIntVerticesInSolids( occgeo, *_ngMesh, nodeVec, internals ); // duplicate mesh faces on internal faces @@ -2607,8 +3086,26 @@ bool NETGENPlugin_Mesher::Compute() try { OCC_CATCH_SIGNALS; + if ( !meshedSM[ MeshDim_1D ].empty() ) + { + // remove segments not attached to geometry (IPAL0052479) + for (int i = 1; i <= _ngMesh->GetNSeg(); ++i) + { + const netgen::Segment & seg = _ngMesh->LineSegment (i); + if ( seg.epgeominfo[ 0 ].edgenr == 0 ) + _ngMesh->DeleteSegment( i ); + } + _ngMesh->Compress(); + } + // convert to quadratic netgen::OCCRefinementSurfaces ref (occgeo); ref.MakeSecondOrder (*_ngMesh); + + // care of elements already loaded to SMESH + // if ( initState._nbSegments > 0 ) + // makeQuadratic( occgeo.emap, _mesh ); + // if ( initState._nbFaces > 0 ) + // makeQuadratic( occgeo.fmap, _mesh ); } catch (Standard_Failure& ex) { @@ -2625,26 +3122,29 @@ bool NETGENPlugin_Mesher::Compute() _ticTime = 0.98 / _progressTic; - int nbNod = _ngMesh->GetNP(); - int nbSeg = _ngMesh->GetNSeg(); + //int nbNod = _ngMesh->GetNP(); + //int nbSeg = _ngMesh->GetNSeg(); int nbFac = _ngMesh->GetNSE(); int nbVol = _ngMesh->GetNE(); bool isOK = ( !err && (_isVolume ? (nbVol > 0) : (nbFac > 0)) ); - MESSAGE((err ? "Mesh Generation failure" : "End of Mesh Generation") << - ", nb nodes: " << nbNod << - ", nb segments: " << nbSeg << - ", nb faces: " << nbFac << - ", nb volumes: " << nbVol); - // Feed back the SMESHDS with the generated Nodes and Elements if ( true /*isOK*/ ) // get whatever built - FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment ); //!< + { + FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment, &quadHelper ); + if ( quadHelper.GetIsQuadratic() ) // remove free nodes + for ( size_t i = 0; i < nodeVec.size(); ++i ) + if ( nodeVec[i] && nodeVec[i]->NbInverseElements() == 0 ) + _mesh->GetMeshDS()->RemoveFreeNode( nodeVec[i], 0, /*fromGroups=*/false ); + } SMESH_ComputeErrorPtr readErr = ReadErrors(nodeVec); if ( readErr && !readErr->myBadElements.empty() ) + { error = readErr; - + if ( !comment.empty() && !readErr->myComment.empty() ) comment += "\n"; + comment += readErr->myComment; + } if ( error->IsOK() && ( !isOK || comment.size() > 0 )) error->myName = COMPERR_ALGO_FAILED; if ( !comment.empty() ) @@ -2668,11 +3168,11 @@ bool NETGENPlugin_Mesher::Compute() bool pb2D = false, pb3D = false; for (int i = 1; i <= occgeo.fmap.Extent(); i++) { int status = occgeo.facemeshstatus[i-1]; - if (status == 1 ) continue; + if (status == netgen::FACE_MESHED_OK ) continue; if ( SMESH_subMesh* sm = _mesh->GetSubMeshContaining( occgeo.fmap( i ))) { SMESH_ComputeErrorPtr& smError = sm->GetComputeError(); if ( !smError || smError->IsOK() ) { - if ( status == -1 ) + if ( status == netgen::FACE_FAILED ) smError.reset( new SMESH_ComputeError( *error )); else smError.reset( new SMESH_ComputeError( COMPERR_ALGO_FAILED, "Ignored" )); @@ -2698,7 +3198,14 @@ bool NETGENPlugin_Mesher::Compute() { smError.reset( new SMESH_ComputeError( *error )); if ( nbVol && SMESH_Algo::GetMeshError( sm ) == SMESH_Algo::MEr_OK ) + { smError->myName = COMPERR_WARNING; + } + else if ( !smError->myBadElements.empty() ) // bad surface mesh + { + if ( !hasBadElemOnSolid( smError->myBadElements, sm )) + smError.reset(); + } } pb3D = pb3D || ( smError && smError->IsKO() ); } @@ -2794,36 +3301,8 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) } else // if ( ! _simpleHyp ) { - // Local size on vertices and edges - // -------------------------------- - for(std::map::const_iterator it=EdgeId2LocalSize.begin(); it!=EdgeId2LocalSize.end(); it++) - { - int key = (*it).first; - double hi = (*it).second; - const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); - const TopoDS_Edge& e = TopoDS::Edge(shape); - setLocalSize( e, hi, *ngMesh ); - } - for(std::map::const_iterator it=VertexId2LocalSize.begin(); it!=VertexId2LocalSize.end(); it++) - { - int key = (*it).first; - double hi = (*it).second; - const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); - const TopoDS_Vertex& v = TopoDS::Vertex(shape); - gp_Pnt p = BRep_Tool::Pnt(v); - NETGENPlugin_Mesher::RestrictLocalSize( *ngMesh, p.XYZ(), hi ); - } - for(map::const_iterator it=FaceId2LocalSize.begin(); - it!=FaceId2LocalSize.end(); it++) - { - int key = (*it).first; - double val = (*it).second; - const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); - int faceNgID = occgeo.fmap.FindIndex(shape); - occgeo.SetFaceMaxH(faceNgID, val); - for ( TopExp_Explorer edgeExp( shape, TopAbs_EDGE ); edgeExp.More(); edgeExp.Next() ) - setLocalSize( TopoDS::Edge( edgeExp.Current() ), val, *ngMesh ); - } + // Local size on shapes + SetLocalSize( occgeo, *ngMesh ); } // calculate total nb of segments and length of edges double fullLen = 0.0; @@ -3024,10 +3503,19 @@ double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder, // << " " << doneTime / _totalTime / _progressTic << endl; } } + if ( _ticTime > 0 ) progress = Max( *algoProgressTic * _ticTime, *algoProgress ); + if ( progress > 0 ) { + if ( _isVolume && + netgen::multithread.task[0] == 'D'/*elaunay meshing*/ && + progress > voluMeshingTime ) + { + progress = voluMeshingTime; + ((double&) _ticTime) = voluMeshingTime / _totalTime / _progressTic; + } ((int&) *algoProgressTic )++; ((double&) *algoProgress) = progress; } @@ -3036,26 +3524,6 @@ double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder, return Min( progress, 0.99 ); } -//================================================================================ -/*! - * \brief Remove "test.out" and "problemfaces" files in current directory - */ -//================================================================================ - -void NETGENPlugin_Mesher::RemoveTmpFiles() -{ - bool rm = SMESH_File("test.out").remove() ; -#ifndef WIN32 - if (rm && netgen::testout) - { - delete netgen::testout; - netgen::testout = 0; - } -#endif - SMESH_File("problemfaces").remove(); - SMESH_File("occmesh.rep").remove(); -} - //================================================================================ /*! * \brief Read mesh entities preventing successful computation from "test.out" file @@ -3069,14 +3537,17 @@ NETGENPlugin_Mesher::ReadErrors(const vector& nodeVec) (COMPERR_BAD_INPUT_MESH, "Some edges multiple times in surface mesh"); SMESH_File file("test.out"); vector two(2); + vector three1(3), three2(3); const char* badEdgeStr = " multiple times in surface mesh"; const int badEdgeStrLen = strlen( badEdgeStr ); + const int nbNodes = nodeVec.size(); + while( !file.eof() ) { if ( strncmp( file, "Edge ", 5 ) == 0 && file.getInts( two ) && strncmp( file, badEdgeStr, badEdgeStrLen ) == 0 && - two[0] < nodeVec.size() && two[1] < nodeVec.size()) + two[0] < nbNodes && two[1] < nbNodes ) { err->myBadElements.push_back( new SMDS_LinearEdge( nodeVec[ two[0]], nodeVec[ two[1]] )); file += badEdgeStrLen; @@ -3087,7 +3558,6 @@ NETGENPlugin_Mesher::ReadErrors(const vector& nodeVec) // openelement 18 with open element 126 // 41 36 38 // 69 70 72 - vector three1(3), three2(3); file.getLine(); const char* pos = file; bool ok = ( strncmp( file, "openelement ", 12 ) == 0 ); @@ -3095,9 +3565,9 @@ NETGENPlugin_Mesher::ReadErrors(const vector& nodeVec) ok = ok && file.getInts( three1 ); ok = ok && file.getInts( three2 ); for ( int i = 0; ok && i < 3; ++i ) - ok = ( three1[i] < nodeVec.size() && nodeVec[ three1[i]]); + ok = ( three1[i] < nbNodes && nodeVec[ three1[i]]); for ( int i = 0; ok && i < 3; ++i ) - ok = ( three2[i] < nodeVec.size() && nodeVec[ three2[i]]); + ok = ( three2[i] < nbNodes && nodeVec[ three2[i]]); if ( ok ) { err->myBadElements.push_back( new SMDS_FaceOfNodes( nodeVec[ three1[0]], @@ -3118,6 +3588,12 @@ NETGENPlugin_Mesher::ReadErrors(const vector& nodeVec) ++file; } } + +#ifdef _DEBUG_ + size_t nbBadElems = err->myBadElements.size(); + if ( nbBadElems ) nbBadElems++; // avoid warning: variable set but not used +#endif + return err; } @@ -3129,15 +3605,15 @@ NETGENPlugin_Mesher::ReadErrors(const vector& nodeVec) */ //================================================================================ -void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh, - const std::string& pyFile) +void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh ) { - ofstream outfile(pyFile.c_str(), ios::out); + const char* pyFile = "/tmp/ngMesh.py"; + ofstream outfile( pyFile, ios::out ); if ( !outfile ) return; - outfile << "import SMESH" << endl + outfile << "import salome, SMESH" << endl << "from salome.smesh import smeshBuilder" << endl - << "smesh = smeshBuilder.New(salome.myStudy)" << endl + << "smesh = smeshBuilder.New()" << endl << "mesh = smesh.Mesh()" << endl << endl; using namespace netgen; @@ -3199,8 +3675,9 @@ void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh, */ //================================================================================ -NETGENPlugin_ngMeshInfo::NETGENPlugin_ngMeshInfo( netgen::Mesh* ngMesh): - _copyOfLocalH(0) +NETGENPlugin_ngMeshInfo::NETGENPlugin_ngMeshInfo( netgen::Mesh* ngMesh, + bool checkRemovedElems): + _elementsRemoved( false ), _copyOfLocalH(0) { if ( ngMesh ) { @@ -3208,6 +3685,10 @@ NETGENPlugin_ngMeshInfo::NETGENPlugin_ngMeshInfo( netgen::Mesh* ngMesh): _nbSegments = ngMesh->GetNSeg(); _nbFaces = ngMesh->GetNSE(); _nbVolumes = ngMesh->GetNE(); + + if ( checkRemovedElems ) + for ( int i = 1; i <= ngMesh->GetNSE() && !_elementsRemoved; ++i ) + _elementsRemoved = ngMesh->SurfaceElement(i).IsDeleted(); } else { @@ -3409,7 +3890,7 @@ void NETGENPlugin_Internals::findBorderElements( TIDSortedElemSet & borderElems while ( fIt->more() ) { const SMDS_MeshElement* f = fIt->next(); - int nbNodes = f->NbNodes() / ( f->IsQuadratic() ? 2 : 1 ); + const int nbNodes = f->NbCornerNodes(); if ( intFaceSM->Contains( f )) { for ( int i = 0; i < nbNodes; ++i ) @@ -3440,7 +3921,7 @@ void NETGENPlugin_Internals::findBorderElements( TIDSortedElemSet & borderElems const SMDS_MeshElement* f = *fIt; bool isBorder = false, linkFound = false, borderLinkFound = false; list< SMESH_OrientedLink > faceLinks; - int nbNodes = f->NbNodes() / ( f->IsQuadratic() ? 2 : 1 ); + int nbNodes = f->NbCornerNodes(); for ( int i = 0; i < nbNodes; ++i ) { SMESH_OrientedLink link( f->GetNode(i), f->GetNode((i+1)%nbNodes)); @@ -3598,6 +4079,18 @@ SMESH_Mesh& NETGENPlugin_Internals::getMesh() const return const_cast( _mesh ); } +//================================================================================ +/*! + * \brief Access to a counter of NETGENPlugin_NetgenLibWrapper instances + */ +//================================================================================ + +int& NETGENPlugin_NetgenLibWrapper::instanceCounter() +{ + static int theCouner = 0; + return theCouner; +} + //================================================================================ /*! * \brief Initialize netgen library @@ -3606,19 +4099,30 @@ SMESH_Mesh& NETGENPlugin_Internals::getMesh() const NETGENPlugin_NetgenLibWrapper::NETGENPlugin_NetgenLibWrapper() { - Ng_Init(); - - // redirect all netgen output (mycout,myerr,cout) to _outputFileName - _isComputeOk = false; - _outputFileName = getOutputFileName(); - netgen::mycout = new ofstream ( _outputFileName.c_str() ); - netgen::myerr = netgen::mycout; - _coutBuffer = std::cout.rdbuf(); + if ( instanceCounter() == 0 ) + Ng_Init(); + + ++instanceCounter(); + + _isComputeOk = false; + _coutBuffer = NULL; + _ngcout = NULL; + _ngcerr = NULL; + if ( !getenv( "KEEP_NETGEN_OUTPUT" )) + { + // redirect all netgen output (mycout,myerr,cout) to _outputFileName + _outputFileName = getOutputFileName(); + _ngcout = netgen::mycout; + _ngcerr = netgen::myerr; + netgen::mycout = new ofstream ( _outputFileName.c_str() ); + 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 << endl; #else - std::cout.rdbuf( netgen::mycout->rdbuf() ); + std::cout.rdbuf( netgen::mycout->rdbuf() ); #endif + } _ngMesh = Ng_NewMesh(); } @@ -3631,10 +4135,13 @@ NETGENPlugin_NetgenLibWrapper::NETGENPlugin_NetgenLibWrapper() NETGENPlugin_NetgenLibWrapper::~NETGENPlugin_NetgenLibWrapper() { + --instanceCounter(); + Ng_DeleteMesh( _ngMesh ); Ng_Exit(); - NETGENPlugin_Mesher::RemoveTmpFiles(); - std::cout.rdbuf( _coutBuffer ); + RemoveTmpFiles(); + if ( _coutBuffer ) + std::cout.rdbuf( _coutBuffer ); #ifdef _DEBUG_ if( _isComputeOk ) #endif @@ -3678,6 +4185,26 @@ std::string NETGENPlugin_NetgenLibWrapper::getOutputFileName() return aGenericName.ToCString(); } +//================================================================================ +/*! + * \brief Remove "test.out" and "problemfaces" files in current directory + */ +//================================================================================ + +void NETGENPlugin_NetgenLibWrapper::RemoveTmpFiles() +{ + bool rm = SMESH_File("test.out").remove() ; +#ifndef WIN32 + if ( rm && netgen::testout && instanceCounter() == 0 ) + { + delete netgen::testout; + netgen::testout = 0; + } +#endif + SMESH_File("problemfaces").remove(); + SMESH_File("occmesh.rep").remove(); +} + //================================================================================ /*! * \brief Remove file with netgen output @@ -3686,20 +4213,21 @@ std::string NETGENPlugin_NetgenLibWrapper::getOutputFileName() void NETGENPlugin_NetgenLibWrapper::removeOutputFile() { - string tmpDir = SALOMEDS_Tool::GetDirFromPath( _outputFileName ); - SALOMEDS::ListOfFileNames_var aFiles = new SALOMEDS::ListOfFileNames; - aFiles->length(1); - std::string aFileName = SALOMEDS_Tool::GetNameFromPath( _outputFileName ) + ".out"; - aFiles[0] = aFileName.c_str(); - if ( netgen::mycout) + if ( !_outputFileName.empty() ) { - delete netgen::mycout; - netgen::mycout = 0; - netgen::myerr = 0; + if ( _ngcout ) + { + delete netgen::mycout; + netgen::mycout = _ngcout; + netgen::myerr = _ngcerr; + _ngcout = 0; + } + string tmpDir = SALOMEDS_Tool::GetDirFromPath ( _outputFileName ); + string aFileName = SALOMEDS_Tool::GetNameFromPath( _outputFileName ) + ".out"; + SALOMEDS_Tool::ListOfFiles aFiles; + aFiles.reserve(1); + aFiles.push_back(aFileName.c_str()); + + SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles, true ); } - - SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true ); -#ifdef _DEBUG_ - //cout << "NOTE: netgen output log was REMOVED " << _outputFileName << endl; -#endif }