-// Copyright (C) 2007-2013 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
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "SMESHDS_Group.hxx"
#include "SMESHDS_Mesh.hxx"
#include "SMESH_Comment.hxx"
+#include "SMESH_ControlsDef.hxx"
#include "SMESH_Gen.hxx"
#include "SMESH_Group.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_MesherHelper.hxx"
+#include "SMESH_OctreeNode.hxx"
#include "SMESH_subMesh.hxx"
#include "Utils_SALOME_Exception.hxx"
#include "utilities.h"
+#include <BRepBndLib.hxx>
+#include <BRepClass_FaceClassifier.hxx>
+#include <BRepTools.hxx>
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx>
+#include <Bnd_B2d.hxx>
+#include <Bnd_Box.hxx>
+#include <GeomAPI_ProjectPointOnSurf.hxx>
+#include <GeomAdaptor_Surface.hxx>
+#include <Precision.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Compound.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Vertex.hxx>
-#include <Precision.hxx>
#include <numeric>
StdMeshers_Import_1D2D::StdMeshers_Import_1D2D(int hypId, int studyId, SMESH_Gen * gen)
:SMESH_2D_Algo(hypId, studyId, gen), _sourceHyp(0)
{
- MESSAGE("StdMeshers_Import_1D2D::StdMeshers_Import_1D2D");
_name = "Import_1D2D";
_shapeType = (1 << TopAbs_FACE);
_compatibleHypothesis.push_back("ImportSource2D");
_requireDiscreteBoundary = false;
+ _supportSubmeshes = true;
}
//=============================================================================
SMESHDS_Mesh* tgtMesh = theMesh.GetMeshDS();
const TopoDS_Face& geomFace = TopoDS::Face( theShape );
- const double faceTol = helper.MaxTolerance( geomFace );
- const int shapeID = tgtMesh->ShapeToIndex( geomFace );
+ const double faceTol = helper.MaxTolerance( geomFace );
+ const int shapeID = tgtMesh->ShapeToIndex( geomFace );
const bool toCheckOri = (helper.NbAncestors( geomFace, theMesh, TopAbs_SOLID ) == 1 );
+
Handle(Geom_Surface) surface = BRep_Tool::Surface( geomFace );
- const bool reverse =
- ( helper.GetSubShapeOri( tgtMesh->ShapeToMesh(), geomFace) == TopAbs_REVERSED );
+ const bool reverse =
+ ( helper.GetSubShapeOri( tgtMesh->ShapeToMesh(), geomFace ) == TopAbs_REVERSED );
gp_Pnt p; gp_Vec du, dv;
+ // BRepClass_FaceClassifier is most time consuming, so minimize its usage
+ BRepClass_FaceClassifier classifier;
+ Bnd_B2d bndBox2d;
+ Bnd_Box bndBox3d;
+ {
+ Standard_Real umin,umax,vmin,vmax;
+ BRepTools::UVBounds(geomFace,umin,umax,vmin,vmax);
+ gp_XY pmin( umin,vmin ), pmax( umax,vmax );
+ bndBox2d.Add( pmin );
+ bndBox2d.Add( pmax );
+ if ( helper.HasSeam() )
+ {
+ const int i = helper.GetPeriodicIndex();
+ pmin.SetCoord( i, helper.GetOtherParam( pmin.Coord( i )));
+ pmax.SetCoord( i, helper.GetOtherParam( pmax.Coord( i )));
+ bndBox2d.Add( pmin );
+ bndBox2d.Add( pmax );
+ }
+ bndBox2d.Enlarge( 1e-2 * Sqrt( bndBox2d.SquareExtent() ));
+
+ BRepBndLib::Add( geomFace, bndBox3d );
+ bndBox3d.Enlarge( 1e-2 * sqrt( bndBox3d.SquareExtent() ));
+ }
+
set<int> subShapeIDs;
subShapeIDs.insert( shapeID );
- // get nodes on vertices
- list < SMESH_TNodeXYZ > vertexNodes;
- list < SMESH_TNodeXYZ >::iterator vNIt;
+ // nodes already existing on sub-shapes of the FACE
+ TIDSortedNodeSet existingNodes;
+
+ // get/make nodes on vertices and add them to existingNodes
TopExp_Explorer exp( theShape, TopAbs_VERTEX );
for ( ; exp.More(); exp.Next() )
{
n = SMESH_Algo::VertexNode( v, tgtMesh );
if ( !n ) return false; // very strange
}
- vertexNodes.push_back( SMESH_TNodeXYZ( n ));
+ existingNodes.insert( n );
}
- // get EDGESs and their ids
+ // get EDGEs and their ids and get existing nodes on EDGEs
vector< TopoDS_Edge > edges;
for ( exp.Init( theShape, TopAbs_EDGE ); exp.More(); exp.Next() )
- if ( subShapeIDs.insert( tgtMesh->ShapeToIndex( exp.Current() )).second )
- edges.push_back( TopoDS::Edge( exp.Current() ));
+ {
+ const TopoDS_Edge & edge = TopoDS::Edge( exp.Current() );
+ if ( !SMESH_Algo::isDegenerated( edge ))
+ if ( subShapeIDs.insert( tgtMesh->ShapeToIndex( edge )).second )
+ {
+ edges.push_back( edge );
+ if ( SMESHDS_SubMesh* eSM = tgtMesh->MeshElements( edge ))
+ {
+ typedef SMDS_StdIterator< const SMDS_MeshNode*, SMDS_NodeIteratorPtr > iterator;
+ existingNodes.insert( iterator( eSM->GetNodes() ), iterator() );
+ }
+ }
+ }
+ // octree to find existing nodes
+ SMESH_OctreeNode existingNodeOcTr( existingNodes );
+ std::map<double, const SMDS_MeshNode*> dist2foundNodes;
// to count now many times a link between nodes encounters
map<TLink, int> linkCount;
map<TLink, int>::iterator link2Nb;
double minGroupTol = Precision::Infinite();
+ SMESH::Controls::ElementsOnShape onEdgeClassifier;
+ if ( helper.HasSeam() )
+ {
+ TopoDS_Compound edgesCompound;
+ BRep_Builder builder;
+ builder.MakeCompound( edgesCompound );
+ for ( size_t iE = 0; iE < edges.size(); ++iE )
+ builder.Add( edgesCompound, edges[ iE ]);
+ onEdgeClassifier.SetShape( edgesCompound, SMDSAbs_Node );
+ }
+
// =========================
// Import faces from groups
// =========================
StdMeshers_Import_1D::TNodeNodeMap* n2n;
StdMeshers_Import_1D::TElemElemMap* e2e;
- vector<const SMDS_MeshNode*> newNodes;
+ StdMeshers_Import_1D::TNodeNodeMap::iterator n2nIt;
+ pair< StdMeshers_Import_1D::TNodeNodeMap::iterator, bool > it_isnew;
+ vector<TopAbs_State> nodeState;
+ vector<const SMDS_MeshNode*> newNodes; // of a face
+ set <const SMDS_MeshNode*> bndNodes; // nodes classified ON
+ vector<bool> isNodeIn; // nodes classified IN, by node ID
+
for ( size_t iG = 0; iG < srcGroups.size(); ++iG )
{
const SMESHDS_GroupBase* srcGroup = srcGroups[iG]->GetGroupDS();
const double groupTol = 0.5 * sqrt( getMinElemSize2( srcGroup ));
minGroupTol = std::min( groupTol, minGroupTol );
+ //GeomAdaptor_Surface S( surface );
+ // const double clsfTol = Min( S.UResolution( 0.1 * groupTol ), -- issue 0023092
+ // S.VResolution( 0.1 * groupTol ));
+ const double clsfTol = BRep_Tool::Tolerance( geomFace );
+
+ if ( helper.HasSeam() )
+ onEdgeClassifier.SetMesh( srcMesh->GetMeshDS() );
+
SMDS_ElemIteratorPtr srcElems = srcGroup->GetElements();
- SMDS_MeshNode *tmpNode = helper.AddNode(0,0,0);
- gp_XY uv( Precision::Infinite(), Precision::Infinite() );
while ( srcElems->more() ) // loop on group contents
{
const SMDS_MeshElement* face = srcElems->next();
+
+ SMDS_MeshElement::iterator node = face->begin_nodes();
+ if ( bndBox3d.IsOut( SMESH_TNodeXYZ( *node )))
+ continue;
+
// find or create nodes of a new face
- newNodes.resize( face->NbNodes() );
+ nodeState.resize( face->NbNodes() );
+ newNodes.resize( nodeState.size() );
newNodes.back() = 0;
int nbCreatedNodes = 0;
- SMDS_MeshElement::iterator node = face->begin_nodes();
+ bool isOut = false, isIn = false; // if at least one node isIn - do not classify other nodes
for ( size_t i = 0; i < newNodes.size(); ++i, ++node )
{
- StdMeshers_Import_1D::TNodeNodeMap::iterator n2nIt =
- n2n->insert( make_pair( *node, (SMDS_MeshNode*)0 )).first;
- if ( n2nIt->second )
+ SMESH_TNodeXYZ nXYZ = *node;
+ nodeState[ i ] = TopAbs_UNKNOWN;
+ newNodes [ i ] = 0;
+
+ it_isnew = n2n->insert( make_pair( *node, (SMDS_MeshNode*)0 ));
+ n2nIt = it_isnew.first;
+
+ const SMDS_MeshNode* & newNode = n2nIt->second;
+ if ( !it_isnew.second && !newNode )
+ break; // a node is mapped to NULL - it is OUT of the FACE
+
+ if ( newNode )
{
- if ( !subShapeIDs.count( n2nIt->second->getshapeId() )) // node already on an EDGE
- break;
+ if ( !subShapeIDs.count( newNode->getshapeId() ))
+ break; // node is Imported onto other FACE
+ if ( newNode->GetID() < (int) isNodeIn.size() &&
+ isNodeIn[ newNode->GetID() ])
+ isIn = true;
+ if ( !isIn && bndNodes.count( *node ))
+ nodeState[ i ] = TopAbs_ON;
}
else
{
- // find an existing vertex node
- for ( vNIt = vertexNodes.begin(); vNIt != vertexNodes.end(); ++vNIt)
- if ( vNIt->SquareDistance( *node ) < groupTol * groupTol)
- {
- (*n2nIt).second = vNIt->_node;
- vertexNodes.erase( vNIt );
- break;
- }
+ // find a node pre-existing on EDGE or VERTEX
+ dist2foundNodes.clear();
+ existingNodeOcTr.NodesAround( nXYZ, dist2foundNodes, groupTol );
+ if ( !dist2foundNodes.empty() )
+ {
+ newNode = dist2foundNodes.begin()->second;
+ nodeState[ i ] = TopAbs_ON;
+ }
}
- if ( !n2nIt->second )
+
+ if ( !newNode )
{
- // find out if node lies on theShape
- tmpNode->setXYZ( (*node)->X(), (*node)->Y(), (*node)->Z());
- uv.SetCoord( Precision::Infinite(), Precision::Infinite() );
- if ( helper.CheckNodeUV( geomFace, tmpNode, uv, groupTol, /*force=*/true ))
+ // find out if node lies on the surface of theShape
+ gp_XY uv( Precision::Infinite(), 0 );
+ isOut = ( !helper.CheckNodeUV( geomFace, *node, uv, groupTol, /*force=*/true ) ||
+ bndBox2d.IsOut( uv ));
+ //int iCoo;
+ if ( !isOut && !isIn ) // classify
{
- SMDS_MeshNode* newNode = tgtMesh->AddNode( (*node)->X(), (*node)->Y(), (*node)->Z());
- n2nIt->second = newNode;
+ classifier.Perform( geomFace, uv, clsfTol );
+ nodeState[i] = classifier.State();
+ isOut = ( nodeState[i] == TopAbs_OUT );
+ if ( isOut && helper.IsOnSeam( uv ) && onEdgeClassifier.IsSatisfy( (*node)->GetID() ))
+ {
+ // uv.SetCoord( iCoo, helper.GetOtherParam( uv.Coord( iCoo )));
+ // classifier.Perform( geomFace, uv, clsfTol );
+ // nodeState[i] = classifier.State();
+ // isOut = ( nodeState[i] == TopAbs_OUT );
+ nodeState[i] = TopAbs_ON;
+ isOut = false;
+ }
+ }
+ if ( !isOut ) // create a new node
+ {
+ newNode = tgtMesh->AddNode( nXYZ.X(), nXYZ.Y(), nXYZ.Z());
tgtMesh->SetNodeOnFace( newNode, shapeID, uv.X(), uv.Y() );
nbCreatedNodes++;
+ if ( newNode->GetID() >= (int) isNodeIn.size() )
+ {
+ isNodeIn.push_back( false ); // allow allocate more than newNode->GetID()
+ isNodeIn.resize( newNode->GetID() + 1, false );
+ }
+ if ( nodeState[i] == TopAbs_ON )
+ bndNodes.insert( *node );
+ else if ( nodeState[i] != TopAbs_UNKNOWN )
+ isNodeIn[ newNode->GetID() ] = isIn = true;
}
}
- if ( !(newNodes[i] = n2nIt->second ))
+ if ( !(newNodes[i] = newNode ) || isOut )
break;
- }
+
+ } // loop on face nodes
+
if ( !newNodes.back() )
continue; // not all nodes of the face lie on theShape
+ if ( !isIn ) // if all nodes are on FACE boundary, a mesh face can be OUT
+ {
+ // check state of nodes created for other faces
+ for ( size_t i = 0; i < nodeState.size() && !isIn; ++i )
+ {
+ if ( nodeState[i] != TopAbs_UNKNOWN ) continue;
+ gp_XY uv = helper.GetNodeUV( geomFace, newNodes[i] );
+ classifier.Perform( geomFace, uv, clsfTol );
+ nodeState[i] = classifier.State();
+ isIn = ( nodeState[i] == TopAbs_IN );
+ }
+ if ( !isIn ) // classify face center
+ {
+ gp_XYZ gc( 0., 0., 0 );
+ for ( size_t i = 0; i < newNodes.size(); ++i )
+ gc += SMESH_TNodeXYZ( newNodes[i] );
+ gc /= newNodes.size();
+
+ TopLoc_Location loc;
+ GeomAPI_ProjectPointOnSurf& proj = helper.GetProjector( geomFace,
+ loc,
+ helper.MaxTolerance( geomFace ));
+ if ( !loc.IsIdentity() ) loc.Transformation().Inverted().Transforms( gc );
+ proj.Perform( gc );
+ if ( !proj.IsDone() || proj.NbPoints() < 1 )
+ continue;
+ Standard_Real U,V;
+ proj.LowerDistanceParameters(U,V);
+ gp_XY uv( U,V );
+ classifier.Perform( geomFace, uv, clsfTol );
+ if ( classifier.State() != TopAbs_IN )
+ continue;
+ }
+ }
+
// try to find already created face
SMDS_MeshElement * newFace = 0;
if ( nbCreatedNodes == 0 &&
tgtMesh->FindElement(newNodes, SMDSAbs_Face, /*noMedium=*/false))
- continue; // repeated face in source groups already created
+ continue; // repeated face in source groups already created
// check future face orientation
const int nbCorners = face->NbCornerNodes();
gp_Vec geomNorm;
do
{
- uv = helper.GetNodeUV( geomFace, newNodes[++iNode] );
+ gp_XY uv = helper.GetNodeUV( geomFace, newNodes[++iNode] );
surface->D1( uv.X(),uv.Y(), p, du,dv );
geomNorm = reverse ? dv^du : du^dv;
}
if ( geomNorm * meshNorm < 0 )
SMDS_MeshCell::applyInterlace
- ( SMDS_MeshCell::reverseSmdsOrder( face->GetEntityType() ), newNodes );
+ ( SMDS_MeshCell::reverseSmdsOrder( face->GetEntityType(), newNodes.size() ), newNodes );
}
// make a new face
medium = newNodes[i+nbCorners];
link2Nb = linkCount.insert( make_pair( TLink( n1, n2, medium ), 0)).first;
++link2Nb->second;
- // if ( link2Nb->second == 1 )
- // {
- // // measure link length
- // double len2 = SMESH_TNodeXYZ( n1 ).SquareDistance( n2 );
- // if ( len2 < minGroupTol )
- // minGroupTol = len2;
- // }
+ }
+ } // loop on group contents
+
+ // Remove OUT nodes from n2n map
+ for ( n2nIt = n2n->begin(); n2nIt != n2n->end(); )
+ if ( !n2nIt->second )
+ n2n->erase( n2nIt++ );
+ else
+ ++n2nIt;
+
+ } // loop on src groups
+
+ // remove free nodes created on EDGEs
+ {
+ set<const SMDS_MeshNode*>::iterator node = bndNodes.begin();
+ for ( ; node != bndNodes.end(); ++node )
+ {
+ n2nIt = n2n->find( *node );
+ const SMDS_MeshNode* newNode = n2nIt->second;
+ if ( newNode && newNode->NbInverseElements() == 0 )
+ {
+ tgtMesh->RemoveFreeNode( newNode, 0, false );
+ n2n->erase( n2nIt );
}
}
- helper.GetMeshDS()->RemoveNode(tmpNode);
}
// ==========================================================
// duplicated node on vertex
return error("Source elements overlap one another");
tgtFaceSM->RemoveNode( n, /*isNodeDeleted=*/false );
- tgtMesh->SetNodeOnEdge( (SMDS_MeshNode*)n, edges[iE], u );
+ tgtMesh->SetNodeOnEdge( n, edges[iE], u );
break;
}
nodesOnBoundary = subShapeIDs.count( n->getshapeId());
int sId = editor.FindShape( edge );
nbEdges += subShapeIDs.count( sId );
}
- if ( nbEdges < 2 )
+ if ( nbEdges < 2 && !helper.IsRealSeam( s ))
return false; // weird
if ( nbEdges > 2 )
return error( COMPERR_BAD_INPUT_MESH, "Source elements overlap one another");
seamHelper.SetSubShape( edges[ iE ]);
seamHelper.SetElementsOnShape( true );
- if ( (*checkedFaces.begin())->IsQuadratic() )
+ if ( !checkedFaces.empty() && (*checkedFaces.begin())->IsQuadratic() )
for ( set< const SMDS_MeshElement* >::iterator fIt = checkedFaces.begin();
fIt != checkedFaces.end(); ++fIt )
seamHelper.AddTLinks( static_cast<const SMDS_MeshFace*>( *fIt ));
for ( size_t iE = 0; iE < edges.size(); ++iE )
{
SMESH_subMesh * sm = theMesh.GetSubMesh( edges[iE] );
- if ( BRep_Tool::Degenerated( edges[iE] ))
- sm->SetIsAlwaysComputed( true );
+ // if ( SMESH_Algo::isDegenerated( edges[iE] ))
+ // sm->SetIsAlwaysComputed( true );
sm->ComputeStateEngine(SMESH_subMesh::CHECK_COMPUTE_STATE);
if ( sm->GetComputeState() != SMESH_subMesh::COMPUTE_OK )
- return error(SMESH_Comment("Failed to create segments on the edge ")
- << tgtMesh->ShapeToIndex( edges[iE ]));
+ return error(SMESH_Comment("Failed to create segments on the edge #") << sm->GetId());
}
// ============
set<const SMDS_MeshNode* > allNodes;
gp_XY uv;
double minGroupTol = 1e100;
- for ( int iG = 0; iG < srcGroups.size(); ++iG )
+ for ( size_t iG = 0; iG < srcGroups.size(); ++iG )
{
const SMESHDS_GroupBase* srcGroup = srcGroups[iG]->GetGroupDS();
const double groupTol = 0.5 * sqrt( getMinElemSize2( srcGroup ));
