ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-30 19:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022124: [CEA 763] Projection 1D does not work with Netgen 1D2D

Browse Source 
- class StdMeshers_ProjectionUtils
+ namespace StdMeshers_ProjectionUtils

+  /*!
+   * \brief Returns an error message to show in case if MakeComputed( sm ) fails.
+   */
+  std::string SourceNotComputedError( SMESH_subMesh * sm = 0,
+                                      SMESH_Algo*     projAlgo=0);
This commit is contained in:
eap 2013-02-26 10:40:03 +00:00
parent 27bf438fc0
commit 46c3601d73
2 changed files with 214 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -31,15 +31,16 @@
#include "StdMeshers_ProjectionSource2D.hxx" #include "StdMeshers_ProjectionSource2D.hxx"
#include "StdMeshers_ProjectionSource3D.hxx" #include "StdMeshers_ProjectionSource3D.hxx"
#include "SMDS_EdgePosition.hxx"
#include "SMESH_Algo.hxx" #include "SMESH_Algo.hxx"
#include "SMESH_Block.hxx" #include "SMESH_Block.hxx"
#include "SMESH_Gen.hxx" #include "SMESH_Gen.hxx"
#include "SMESH_HypoFilter.hxx"
#include "SMESH_Hypothesis.hxx" #include "SMESH_Hypothesis.hxx"
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
#include "SMESH_MesherHelper.hxx" #include "SMESH_MesherHelper.hxx"
#include "SMESH_subMesh.hxx" #include "SMESH_subMesh.hxx"
#include "SMESH_subMeshEventListener.hxx" #include "SMESH_subMeshEventListener.hxx"
#include "SMDS_EdgePosition.hxx"
#include "utilities.h" #include "utilities.h"
@ -417,15 +418,15 @@ namespace {
} // namespace } // namespace
//======================================================================= //=======================================================================
/*! /*
* \brief Looks for association of all sub-shapes of two shapes * Looks for association of all sub-shapes of two shapes
* \param theShape1 - target shape * \param theShape1 - target shape
* \param theMesh1 - mesh built on shape 1 * \param theMesh1 - mesh built on shape 1
* \param theShape2 - source shape * \param theShape2 - source shape
* \param theMesh2 - mesh built on shape 2 * \param theMesh2 - mesh built on shape 2
* \param theAssociation - association map to be filled that may * \param theAssociation - association map to be filled that may
* contain association of one or two pairs of vertices * contain association of one or two pairs of vertices
* \retval bool - true if association found * \retval bool - true if association found
*/ */
//======================================================================= //=======================================================================
@ -1263,15 +1264,15 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
} }
//================================================================================ //================================================================================
/*! /*
* \brief Find association of edges of faces * Find association of edges of faces
* \param face1 - face 1 * \param face1 - face 1
* \param VV1 - vertices of face 1 * \param VV1 - vertices of face 1
* \param face2 - face 2 * \param face2 - face 2
* \param VV2 - vertices of face 2 associated with ones of face 1 * \param VV2 - vertices of face 2 associated with ones of face 1
* \param edges1 - out list of edges of face 1 * \param edges1 - out list of edges of face 1
* \param edges2 - out list of edges of face 2 * \param edges2 - out list of edges of face 2
* \retval int - nb of edges in an outer wire in a success case, else zero * \retval int - nb of edges in an outer wire in a success case, else zero
*/ */
//================================================================================ //================================================================================
@ -1500,12 +1501,12 @@ void StdMeshers_ProjectionUtils::InitVertexAssociation( const SMESH_Hypothesis*
} }
//======================================================================= //=======================================================================
/*! /*
* \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap * Inserts association theShape1 <-> theShape2 to TShapeShapeMap
* \param theShape1 - target shape * \param theShape1 - target shape
* \param theShape2 - source shape * \param theShape2 - source shape
* \param theAssociationMap - association map * \param theAssociationMap - association map
* \retval bool - true if there was no association for these shapes before * \retval bool - true if there was no association for these shapes before
*/ */
//======================================================================= //=======================================================================
@ -1526,12 +1527,12 @@ bool StdMeshers_ProjectionUtils::InsertAssociation( const TopoDS_Shape& theShape
} }
//======================================================================= //=======================================================================
/*! /*
* \brief Finds an edge by its vertices in a main shape of the mesh * Finds an edge by its vertices in a main shape of the mesh
* \param aMesh - the mesh * \param aMesh - the mesh
* \param V1 - vertex 1 * \param V1 - vertex 1
* \param V2 - vertex 2 * \param V2 - vertex 2
* \retval TopoDS_Edge - found edge * \retval TopoDS_Edge - found edge
*/ */
//======================================================================= //=======================================================================
@ -1554,12 +1555,12 @@ TopoDS_Edge StdMeshers_ProjectionUtils::GetEdgeByVertices( SMESH_Mesh*
} }
//================================================================================ //================================================================================
/*! /*
* \brief Return another face sharing an edge * Return another face sharing an edge
* \param edgeToFaces - data map of descendants to ancestors * \param edgeToFaces - data map of descendants to ancestors
* \param edge - edge * \param edge - edge
* \param face - face * \param face - face
* \retval TopoDS_Face - found face * \retval TopoDS_Face - found face
*/ */
//================================================================================ //================================================================================
@ -1580,8 +1581,8 @@ TopoDS_Face StdMeshers_ProjectionUtils::GetNextFace( const TAncestorMap& edgeToF
} }
//================================================================================ //================================================================================
/*! /*
* \brief Return other vertex of an edge * Return other vertex of an edge
*/ */
//================================================================================ //================================================================================
@ -1596,12 +1597,12 @@ TopoDS_Vertex StdMeshers_ProjectionUtils::GetNextVertex(const TopoDS_Edge& edg
} }
//================================================================================ //================================================================================
/*! /*
* \brief Return a propagation edge * Return a propagation edge
* \param aMesh - mesh * \param aMesh - mesh
* \param theEdge - edge to find by propagation * \param theEdge - edge to find by propagation
* \param fromEdge - start edge for propagation * \param fromEdge - start edge for propagation
* \retval pair<int,TopoDS_Edge> - propagation step and found edge * \retval pair<int,TopoDS_Edge> - propagation step and found edge
*/ */
//================================================================================ //================================================================================
@ -1680,16 +1681,16 @@ StdMeshers_ProjectionUtils::GetPropagationEdge( SMESH_Mesh* aMesh,
} }
//================================================================================ //================================================================================
/*! /*
* \brief Find corresponding nodes on two faces * Find corresponding nodes on two faces
* \param face1 - the first face * \param face1 - the first face
* \param mesh1 - mesh containing elements on the first face * \param mesh1 - mesh containing elements on the first face
* \param face2 - the second face * \param face2 - the second face
* \param mesh2 - mesh containing elements on the second face * \param mesh2 - mesh containing elements on the second face
* \param assocMap - map associating sub-shapes of the faces * \param assocMap - map associating sub-shapes of the faces
* \param node1To2Map - map containing found matching nodes * \param node1To2Map - map containing found matching nodes
* \retval bool - is a success * \retval bool - is a success
*/ */
//================================================================================ //================================================================================
bool StdMeshers_ProjectionUtils:: bool StdMeshers_ProjectionUtils::
@ -1702,7 +1703,7 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1,
{ {
SMESHDS_Mesh* meshDS1 = mesh1->GetMeshDS(); SMESHDS_Mesh* meshDS1 = mesh1->GetMeshDS();
SMESHDS_Mesh* meshDS2 = mesh2->GetMeshDS(); SMESHDS_Mesh* meshDS2 = mesh2->GetMeshDS();
SMESH_MesherHelper helper1( *mesh1 ); SMESH_MesherHelper helper1( *mesh1 );
SMESH_MesherHelper helper2( *mesh2 ); SMESH_MesherHelper helper2( *mesh2 );
@ -1996,23 +1997,23 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1,
node1To2Map.insert( make_pair( vNode1, vNode2 )); node1To2Map.insert( make_pair( vNode1, vNode2 ));
} }
// don't know why this condition is usually true :( // don't know why this condition is usually true :(
// if ( node1To2Map.size() * quadFactor < SM1->NbNodes() ) // if ( node1To2Map.size() * quadFactor < SM1->NbNodes() )
// MESSAGE("FindMatchingNodes() found too few node pairs starting from nodes (" // MESSAGE("FindMatchingNodes() found too few node pairs starting from nodes ("
// << vNode1->GetID() << " - " << eNode1[0]->GetID() << ") (" // << vNode1->GetID() << " - " << eNode1[0]->GetID() << ") ("
// << vNode2->GetID() << " - " << eNode2[0]->GetID() << "):" // << vNode2->GetID() << " - " << eNode2[0]->GetID() << "):"
// << node1To2Map.size() * quadFactor << " < " << SM1->NbNodes()); // << node1To2Map.size() * quadFactor << " < " << SM1->NbNodes());
return true; return true;
} }
//================================================================================ //================================================================================
/*! /*
* \brief Return any sub-shape of a face belonging to the outer wire * Return any sub-shape of a face belonging to the outer wire
* \param face - the face * \param face - the face
* \param type - type of sub-shape to return * \param type - type of sub-shape to return
* \retval TopoDS_Shape - the found sub-shape * \retval TopoDS_Shape - the found sub-shape
*/ */
//================================================================================ //================================================================================
TopoDS_Shape StdMeshers_ProjectionUtils::OuterShape( const TopoDS_Face& face, TopoDS_Shape StdMeshers_ProjectionUtils::OuterShape( const TopoDS_Face& face,
@ -2025,12 +2026,12 @@ TopoDS_Shape StdMeshers_ProjectionUtils::OuterShape( const TopoDS_Face& face,
} }
//================================================================================ //================================================================================
/*! /*
* \brief Check that submesh is computed and try to compute it if is not * Check that submesh is computed and try to compute it if is not
* \param sm - submesh to compute * \param sm - submesh to compute
* \param iterationNb - int used to stop infinite recursive call * \param iterationNb - int used to stop infinite recursive call
* \retval bool - true if computed * \retval bool - true if computed
*/ */
//================================================================================ //================================================================================
bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iterationNb) bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iterationNb)
@ -2107,9 +2108,45 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter
return false; return false;
} }
//================================================================================ //================================================================================
/*! /*
* \brief Return a boundary EDGE (or all boundary EDGEs) of edgeContainer * Returns an error message to show in case if MakeComputed( sm ) fails.
*/
//================================================================================
std::string StdMeshers_ProjectionUtils::SourceNotComputedError( SMESH_subMesh * sm,
SMESH_Algo* projAlgo )
{
const char usualMessage [] = "Source mesh not computed";
if ( !projAlgo )
return usualMessage;
if ( !sm || sm->GetAlgoState() != SMESH_subMesh::NO_ALGO )
return usualMessage; // algo is OK, anything else is KO.
// Try to find a type of all-dimentional algorithm that would compute the
// given sub-mesh if it could be launched before projection
const TopoDS_Shape shape = sm->GetSubShape();
const int shapeDim = SMESH_Gen::GetShapeDim( shape );
for ( int dimIncrement = 1; shapeDim + dimIncrement < 4; ++dimIncrement )
{
SMESH_HypoFilter filter( SMESH_HypoFilter::IsAlgo() );
filter.And( filter.HasDim( shapeDim + dimIncrement ));
SMESH_Algo* algo = (SMESH_Algo*) sm->GetFather()->GetHypothesis( shape, filter, true );
if ( algo && !algo->NeedDiscreteBoundary() )
return SMESH_Comment("\"")
<< algo->GetFeatures()._label << "\""
<< " can't be used to compute the source mesh for \""
<< projAlgo->GetFeatures()._label << "\" in this case";
}
return usualMessage;
}
//================================================================================
/*
* Return a boundary EDGE (or all boundary EDGEs) of edgeContainer
*/ */
//================================================================================ //================================================================================
@ -2195,11 +2232,11 @@ namespace { // Definition of event listeners
} }
//================================================================================ //================================================================================
/*! /*
* \brief Set event listeners to submesh with projection algo * Set event listeners to submesh with projection algo
* \param subMesh - submesh with projection algo * \param subMesh - submesh with projection algo
* \param srcShape - source shape * \param srcShape - source shape
* \param srcMesh - source mesh * \param srcMesh - source mesh
*/ */
//================================================================================ //================================================================================

185
src/StdMeshers/StdMeshers_ProjectionUtils.hxx
View File

@ -38,12 +38,13 @@
#include <list> #include <list>
#include <map> #include <map>
class TopoDS_Shape;
class SMDS_MeshNode; class SMDS_MeshNode;
class SMESH_Mesh; class SMESH_Algo;
class SMESH_Hypothesis; class SMESH_Hypothesis;
class SMESH_Mesh;
class SMESH_subMesh; class SMESH_subMesh;
class TopTools_IndexedDataMapOfShapeListOfShape; class TopTools_IndexedDataMapOfShapeListOfShape;
class TopoDS_Shape;
/*! /*!
* \brief Struct used instead of a sole TopTools_DataMapOfShapeShape to avoid * \brief Struct used instead of a sole TopTools_DataMapOfShapeShape to avoid
@ -69,149 +70,153 @@ struct StdMeshers_ShapeShapeBiDirectionMap
}; };
/*! /*!
* \brief Class encapsulating methods common to Projection algorithms * \brief Methods common to Projection algorithms
*/ */
class StdMeshers_ProjectionUtils namespace StdMeshers_ProjectionUtils
{ {
public:
typedef StdMeshers_ShapeShapeBiDirectionMap TShapeShapeMap; typedef StdMeshers_ShapeShapeBiDirectionMap TShapeShapeMap;
typedef TopTools_IndexedDataMapOfShapeListOfShape TAncestorMap; typedef TopTools_IndexedDataMapOfShapeListOfShape TAncestorMap;
typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> TNodeNodeMap; typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> TNodeNodeMap;
/*! /*!
* \brief Looks for association of all sub-shapes of two shapes * \brief Looks for association of all sub-shapes of two shapes
* \param theShape1 - shape 1 * \param theShape1 - shape 1
* \param theMesh1 - mesh built on shape 1 * \param theMesh1 - mesh built on shape 1
* \param theShape2 - shape 2 * \param theShape2 - shape 2
* \param theMesh2 - mesh built on shape 2 * \param theMesh2 - mesh built on shape 2
* \param theAssociation - association map to be filled that may * \param theAssociation - association map to be filled that may
* contain association of one or two pairs of vertices * contain association of one or two pairs of vertices
* \retval bool - true if association found * \retval bool - true if association found
*/ */
static bool FindSubShapeAssociation(const TopoDS_Shape& theShape1, bool FindSubShapeAssociation(const TopoDS_Shape& theShape1,
SMESH_Mesh* theMesh1, SMESH_Mesh* theMesh1,
const TopoDS_Shape& theShape2, const TopoDS_Shape& theShape2,
SMESH_Mesh* theMesh2, SMESH_Mesh* theMesh2,
TShapeShapeMap & theAssociationMap); TShapeShapeMap & theAssociationMap);
/*! /*!
* \brief Find association of edges of faces * \brief Find association of edges of faces
* \param face1 - face 1 * \param face1 - face 1
* \param VV1 - vertices of face 1 * \param VV1 - vertices of face 1
* \param face2 - face 2 * \param face2 - face 2
* \param VV2 - vertices of face 2 associated with oned of face 1 * \param VV2 - vertices of face 2 associated with oned of face 1
* \param edges1 - out list of edges of face 1 * \param edges1 - out list of edges of face 1
* \param edges2 - out list of edges of face 2 * \param edges2 - out list of edges of face 2
* \retval int - nb of edges in an outer wire in a success case, else zero * \retval int - nb of edges in an outer wire in a success case, else zero
*/ */
static int FindFaceAssociation(const TopoDS_Face& face1, int FindFaceAssociation(const TopoDS_Face& face1,
TopoDS_Vertex VV1[2], TopoDS_Vertex VV1[2],
const TopoDS_Face& face2, const TopoDS_Face& face2,
TopoDS_Vertex VV2[2], TopoDS_Vertex VV2[2],
std::list< TopoDS_Edge > & edges1, std::list< TopoDS_Edge > & edges1,
std::list< TopoDS_Edge > & edges2); std::list< TopoDS_Edge > & edges2);
/*! /*!
* \brief Insert vertex association defined by a hypothesis into a map * \brief Insert vertex association defined by a hypothesis into a map
* \param theHyp - hypothesis * \param theHyp - hypothesis
* \param theAssociationMap - association map * \param theAssociationMap - association map
* \param theTargetShape - the shape theHyp assigned to * \param theTargetShape - the shape theHyp assigned to
*/ */
static void InitVertexAssociation( const SMESH_Hypothesis* theHyp, void InitVertexAssociation( const SMESH_Hypothesis* theHyp,
TShapeShapeMap & theAssociationMap); TShapeShapeMap & theAssociationMap);
/*! /*!
* \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap * \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap
* \param theShape1 - target shape * \param theShape1 - target shape
* \param theShape2 - source shape * \param theShape2 - source shape
* \param theAssociationMap - association map * \param theAssociationMap - association map
* \param theBidirectional - if false, inserts theShape1 -> theShape2 association * \param theBidirectional - if false, inserts theShape1 -> theShape2 association
* \retval bool - true if there was no association for these shapes before * \retval bool - true if there was no association for these shapes before
*/ */
static bool InsertAssociation( const TopoDS_Shape& theShape1, // target bool InsertAssociation( const TopoDS_Shape& theShape1, // target
const TopoDS_Shape& theShape2, // source const TopoDS_Shape& theShape2, // source
TShapeShapeMap & theAssociationMap); TShapeShapeMap & theAssociationMap);
/*! /*!
* \brief Finds an edge by its vertices in a main shape of the mesh * \brief Finds an edge by its vertices in a main shape of the mesh
*/ */
static TopoDS_Edge GetEdgeByVertices( SMESH_Mesh* aMesh, TopoDS_Edge GetEdgeByVertices( SMESH_Mesh* aMesh,
const TopoDS_Vertex& V1, const TopoDS_Vertex& V1,
const TopoDS_Vertex& V2); const TopoDS_Vertex& V2);
/*! /*!
* \brief Return another face sharing an edge * \brief Return another face sharing an edge
* \param edgeToFaces - data map of descendants to ancestors * \param edgeToFaces - data map of descendants to ancestors
*/ */
static TopoDS_Face GetNextFace( const TAncestorMap& edgeToFaces, TopoDS_Face GetNextFace( const TAncestorMap& edgeToFaces,
const TopoDS_Edge& edge, const TopoDS_Edge& edge,
const TopoDS_Face& face); const TopoDS_Face& face);
/*! /*!
* \brief Return other vertex of an edge * \brief Return other vertex of an edge
*/ */
static TopoDS_Vertex GetNextVertex(const TopoDS_Edge& edge, TopoDS_Vertex GetNextVertex(const TopoDS_Edge& edge,
const TopoDS_Vertex& vertex); const TopoDS_Vertex& vertex);
/*! /*!
* \brief Return an oriented propagation edge * \brief Return an oriented propagation edge
* \param aMesh - mesh * \param aMesh - mesh
* \param fromEdge - start edge for propagation * \param fromEdge - start edge for propagation
* \retval pair<int,TopoDS_Edge> - propagation step and found edge * \retval pair<int,TopoDS_Edge> - propagation step and found edge
*/ */
static std::pair<int,TopoDS_Edge> GetPropagationEdge( SMESH_Mesh* aMesh, std::pair<int,TopoDS_Edge> GetPropagationEdge( SMESH_Mesh* aMesh,
const TopoDS_Edge& anEdge, const TopoDS_Edge& anEdge,
const TopoDS_Edge& fromEdge); const TopoDS_Edge& fromEdge);
/*! /*!
* \brief Find corresponding nodes on two faces * \brief Find corresponding nodes on two faces
* \param face1 - the first face * \param face1 - the first face
* \param mesh1 - mesh containing elements on the first face * \param mesh1 - mesh containing elements on the first face
* \param face2 - the second face * \param face2 - the second face
* \param mesh2 - mesh containing elements on the second face * \param mesh2 - mesh containing elements on the second face
* \param assocMap - map associating sub-shapes of the faces * \param assocMap - map associating sub-shapes of the faces
* \param nodeIn2OutMap - map containing found matching nodes * \param nodeIn2OutMap - map containing found matching nodes
* \retval bool - is a success * \retval bool - is a success
*/ */
static bool FindMatchingNodesOnFaces( const TopoDS_Face& face1, bool FindMatchingNodesOnFaces( const TopoDS_Face& face1,
SMESH_Mesh* mesh1, SMESH_Mesh* mesh1,
const TopoDS_Face& face2, const TopoDS_Face& face2,
SMESH_Mesh* mesh2, SMESH_Mesh* mesh2,
const TShapeShapeMap & assocMap, const TShapeShapeMap & assocMap,
TNodeNodeMap & nodeIn2OutMap); TNodeNodeMap & nodeIn2OutMap);
/*! /*!
* \brief Return any sub-shape of a face belonging to the outer wire * \brief Return any sub-shape of a face belonging to the outer wire
* \param face - the face * \param face - the face
* \param type - type of sub-shape to return * \param type - type of sub-shape to return
* \retval TopoDS_Shape - the found sub-shape * \retval TopoDS_Shape - the found sub-shape
*/ */
static TopoDS_Shape OuterShape( const TopoDS_Face& face, TopoDS_Shape OuterShape( const TopoDS_Face& face,
TopAbs_ShapeEnum type); TopAbs_ShapeEnum type);
/*! /*!
* \brief Check that submeshis is computed and try to compute it if is not * \brief Check that submeshis is computed and try to compute it if is not
* \param sm - submesh to compute * \param sm - submesh to compute
* \param iterationNb - int used to stop infinite recursive call * \param iterationNb - int used to stop infinite recursive call
* \retval bool - true if computed * \retval bool - true if computed
*/ */
static bool MakeComputed(SMESH_subMesh * sm, const int iterationNb = 0); bool MakeComputed(SMESH_subMesh * sm, const int iterationNb = 0);
/*!
* \brief Returns an error message to show in case if MakeComputed( sm ) fails.
*/
std::string SourceNotComputedError( SMESH_subMesh * sm = 0,
SMESH_Algo* projAlgo=0);
/*! /*!
* \brief Set event listeners to submesh with projection algo * \brief Set event listeners to submesh with projection algo
* \param subMesh - submesh with projection algo * \param subMesh - submesh with projection algo
* \param srcShape - source shape * \param srcShape - source shape
* \param srcMesh - source mesh * \param srcMesh - source mesh
*/ */
static void SetEventListener(SMESH_subMesh* subMesh, void SetEventListener(SMESH_subMesh* subMesh,
TopoDS_Shape srcShape, TopoDS_Shape srcShape,
SMESH_Mesh* srcMesh); SMESH_Mesh* srcMesh);
/*! /*!
* \brief Return a boundary EDGE (or all boundary EDGEs) of edgeContainer * \brief Return a boundary EDGE (or all boundary EDGEs) of edgeContainer
*/ */
static TopoDS_Edge GetBoundaryEdge(const TopoDS_Shape& edgeContainer, TopoDS_Edge GetBoundaryEdge(const TopoDS_Shape& edgeContainer,
const SMESH_Mesh& mesh, const SMESH_Mesh& mesh,
std::list< TopoDS_Edge >* allBndEdges = 0 ); std::list< TopoDS_Edge >* allBndEdges = 0 );
}; };
#endif #endif