X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FNETGENPlugin%2FNETGENPlugin_Mesher.cxx;h=03df4247fe656c69cbf46179bd317f1ebef276ee;hb=ea5e0462360659e435a5fb56e9bf0e21d526e713;hp=6d585e057f8e7d490089e7a7488087d7e74558da;hpb=34f646e4657878e684b461fe8b3144e282c63945;p=plugins%2Fnetgenplugin.git diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index 6d585e0..03df424 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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 @@ -90,18 +90,14 @@ 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 + + NETGENPLUGIN_DLL_HEADER extern MeshingParameters mparam; -#if defined(NETGEN_V5) && defined(WIN32) - DLL_HEADER -#endif + + NETGENPLUGIN_DLL_HEADER extern volatile multithreadt multithread; -#if defined(NETGEN_V5) && defined(WIN32) - DLL_HEADER -#endif + NETGENPLUGIN_DLL_HEADER extern bool merge_solids; // values used for occgeo.facemeshstatus @@ -144,253 +140,37 @@ std::map SolidId2LocalSize; std::vector ControlPoints; std::set ShapesWithControlPoints; // <-- allows calling SetLocalSize() several times w/o recomputing ControlPoints -//============================================================================= -/*! - * - */ -//============================================================================= - -NETGENPlugin_Mesher::NETGENPlugin_Mesher (SMESH_Mesh* mesh, - const TopoDS_Shape& aShape, - const bool isVolume) - : _mesh (mesh), - _shape (aShape), - _isVolume(isVolume), - _optimize(true), - _fineness(NETGENPlugin_Hypothesis::GetDefaultFineness()), - _isViscousLayers2D(false), - _chordalError(-1), // means disabled - _ngMesh(NULL), - _occgeom(NULL), - _curShapeIndex(-1), - _progressTic(1), - _totalTime(1.0), - _simpleHyp(NULL), - _viscousLayersHyp(NULL), - _ptrToMe(NULL) -{ - SetDefaultParameters(); - ShapesWithLocalSize.Clear(); - VertexId2LocalSize.clear(); - EdgeId2LocalSize.clear(); - FaceId2LocalSize.clear(); - SolidId2LocalSize.clear(); - ControlPoints.clear(); - ShapesWithControlPoints.clear(); -} - -//================================================================================ -/*! - * Destuctor - */ -//================================================================================ - -NETGENPlugin_Mesher::~NETGENPlugin_Mesher() -{ - if ( _ptrToMe ) - *_ptrToMe = NULL; - _ptrToMe = 0; - _ngMesh = NULL; -} - -//================================================================================ -/*! - * Set pointer to NETGENPlugin_Mesher* field of the holder, that will be - * nullified at destruction of this - */ -//================================================================================ - -void NETGENPlugin_Mesher::SetSelfPointer( NETGENPlugin_Mesher ** ptr ) -{ - if ( _ptrToMe ) - *_ptrToMe = NULL; - - _ptrToMe = ptr; - - if ( _ptrToMe ) - *_ptrToMe = this; -} - -//================================================================================ -/*! - * \brief Initialize global NETGEN parameters with default values - */ -//================================================================================ - -void NETGENPlugin_Mesher::SetDefaultParameters() -{ - netgen::MeshingParameters& mparams = netgen::mparam; - // maximal mesh edge size - mparams.maxh = 0;//NETGENPlugin_Hypothesis::GetDefaultMaxSize(); - mparams.minh = 0; - // minimal number of segments per edge - mparams.segmentsperedge = NETGENPlugin_Hypothesis::GetDefaultNbSegPerEdge(); - // rate of growth of size between elements - mparams.grading = NETGENPlugin_Hypothesis::GetDefaultGrowthRate(); - // safety factor for curvatures (elements per radius) - mparams.curvaturesafety = NETGENPlugin_Hypothesis::GetDefaultNbSegPerRadius(); - // create elements of second order - mparams.secondorder = NETGENPlugin_Hypothesis::GetDefaultSecondOrder(); - // quad-dominated surface meshing - if (_isVolume) - mparams.quad = 0; - else - mparams.quad = NETGENPlugin_Hypothesis_2D::GetDefaultQuadAllowed(); - _fineness = NETGENPlugin_Hypothesis::GetDefaultFineness(); - mparams.uselocalh = NETGENPlugin_Hypothesis::GetDefaultSurfaceCurvature(); - netgen::merge_solids = NETGENPlugin_Hypothesis::GetDefaultFuseEdges(); -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -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()) { - SetLocalSize(it.Value(), LocalSize); - } - return; - } - int key; - if (! ShapesWithLocalSize.Contains(GeomShape)) - key = ShapesWithLocalSize.Add(GeomShape); - else - key = ShapesWithLocalSize.FindIndex(GeomShape); - if (GeomType == TopAbs_VERTEX) { - VertexId2LocalSize[key] = LocalSize; - } else if (GeomType == TopAbs_EDGE) { - EdgeId2LocalSize[key] = LocalSize; - } else if (GeomType == TopAbs_FACE) { - FaceId2LocalSize[key] = LocalSize; - } else if (GeomType == TopAbs_SOLID) { - SolidId2LocalSize[key] = LocalSize; - } -} - -//============================================================================= -/*! - * Pass parameters to NETGEN - */ -//============================================================================= -void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp) +namespace { - if (hyp) + //============================================================================= + /*! + * Link - a pair of integer numbers + */ + //============================================================================= + struct Link { - netgen::MeshingParameters& mparams = netgen::mparam; - // Initialize global NETGEN parameters: - // maximal mesh segment size - mparams.maxh = hyp->GetMaxSize(); - // maximal mesh element linear size - mparams.minh = hyp->GetMinSize(); - // minimal number of segments per edge - mparams.segmentsperedge = hyp->GetNbSegPerEdge(); - // rate of growth of size between elements - mparams.grading = hyp->GetGrowthRate(); - // safety factor for curvatures (elements per radius) - mparams.curvaturesafety = hyp->GetNbSegPerRadius(); - // create elements of second order - mparams.secondorder = hyp->GetSecondOrder() ? 1 : 0; - // quad-dominated surface meshing - mparams.quad = hyp->GetQuadAllowed() ? 1 : 0; - _optimize = hyp->GetOptimize(); - _fineness = hyp->GetFineness(); - mparams.uselocalh = hyp->GetSurfaceCurvature(); - netgen::merge_solids = hyp->GetFuseEdges(); - _chordalError = hyp->GetChordalErrorEnabled() ? hyp->GetChordalError() : -1.; - _simpleHyp = NULL; - // mesh size file - mparams.meshsizefilename= hyp->GetMeshSizeFile().empty() ? 0 : hyp->GetMeshSizeFile().c_str(); - - const NETGENPlugin_Hypothesis::TLocalSize& localSizes = hyp->GetLocalSizesAndEntries(); - if ( !localSizes.empty() ) + 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 { - 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()); - if ( !myStudy->_is_nil() ) - { - NETGENPlugin_Hypothesis::TLocalSize::const_iterator it = localSizes.begin(); - for ( ; it != localSizes.end() ; it++) - { - std::string entry = (*it).first; - double val = (*it).second; - // -- - GEOM::GEOM_Object_var aGeomObj; - 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(); - } - TopoDS_Shape S = smeshGen_i->GeomObjectToShape( aGeomObj.in() ); - ::SetLocalSize(S, val); - } - } + return (( Contains( other.n1 ) || Contains( other.n2 )) && ( this != &other )); + } + static int HashCode(const Link& aLink, int aLimit) + { + return ::HashCode(aLink.n1 + aLink.n2, aLimit); } - } -} - -//============================================================================= -/*! - * Pass simple parameters to NETGEN - */ -//============================================================================= - -void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_SimpleHypothesis_2D* hyp) -{ - _simpleHyp = hyp; - if ( _simpleHyp ) - SetDefaultParameters(); -} - -//================================================================================ -/*! - * \brief Store a Viscous Layers hypothesis - */ -//================================================================================ - -void NETGENPlugin_Mesher::SetParameters(const StdMeshers_ViscousLayers* hyp ) -{ - _viscousLayersHyp = hyp; -} - -//============================================================================= -/*! - * Link - a pair of integer numbers - */ -//============================================================================= -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) -{ - return HashCode(aLink.n1 + aLink.n2, aLimit); -} + static 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 )); + } + }; -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 )); -} + typedef NCollection_Map TLinkMap; -namespace -{ //================================================================================ /*! * \brief return id of netgen point corresponding to SMDS node @@ -425,7 +205,7 @@ namespace list< TopoDS_Edge > getConnectedEdges( const TopoDS_Edge& edge, const TopoDS_Face& face, - const set< SMESH_subMesh* > & computedSM, + const set< SMESH_subMesh* > & /*computedSM*/, const SMESH_MesherHelper& helper, map< SMESH_subMesh*, set< int > >& addedEdgeSM2Faces) { @@ -539,7 +319,7 @@ namespace OCC_CATCH_SIGNALS; BRepMesh_IncrementalMesh e(shape, 0.01, true); } - catch (Standard_Failure) + catch (Standard_Failure&) { } // updated.erase( triangulation.operator->() ); @@ -655,8 +435,265 @@ namespace return Sqrt( 3 ) * Sqrt( chordalError * ( 2 * radius - chordalError )); } + //============================================================================= + /*! + * + */ + //============================================================================= + + void setLocalSize(const 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()) { + setLocalSize(it.Value(), LocalSize); + } + return; + } + int key; + if (! ShapesWithLocalSize.Contains(GeomShape)) + key = ShapesWithLocalSize.Add(GeomShape); + else + key = ShapesWithLocalSize.FindIndex(GeomShape); + if (GeomType == TopAbs_VERTEX) { + VertexId2LocalSize[key] = LocalSize; + } else if (GeomType == TopAbs_EDGE) { + EdgeId2LocalSize[key] = LocalSize; + } else if (GeomType == TopAbs_FACE) { + FaceId2LocalSize[key] = LocalSize; + } else if (GeomType == TopAbs_SOLID) { + SolidId2LocalSize[key] = LocalSize; + } + return; + } + + //================================================================================ + /*! + * \brief Return faceNgID or faceNgID-1 depending on side the given proxy face lies + * \param [in] f - proxy face + * \param [in] solidSMDSIDs - IDs of SOLIDs sharing the FACE on which face lies + * \param [in] faceNgID - NETGEN ID of the FACE + * \return int - NETGEN ID of the FACE + */ + //================================================================================ + + int getFaceNgID( const SMDS_MeshElement* face, + const int * solidSMDSIDs, + const int faceNgID ) + { + for ( int i = 0; i < 3; ++i ) + { + const SMDS_MeshNode* n = face->GetNode( i ); + const int shapeID = n->GetShapeID(); + if ( shapeID == solidSMDSIDs[0] ) + return faceNgID - 1; + if ( shapeID == solidSMDSIDs[1] ) + return faceNgID; + } + std::vector fNodes( face->begin_nodes(), face->end_nodes() ); + std::vector vols; + if ( SMDS_Mesh::GetElementsByNodes( fNodes, vols, SMDSAbs_Volume )) + for ( size_t i = 0; i < vols.size(); ++i ) + { + const int shapeID = vols[i]->GetShapeID(); + if ( shapeID == solidSMDSIDs[0] ) + return faceNgID - 1; + if ( shapeID == solidSMDSIDs[1] ) + return faceNgID; + } + return faceNgID; + } + } // namespace +//============================================================================= +/*! + * + */ +//============================================================================= + +NETGENPlugin_Mesher::NETGENPlugin_Mesher (SMESH_Mesh* mesh, + const TopoDS_Shape& aShape, + const bool isVolume) + : _mesh (mesh), + _shape (aShape), + _isVolume(isVolume), + _optimize(true), + _fineness(NETGENPlugin_Hypothesis::GetDefaultFineness()), + _isViscousLayers2D(false), + _chordalError(-1), // means disabled + _ngMesh(NULL), + _occgeom(NULL), + _curShapeIndex(-1), + _progressTic(1), + _totalTime(1.0), + _simpleHyp(NULL), + _viscousLayersHyp(NULL), + _ptrToMe(NULL) +{ + SetDefaultParameters(); + ShapesWithLocalSize.Clear(); + VertexId2LocalSize.clear(); + EdgeId2LocalSize.clear(); + FaceId2LocalSize.clear(); + SolidId2LocalSize.clear(); + ControlPoints.clear(); + ShapesWithControlPoints.clear(); +} + +//================================================================================ +/*! + * Destructor + */ +//================================================================================ + +NETGENPlugin_Mesher::~NETGENPlugin_Mesher() +{ + if ( _ptrToMe ) + *_ptrToMe = NULL; + _ptrToMe = 0; + _ngMesh = NULL; +} + +//================================================================================ +/*! + * Set pointer to NETGENPlugin_Mesher* field of the holder, that will be + * nullified at destruction of this + */ +//================================================================================ + +void NETGENPlugin_Mesher::SetSelfPointer( NETGENPlugin_Mesher ** ptr ) +{ + if ( _ptrToMe ) + *_ptrToMe = NULL; + + _ptrToMe = ptr; + + if ( _ptrToMe ) + *_ptrToMe = this; +} + +//================================================================================ +/*! + * \brief Initialize global NETGEN parameters with default values + */ +//================================================================================ + +void NETGENPlugin_Mesher::SetDefaultParameters() +{ + netgen::MeshingParameters& mparams = netgen::mparam; + mparams = netgen::MeshingParameters(); + // maximal mesh edge size + mparams.maxh = 0;//NETGENPlugin_Hypothesis::GetDefaultMaxSize(); + mparams.minh = 0; + // minimal number of segments per edge + mparams.segmentsperedge = NETGENPlugin_Hypothesis::GetDefaultNbSegPerEdge(); + // rate of growth of size between elements + mparams.grading = NETGENPlugin_Hypothesis::GetDefaultGrowthRate(); + // safety factor for curvatures (elements per radius) + mparams.curvaturesafety = NETGENPlugin_Hypothesis::GetDefaultNbSegPerRadius(); + // create elements of second order + mparams.secondorder = NETGENPlugin_Hypothesis::GetDefaultSecondOrder(); + // quad-dominated surface meshing + if (_isVolume) + mparams.quad = 0; + else + mparams.quad = NETGENPlugin_Hypothesis_2D::GetDefaultQuadAllowed(); + _fineness = NETGENPlugin_Hypothesis::GetDefaultFineness(); + mparams.uselocalh = NETGENPlugin_Hypothesis::GetDefaultSurfaceCurvature(); + netgen::merge_solids = NETGENPlugin_Hypothesis::GetDefaultFuseEdges(); +} + +//============================================================================= +/*! + * Pass parameters to NETGEN + */ +//============================================================================= +void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp) +{ + if (hyp) + { + netgen::MeshingParameters& mparams = netgen::mparam; + // Initialize global NETGEN parameters: + // maximal mesh segment size + mparams.maxh = hyp->GetMaxSize(); + // maximal mesh element linear size + mparams.minh = hyp->GetMinSize(); + // minimal number of segments per edge + mparams.segmentsperedge = hyp->GetNbSegPerEdge(); + // rate of growth of size between elements + mparams.grading = hyp->GetGrowthRate(); + // safety factor for curvatures (elements per radius) + mparams.curvaturesafety = hyp->GetNbSegPerRadius(); + // create elements of second order + mparams.secondorder = hyp->GetSecondOrder() ? 1 : 0; + // quad-dominated surface meshing + mparams.quad = hyp->GetQuadAllowed() ? 1 : 0; + _optimize = hyp->GetOptimize(); + _fineness = hyp->GetFineness(); + mparams.uselocalh = hyp->GetSurfaceCurvature(); + netgen::merge_solids = hyp->GetFuseEdges(); + _chordalError = hyp->GetChordalErrorEnabled() ? hyp->GetChordalError() : -1.; + mparams.optsteps2d = _optimize ? hyp->GetNbSurfOptSteps() : 0; + mparams.optsteps3d = _optimize ? hyp->GetNbVolOptSteps() : 0; + mparams.elsizeweight = hyp->GetElemSizeWeight(); + mparams.opterrpow = hyp->GetWorstElemMeasure(); + mparams.delaunay = hyp->GetUseDelauney(); + mparams.checkoverlap = hyp->GetCheckOverlapping(); + mparams.checkchartboundary = hyp->GetCheckChartBoundary(); + _simpleHyp = NULL; + // mesh size file + mparams.meshsizefilename= hyp->GetMeshSizeFile().empty() ? 0 : hyp->GetMeshSizeFile().c_str(); + + const NETGENPlugin_Hypothesis::TLocalSize& localSizes = hyp->GetLocalSizesAndEntries(); + if ( !localSizes.empty() ) + { + SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen(); + NETGENPlugin_Hypothesis::TLocalSize::const_iterator it = localSizes.begin(); + 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); + } + } + } +} + +//============================================================================= +/*! + * Pass simple parameters to NETGEN + */ +//============================================================================= + +void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_SimpleHypothesis_2D* hyp) +{ + _simpleHyp = hyp; + if ( _simpleHyp ) + SetDefaultParameters(); +} + +//================================================================================ +/*! + * \brief Store a Viscous Layers hypothesis + */ +//================================================================================ + +void NETGENPlugin_Mesher::SetParameters(const StdMeshers_ViscousLayers* hyp ) +{ + _viscousLayersHyp = hyp; +} + //================================================================================ /*! * \brief Set local size on shapes defined by SetParameters() @@ -924,7 +961,7 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo, if ( shape.ShapeType() != TopAbs_VERTEX ) shape = subShapes( subShapes.FindIndex( shape ));// shape -> index -> oriented shape if ( shape.Orientation() >= TopAbs_INTERNAL ) - shape.Orientation( TopAbs_FORWARD ); // isuue 0020676 + shape.Orientation( TopAbs_FORWARD ); // issue 0020676 switch ( shape.ShapeType() ) { case TopAbs_FACE : occgeo.fmap.Add( shape ); break; case TopAbs_EDGE : occgeo.emap.Add( shape ); break; @@ -1053,6 +1090,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, set< SMESH_subMesh* > computedSM( meshedSM.begin(), meshedSM.end() ); SMESH_MesherHelper helper (*_mesh); + SMESHDS_Mesh* meshDS = _mesh->GetMeshDS(); int faceNgID = ngMesh.GetNFD(); @@ -1082,7 +1120,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, if ( faceNgID < 1 ) continue; // meshed face - int faceSMDSId = helper.GetMeshDS()->ShapeToIndex( *anc ); + int faceSMDSId = meshDS->ShapeToIndex( *anc ); if ( visitedEdgeSM2Faces[ sm ].count( faceSMDSId )) continue; // already treated EDGE @@ -1110,8 +1148,8 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, bool isForwad = ( fOri == eNotSeam.Orientation() || fOri >= TopAbs_INTERNAL ); // get all nodes from connected - const bool isQuad = smDS->IsQuadratic(); - StdMeshers_FaceSide fSide( face, edges, _mesh, isForwad, isQuad, &helper ); + const bool skipMedium = netgen::mparam.secondorder;//smDS->IsQuadratic(); + StdMeshers_FaceSide fSide( face, edges, _mesh, isForwad, skipMedium, &helper ); const vector& points = fSide.GetUVPtStruct(); if ( points.empty() ) return false; // invalid node params? @@ -1136,7 +1174,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, if ( p1.node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX ) //an EDGE begins { isSeam = false; - if ( helper.IsRealSeam( p1.node->getshapeId() )) + if ( helper.IsRealSeam( p1.node->GetShapeID() )) { TopoDS_Edge e = fSide.Edge( fSide.EdgeIndex( 0.5 * ( p1.normParam + p2.normParam ))); isSeam = helper.IsRealSeam( e ); @@ -1171,7 +1209,7 @@ 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 + cout << "Segment: " << seg.edgenr << " on SMESH face " << meshDS->ShapeToIndex( face ) << endl << "\tface index: " << seg.si << endl << "\tp1: " << seg[0] << endl << "\tp2: " << seg[1] << endl @@ -1238,7 +1276,8 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, bool isInternalFace = ( geomFace.Orientation() == TopAbs_INTERNAL ); // Find solids the geomFace bounds - int solidID1 = 0, solidID2 = 0; + int solidID1 = 0, solidID2 = 0; // ng IDs + int solidSMDSIDs[2] = { 0,0 }; // smds IDs { PShapeIteratorPtr solidIt = helper.GetAncestors( geomFace, *sm->GetFather(), TopAbs_SOLID); while ( const TopoDS_Shape * solid = solidIt->next() ) @@ -1246,6 +1285,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, int id = occgeom.somap.FindIndex ( *solid ); if ( solidID1 && id != solidID1 ) solidID2 = id; else solidID1 = id; + if ( id ) solidSMDSIDs[ bool( solidSMDSIDs[0] )] = meshDS->ShapeToIndex( *solid ); } } if ( proxyMesh && proxyMesh->GetProxySubMesh( geomFace )) @@ -1261,12 +1301,16 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, if ( proxyMesh->IsTemporary( f )) { hasTmp = true; + if ( solidSMDSIDs[1] && proxyMesh->HasPrismsOnTwoSides( meshDS->MeshElements( geomFace ))) + break; + else + solidSMDSIDs[1] = 0; std::vector fNodes( f->begin_nodes(), f->end_nodes() ); std::vector vols; - if ( _mesh->GetMeshDS()->GetElementsByNodes( fNodes, vols, SMDSAbs_Volume ) == 1 ) + if ( meshDS->GetElementsByNodes( fNodes, vols, SMDSAbs_Volume ) == 1 ) { - int geomID = vols[0]->getshapeId(); - const TopoDS_Shape& solid = helper.GetMeshDS()->IndexToShape( geomID ); + int geomID = vols[0]->GetShapeID(); + const TopoDS_Shape& solid = meshDS->IndexToShape( geomID ); if ( !solid.IsNull() ) solidID1 = occgeom.somap.FindIndex ( solid ); solidID2 = 0; @@ -1274,7 +1318,6 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, } } } - // exclude faces generated by NETGEN from computation of 3D mesh const int fID = occgeom.fmap.FindIndex( geomFace ); if ( !hasTmp ) // shrunk mesh { @@ -1311,6 +1354,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, } } } + // exclude faces generated by NETGEN from computation of 3D mesh //if ( hasTmp ) { faceNgID++; @@ -1322,11 +1366,26 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, const_cast< netgen::Element2d& >( elem ).SetIndex( faceNgID ); } } + } // if proxy + else + { + solidSMDSIDs[1] = 0; } + const bool hasVLOn2Sides = ( solidSMDSIDs[1] > 0 ); + // Add ng face descriptors of meshed faces faceNgID++; - ngMesh.AddFaceDescriptor( netgen::FaceDescriptor( faceNgID, solidID1, solidID2, 0 )); - + if ( hasVLOn2Sides ) + { + // viscous layers are on two sides of the FACE + ngMesh.AddFaceDescriptor( netgen::FaceDescriptor( faceNgID, solidID1, 0, 0 )); + faceNgID++; + ngMesh.AddFaceDescriptor( netgen::FaceDescriptor( faceNgID, 0, solidID2, 0 )); + } + else + { + 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 ); @@ -1362,7 +1421,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, SMESH_TNodeXYZ xyz[3]; #ifdef DUMP_TRIANGLES - cout << "SMESH face " << helper.GetMeshDS()->ShapeToIndex( geomFace ) + cout << "SMESH face " << meshDS->ShapeToIndex( geomFace ) << " internal="<GetFather(),TopAbs_SOLID); 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 sub-mesh")); - smError->myBadElements.push_back( f ); + SMESH_BadInputElements* badElems = + new SMESH_BadInputElements( meshDS, COMPERR_BAD_INPUT_MESH, "Not triangle sub-mesh"); + badElems->add( f ); + sm->GetComputeError().reset( badElems ); return false; } + if ( hasVLOn2Sides ) + tri.SetIndex( getFaceNgID( f, solidSMDSIDs, faceNgID )); + 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(); + int shapeID = node->GetShapeID(); if ( helper.IsSeamShape( shapeID )) { - if ( helper.IsSeamShape( f->GetNodeWrap( i+1 )->getshapeId() )) + if ( helper.IsSeamShape( f->GetNodeWrap( i+1 )->GetShapeID() )) inFaceNode = f->GetNodeWrap( i-1 ); else inFaceNode = f->GetNodeWrap( i+1 ); @@ -1423,7 +1486,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, cout << tri << endl; #endif } - } + } // loop on sub-mesh faces if ( quadHelper ) // remember medium nodes of sub-meshes { @@ -1540,7 +1603,7 @@ bool NETGENPlugin_Mesher::FixFaceMesh(const netgen::OCCGeometry& occgeom, //const TopoDS_Face& face = TopoDS::Face( occgeom.fmap( faceID )); // find free links on the FACE - NCollection_Map linkMap; + TLinkMap linkMap; for ( int iF = 1; iF <= ngMesh.GetNSE(); ++iF ) { const netgen::Element2d& elem = ngMesh.SurfaceElement(iF); @@ -1576,17 +1639,17 @@ bool NETGENPlugin_Mesher::FixFaceMesh(const netgen::OCCGeometry& occgeom, netgen::Element2d tri(3); tri.SetIndex ( faceID ); - NCollection_Map::Iterator linkIt( linkMap ); + TLinkMap::Iterator linkIt( linkMap ); Link link1 = linkIt.Value(); // look for a link connected to link1 - NCollection_Map::Iterator linkIt2 = linkIt; + TLinkMap::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; + TLinkMap::Iterator linkIt3 = linkIt2; for ( linkIt3.Next(); linkIt3.More(); linkIt3.Next() ) { const Link& link3 = linkIt3.Value(); @@ -1663,7 +1726,7 @@ namespace struct TIntVData { gp_XY uv; //!< UV in face parametric space - int ngId; //!< ng id of corrsponding node + int ngId; //!< ng id of corresponding node gp_XY uvClose; //!< UV of closest boundary node int ngIdClose; //!< ng id of closest boundary node }; @@ -1876,6 +1939,7 @@ void NETGENPlugin_Mesher::AddIntVerticesInFaces(const netgen::OCCGeometry& o } } + ngMesh.CalcSurfacesOfNode(); } //================================================================================ @@ -1897,7 +1961,7 @@ void NETGENPlugin_Mesher::AddIntVerticesInSolids(const netgen::OCCGeometry& ofstream py(DUMP_TRIANGLES_SCRIPT); py << "import SMESH"<< endl << "from salome.smesh import smeshBuilder"<getshapeId() )) + if ( subIDs.count( nodeVec[ngID]->GetShapeID() )) node2ngID.insert( make_pair( nodeVec[ngID], ngID )); } @@ -2207,13 +2271,13 @@ NETGENPlugin_Mesher::AddSegmentsToMesh(netgen::Mesh& ngMesh, // Add the first point of a segment const SMDS_MeshNode * n = uvPtVec[ i ].node; - const int posShapeID = n->getshapeId(); + const int posShapeID = n->GetShapeID(); bool onVertex = ( n->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX ); bool onEdge = ( n->GetPosition()->GetTypeOfPosition() == SMDS_TOP_EDGE ); // skip nodes on degenerated edges if ( helper.IsDegenShape( posShapeID ) && - helper.IsDegenShape( uvPtVec[ i+1 ].node->getshapeId() )) + helper.IsDegenShape( uvPtVec[ i+1 ].node->GetShapeID() )) continue; int ngID1 = ngMesh.GetNP() + 1, ngID2 = ngID1+1; @@ -2402,7 +2466,7 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, for ( ngID = i = 1; i < nodeVecSize; ++ngID, ++i ) { gp_Pnt ngPnt( NGPOINT_COORDS( ngMesh.Point( ngID ))); - gp_Pnt node ( SMESH_NodeXYZ ( nodeVec[ i ])); + gp_Pnt node ( SMESH_NodeXYZ (nodeVec_ACCESS(i) )); if ( ngPnt.SquareDistance( node ) < eps ) { nodeVec[ ngID ] = nodeVec[ i ]; @@ -2419,7 +2483,8 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, // Create and insert nodes into nodeVec // ------------------------------------- - nodeVec.resize( nbNod + 1 ); + if ( nbNod > nbInitNod ) + nodeVec.resize( nbNod + 1 ); for ( i = nbInitNod+1; i <= nbNod; ++i ) { const netgen::MeshPoint& ngPoint = ngMesh.Point(i); @@ -2484,7 +2549,7 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, { param = param2 * 0.5; } - if (!aEdge.IsNull() && nodeVec_ACCESS(pind)->getshapeId() < 1) + if (!aEdge.IsNull() && nodeVec_ACCESS(pind)->GetShapeID() < 1) { meshDS->SetNodeOnEdge(nodeVec_ACCESS(pind), aEdge, param); } @@ -2516,7 +2581,7 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, nbSeg = nbFac = nbVol = 0; break; } - if ( !aEdge.IsNull() && edge->getshapeId() < 1 ) + if ( !aEdge.IsNull() && edge->GetShapeID() < 1 ) meshDS->SetMeshElementOnShape(edge, aEdge); } else if ( comment.empty() ) @@ -2553,7 +2618,7 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, if ( SMDS_MeshNode* node = nodeVec_ACCESS(pind)) { nodes.push_back( node ); - if (!aFace.IsNull() && node->getshapeId() < 1) + if (!aFace.IsNull() && node->GetShapeID() < 1) { const netgen::PointGeomInfo& pgi = elem.GeomInfoPi(j); meshDS->SetNodeOnFace(node, aFace, pgi.u, pgi.v); @@ -2634,7 +2699,7 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, if ( SMDS_MeshNode* node = nodeVec_ACCESS(pind) ) { nodes.push_back(node); - if ( !aSolid.IsNull() && node->getshapeId() < 1 ) + if ( !aSolid.IsNull() && node->GetShapeID() < 1 ) meshDS->SetNodeInVolume(node, aSolid); } } @@ -2747,7 +2812,7 @@ namespace while ( nIt->more() ) { const SMDS_MeshNode* n = nIt->next(); - const TopoDS_Shape& s = mesh->IndexToShape( n->getshapeId() ); + const TopoDS_Shape& s = mesh->IndexToShape( n->GetShapeID() ); nbNodesOnSolid += ( !s.IsNull() && solidSubs.Contains( s )); if ( nbNodesOnSolid > 2 || nbNodesOnSolid == nbNodes) @@ -3040,8 +3105,9 @@ bool NETGENPlugin_Mesher::Compute() } // Build viscous layers - if ( _isViscousLayers2D || - StdMeshers_ViscousLayers2D::HasProxyMesh( TopoDS::Face( occgeo.fmap(1) ), *_mesh )) + if (( _isViscousLayers2D ) || + ( !occgeo.fmap.IsEmpty() && + StdMeshers_ViscousLayers2D::HasProxyMesh( TopoDS::Face( occgeo.fmap(1) ), *_mesh ))) { if ( !internals.hasInternalVertexInFace() ) { FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment ); @@ -3097,7 +3163,7 @@ bool NETGENPlugin_Mesher::Compute() comment << text(ex); //err = 1; -- try to make volumes anyway } - catch (netgen::NgException exc) + catch (netgen::NgException& exc) { comment << text(exc); //err = 1; -- try to make volumes anyway @@ -3171,6 +3237,7 @@ bool NETGENPlugin_Mesher::Compute() const NETGENPlugin_SimpleHypothesis_3D* simple3d = dynamic_cast< const NETGENPlugin_SimpleHypothesis_3D* > ( _simpleHyp ); if ( simple3d ) { + _ngMesh->Compress(); if ( double vol = simple3d->GetMaxElementVolume() ) { // max volume mparams.maxh = pow( 72, 1/6. ) * pow( vol, 1/3. ); @@ -3213,18 +3280,18 @@ bool NETGENPlugin_Mesher::Compute() if(netgen::multithread.terminate) return false; - if ( comment.empty() ) // do not overwrite a previos error + if ( comment.empty() ) // do not overwrite a previous error comment << text(err); } catch (Standard_Failure& ex) { - if ( comment.empty() ) // do not overwrite a previos error + if ( comment.empty() ) // do not overwrite a previous error comment << text(ex); err = 1; } - catch (netgen::NgException exc) + catch (netgen::NgException& exc) { - if ( comment.empty() ) // do not overwrite a previos error + if ( comment.empty() ) // do not overwrite a previous error comment << text(exc); err = 1; } @@ -3245,17 +3312,17 @@ bool NETGENPlugin_Mesher::Compute() if(netgen::multithread.terminate) return false; - if ( comment.empty() ) // do not overwrite a previos error + if ( comment.empty() ) // do not overwrite a previous error comment << text(err); } catch (Standard_Failure& ex) { - if ( comment.empty() ) // do not overwrite a previos error + if ( comment.empty() ) // do not overwrite a previous error comment << text(ex); } - catch (netgen::NgException exc) + catch (netgen::NgException& exc) { - if ( comment.empty() ) // do not overwrite a previos error + if ( comment.empty() ) // do not overwrite a previous error comment << text(exc); } } @@ -3272,7 +3339,10 @@ bool NETGENPlugin_Mesher::Compute() { const netgen::Segment & seg = _ngMesh->LineSegment (i); if ( seg.epgeominfo[ 0 ].edgenr == 0 ) + { _ngMesh->DeleteSegment( i ); + initState._nbSegments--; + } } _ngMesh->Compress(); } @@ -3288,12 +3358,12 @@ bool NETGENPlugin_Mesher::Compute() } catch (Standard_Failure& ex) { - if ( comment.empty() ) // do not overwrite a previos error + if ( comment.empty() ) // do not overwrite a previous error comment << "Exception in netgen at passing to 2nd order "; } - catch (netgen::NgException exc) + catch (netgen::NgException& exc) { - if ( comment.empty() ) // do not overwrite a previos error + if ( comment.empty() ) // do not overwrite a previous error comment << exc.What(); } } @@ -3313,12 +3383,22 @@ bool NETGENPlugin_Mesher::Compute() 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 ); + nodeVec[i]=0; + } + for ( size_t i = nodeVec.size()-1; i > 0; --i ) // remove trailing removed nodes + if ( !nodeVec[i] ) + nodeVec.resize( i ); + else + break; + } } SMESH_ComputeErrorPtr readErr = ReadErrors(nodeVec); - if ( readErr && !readErr->myBadElements.empty() ) + if ( readErr && readErr->HasBadElems() ) { error = readErr; if ( !comment.empty() && !readErr->myComment.empty() ) comment += "\n"; @@ -3375,14 +3455,15 @@ bool NETGENPlugin_Mesher::Compute() SMESH_ComputeErrorPtr& smError = sm->GetComputeError(); if ( !smComputed && ( !smError || smError->IsOK() )) { - smError.reset( new SMESH_ComputeError( *error )); + smError = error; if ( nbVol && SMESH_Algo::GetMeshError( sm ) == SMESH_Algo::MEr_OK ) { smError->myName = COMPERR_WARNING; } - else if ( !smError->myBadElements.empty() ) // bad surface mesh + else if ( smError->HasBadElems() ) // bad surface mesh { - if ( !hasBadElemOnSolid( smError->myBadElements, sm )) + if ( !hasBadElemOnSolid + ( static_cast( smError.get() )->myBadElements, sm )) smError.reset(); } } @@ -3411,9 +3492,8 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) // Prepare OCC geometry // ------------------------- netgen::OCCGeometry occgeo; - list< SMESH_subMesh* > meshedSM[4]; // for 0-3 dimensions NETGENPlugin_Internals internals( *_mesh, _shape, _isVolume ); - PrepareOCCgeometry( occgeo, _shape, *_mesh, meshedSM, &internals ); + PrepareOCCgeometry( occgeo, _shape, *_mesh, 0, &internals ); bool tooManyElems = false; const int hugeNb = std::numeric_limits::max() / 100; @@ -3505,7 +3585,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) } // store nb of segments computed by Netgen - NCollection_Map linkMap; + TLinkMap linkMap; for (int i = 1; i <= ngMesh->GetNSeg(); ++i ) { const netgen::Segment& seg = ngMesh->LineSegment(i); @@ -3561,9 +3641,9 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) int nb1d = 0; if ( !tooManyElems ) { - TopTools_MapOfShape egdes; + TopTools_MapOfShape edges; for (TopExp_Explorer exp1(F,TopAbs_EDGE); exp1.More(); exp1.Next()) - if ( egdes.Add( exp1.Current() )) + if ( edges.Add( exp1.Current() )) nb1d += Edge2NbSeg.Find(exp1.Current()); } int nbFaces = tooManyElems ? hugeNb : int( 4*anArea / (mparams.maxh*mparams.maxh*sqrt(3.))); @@ -3632,7 +3712,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) return true; } -double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder, +double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* /*holder*/, const int * algoProgressTic, const double * algoProgress) const { @@ -3712,8 +3792,10 @@ double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder, SMESH_ComputeErrorPtr NETGENPlugin_Mesher::ReadErrors(const vector& nodeVec) { - SMESH_ComputeErrorPtr err = SMESH_ComputeError::New - (COMPERR_BAD_INPUT_MESH, "Some edges multiple times in surface mesh"); + if ( nodeVec.size() < 2 ) return SMESH_ComputeErrorPtr(); + SMESH_BadInputElements* err = + new SMESH_BadInputElements( nodeVec.back()->GetMesh(), COMPERR_BAD_INPUT_MESH, + "Some edges multiple times in surface mesh"); SMESH_File file("test.out"); vector two(2); vector three1(3), three2(3); @@ -3773,7 +3855,7 @@ NETGENPlugin_Mesher::ReadErrors(const vector& nodeVec) if ( nbBadElems ) nbBadElems++; // avoid warning: variable set but not used #endif - return err; + return SMESH_ComputeErrorPtr( err ); } //================================================================================ @@ -3790,10 +3872,10 @@ void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh ) ofstream outfile( pyFile, ios::out ); if ( !outfile ) return; - outfile << "import salome, SMESH" << endl - << "from salome.smesh import smeshBuilder" << endl - << "smesh = smeshBuilder.New(salome.myStudy)" << endl - << "mesh = smesh.Mesh()" << endl << endl; + outfile << "import salome, SMESH" << std::endl + << "from salome.smesh import smeshBuilder" << std::endl + << "smesh = smeshBuilder.New()" << std::endl + << "mesh = smesh.Mesh()" << std::endl << std::endl; using namespace netgen; PointIndex pi; @@ -3803,12 +3885,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++) @@ -3818,14 +3900,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; } } @@ -3835,7 +3917,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++) @@ -3843,9 +3925,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; + std::cout << "Write " << pyFile << std::endl; } //================================================================================ @@ -3966,7 +4048,7 @@ NETGENPlugin_Internals::NETGENPlugin_Internals( SMESH_Mesh& mesh, { _intShapes.insert( meshDS->ShapeToIndex( f.Current() )); - // egdes + // edges list< TopoDS_Shape > edges; for ( e.Init( f.Current(), TopAbs_EDGE ); e.More(); e.Next()) if ( SMESH_MesherHelper::NbAncestors( e.Current(), mesh, TopAbs_FACE ) > 1 ) @@ -4079,7 +4161,7 @@ void NETGENPlugin_Internals::findBorderElements( TIDSortedElemSet & borderElems { int nbDblNodes = 0; for ( int i = 0; i < nbNodes; ++i ) - nbDblNodes += isInternalShape( f->GetNode(i)->getshapeId() ); + nbDblNodes += isInternalShape( f->GetNode(i)->GetShapeID() ); if ( nbDblNodes ) suspectFaces[ nbDblNodes < 2 ].push_back( f ); nbSuspectFaces++; @@ -4297,7 +4379,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; + std::cout << "NOTE: netgen output is redirected to file " << _outputFileName << std::endl; #else std::cout.rdbuf( netgen::mycout->rdbuf() ); #endif @@ -4403,10 +4485,10 @@ void NETGENPlugin_NetgenLibWrapper::removeOutputFile() } string tmpDir = SALOMEDS_Tool::GetDirFromPath ( _outputFileName ); string aFileName = SALOMEDS_Tool::GetNameFromPath( _outputFileName ) + ".out"; - SALOMEDS::ListOfFileNames_var aFiles = new SALOMEDS::ListOfFileNames; - aFiles->length(1); - aFiles[0] = aFileName.c_str(); + SALOMEDS_Tool::ListOfFiles aFiles; + aFiles.reserve(1); + aFiles.push_back(aFileName.c_str()); - SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true ); + SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles, true ); } }