-// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011 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
+// 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.
+// 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.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
+// SMESH SMESH_I : idl implementation based on 'SMESH' unit's classes
// File : SMESH_MeshEditor.hxx
// Created : Mon Apr 12 14:56:19 2004
// Author : Edward AGAPOV (eap)
#include "SMDS_MeshElement.hxx"
#include "SMESH_Controls.hxx"
#include "SMESH_Mesh.hxx"
-#include "SMESH_SequenceOfElemPtr.hxx"
-#include "SMESH_SequenceOfNode.hxx"
+#include "SMESH_TypeDefs.hxx"
#include <utilities.h>
class SMESH_MesherHelper;
-typedef std::map<const SMDS_MeshElement*,
- std::list<const SMDS_MeshElement*> > TElemOfElemListMap;
-typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> TNodeNodeMap;
-
-//!< Set of elements sorted by ID, to be used to assure predictability of edition
-typedef std::set< const SMDS_MeshElement*, TIDCompare > TIDSortedElemSet;
-typedef std::set< const SMDS_MeshNode*, TIDCompare > TIDSortedNodeSet;
-
-typedef pair< const SMDS_MeshNode*, const SMDS_MeshNode* > NLink;
-
-
//=======================================================================
/*!
* \brief Searcher for the node closest to point
std::vector< const SMDS_MeshElement* >& foundElems)=0;
};
-//=======================================================================
-/*!
- * \brief A sorted pair of nodes
- */
-//=======================================================================
-
-struct SMESH_TLink: public NLink
-{
- SMESH_TLink(const SMDS_MeshNode* n1, const SMDS_MeshNode* n2 ):NLink( n1, n2 )
- { if ( n1->GetID() < n2->GetID() ) std::swap( first, second ); }
- SMESH_TLink(const NLink& link ):NLink( link )
- { if ( first->GetID() < second->GetID() ) std::swap( first, second ); }
- const SMDS_MeshNode* node1() const { return first; }
- const SMDS_MeshNode* node2() const { return second; }
-};
-
-//=======================================================================
-/*!
- * \brief SMESH_TLink knowing its orientation
- */
-//=======================================================================
-
-struct SMESH_OrientedLink: public SMESH_TLink
-{
- bool _reversed;
- SMESH_OrientedLink(const SMDS_MeshNode* n1, const SMDS_MeshNode* n2 )
- : SMESH_TLink( n1, n2 ), _reversed( n1 != node1() ) {}
-};
-
// ============================================================
/*!
* \brief Editor of a mesh
class SMESH_EXPORT SMESH_MeshEditor
{
-public:
- //------------------------------------------
- /*!
- * \brief SMDS_MeshNode -> gp_XYZ convertor
- */
- //------------------------------------------
- struct TNodeXYZ : public gp_XYZ
- {
- const SMDS_MeshNode* _node;
- TNodeXYZ( const SMDS_MeshElement* e):gp_XYZ(0,0,0),_node(0) {
- if (e) {
- ASSERT( e->GetType() == SMDSAbs_Node );
- _node = static_cast<const SMDS_MeshNode*>(e);
- SetCoord( _node->X(), _node->Y(), _node->Z() );
- }
- }
- double Distance(const SMDS_MeshNode* n) const { return (TNodeXYZ( n )-*this).Modulus(); }
- double SquareDistance(const SMDS_MeshNode* n) const { return (TNodeXYZ( n )-*this).SquareModulus(); }
- bool operator==(const TNodeXYZ& other) const { return _node == other._node; }
- };
-
public:
SMESH_MeshEditor( SMESH_Mesh* theMesh );
* \param theCriterion - Is used to choose a neighbour to fuse with.
* \param theMaxAngle - Is a max angle between element normals at which fusion
* is still performed; theMaxAngle is mesured in radians.
- * \retval bool - Success or not.
+ * \return bool - Success or not.
*/
bool TriToQuad (TIDSortedElemSet & theElems,
SMESH::Controls::NumericalFunctorPtr theCriterion,
* \brief Split quadrangles into triangles.
* \param theElems - The faces to be splitted.
* \param theCriterion - Is used to choose a diagonal for splitting.
- * \retval bool - Success or not.
+ * \return bool - Success or not.
*/
bool QuadToTri (TIDSortedElemSet & theElems,
SMESH::Controls::NumericalFunctorPtr theCriterion);
* \brief Split quadrangles into triangles.
* \param theElems - The faces to be splitted.
* \param the13Diag - Is used to choose a diagonal for splitting.
- * \retval bool - Success or not.
+ * \return bool - Success or not.
*/
bool QuadToTri (TIDSortedElemSet & theElems,
const bool the13Diag);
* \brief Find better diagonal for splitting.
* \param theQuad - The face to find better splitting of.
* \param theCriterion - Is used to choose a diagonal for splitting.
- * \retval int - 1 for 1-3 diagonal, 2 for 2-4, -1 - for errors.
+ * \return int - 1 for 1-3 diagonal, 2 for 2-4, -1 - for errors.
*/
int BestSplit (const SMDS_MeshElement* theQuad,
SMESH::Controls::NumericalFunctorPtr theCriterion);
};
/*!
- * special structire for control of extrusion functionality
+ * special structure for control of extrusion functionality
*/
struct ExtrusParam {
gp_Dir myDir; // direction of extrusion
/*!
* Create new node in the mesh with given coordinates
- * (auxilary for advanced extrusion)
+ * (auxiliary for advanced extrusion)
*/
const SMDS_MeshNode* CreateNode(const double x,
const double y,
* Generate new elements by extrusion of theElements
* It is a method used in .idl file. All functionality
* is implemented in the next method (see below) which
- * is used in the cuurent method.
- * param theElems - list of elements for extrusion
- * param newElemsMap returns history of extrusion
- * param theFlags set flags for performing extrusion (see description
+ * is used in the current method.
+ * @param theElems - list of elements for extrusion
+ * @param newElemsMap returns history of extrusion
+ * @param theFlags set flags for performing extrusion (see description
* of enum ExtrusionFlags for additional information)
- * param theTolerance - uses for comparing locations of nodes if flag
+ * @param theTolerance - uses for comparing locations of nodes if flag
* EXTRUSION_FLAG_SEW is set
*/
PGroupIDs ExtrusionSweep (TIDSortedElemSet & theElems,
/*!
* Generate new elements by extrusion of theElements
- * param theElems - list of elements for extrusion
- * param newElemsMap returns history of extrusion
- * param theFlags set flags for performing extrusion (see description
+ * @param theElems - list of elements for extrusion
+ * @param newElemsMap returns history of extrusion
+ * @param theFlags set flags for performing extrusion (see description
* of enum ExtrusionFlags for additional information)
- * param theTolerance - uses for comparing locations of nodes if flag
+ * @param theTolerance - uses for comparing locations of nodes if flag
* EXTRUSION_FLAG_SEW is set
- * param theParams - special structure for manage of extrusion
+ * @param theParams - special structure for manage of extrusion
*/
PGroupIDs ExtrusionSweep (TIDSortedElemSet & theElems,
ExtrusParam& theParams,
SMESH_NodeSearcher* GetNodeSearcher();
/*!
- * \brief Return SMESH_ElementSearcher. The caller is responsible for deleteing it
+ * \brief Return SMESH_ElementSearcher. The caller is responsible for deleting it
*/
SMESH_ElementSearcher* GetElementSearcher();
+ SMESH_ElementSearcher* GetElementSearcher( SMDS_ElemIteratorPtr elemIt );
/*!
* \brief Return true if the point is IN or ON of the element
*/
// theBetweenNode1 - theBetweenNode2, between theBetweenNode1 and theBetweenNode2.
void ConvertToQuadratic(const bool theForce3d);
+ void ConvertToQuadratic(const bool theForce3d, TIDSortedElemSet& theElements);
// Converts all mesh to quadratic one, deletes old elements, replacing
// them with quadratic ones with the same id.
// If theForce3d = 1; this results in the medium node lying at the
// geometrical edge from which the mesh element is built
bool ConvertFromQuadratic();
+ void ConvertFromQuadratic(TIDSortedElemSet& theElements);
// Converts all mesh from quadratic to ordinary ones, deletes old quadratic elements, replacing
// them with ordinary mesh elements with the same id.
// Returns true in case of success, false otherwise.
* \param theSecondNode1 - a boundary node of set 1 linked with theFirstNode1
* \param theSecondNode2 - a node of set 2 corresponding to theSecondNode1
* \param nReplaceMap - output map of corresponding nodes
- * \retval Sew_Error - is a success or not
+ * \return Sew_Error - is a success or not
*/
static Sew_Error FindMatchingNodes(std::set<const SMDS_MeshElement*>& theSide1,
std::set<const SMDS_MeshElement*>& theSide2,
* \brief Returns true if given node is medium
* \param n - node to check
* \param typeToCheck - type of elements containing the node to ask about node status
- * \retval bool - check result
+ * \return bool - check result
*/
static bool IsMedium(const SMDS_MeshNode* node,
const SMDSAbs_ElementType typeToCheck = SMDSAbs_All);
const TIDSortedElemSet& theNodesNot,
const TopoDS_Shape& theShape );
+ double OrientedAngle(const gp_Pnt& p0, const gp_Pnt& p1, const gp_Pnt& g1, const gp_Pnt& g2);
+
bool DoubleNodesOnGroupBoundaries( const std::vector<TIDSortedElemSet>& theElems,
bool createJointElems);
+ bool CreateFlatElementsOnFacesGroups( const std::vector<TIDSortedElemSet>& theElems );
+
/*!
* \brief Generated skin mesh (containing 2D cells) from 3D mesh
* The created 2D mesh elements based on nodes of free faces of boundary volumes
enum Bnd_Dimension { BND_2DFROM3D, BND_1DFROM3D, BND_1DFROM2D };
- void MakeBoundaryMesh(const TIDSortedElemSet& elements,
- Bnd_Dimension dimension,
- SMESH_Group* group = 0,
- SMESH_Mesh* targetMesh = 0,
- bool toCopyElements = false,
- bool toCopyExistingBondary = false);
+ int MakeBoundaryMesh(const TIDSortedElemSet& elements,
+ Bnd_Dimension dimension,
+ SMESH_Group* group = 0,
+ SMESH_Mesh* targetMesh = 0,
+ bool toCopyElements = false,
+ bool toCopyExistingBondary = false,
+ bool toAddExistingBondary = false,
+ bool aroundElements = false);
-private:
+
+ private:
/*!
* \brief Convert elements contained in a submesh to quadratic
- * \retval int - nb of checked elements
+ * \return int - nb of checked elements
*/
int convertElemToQuadratic(SMESHDS_SubMesh * theSm,
SMESH_MesherHelper& theHelper,
/*!
* \brief Convert quadratic elements to linear ones and remove quadratic nodes
- * \retval int - nb of checked elements
+ * \return nb of checked elements
*/
int removeQuadElem( SMESHDS_SubMesh * theSm,
SMDS_ElemIteratorPtr theItr,
/*!
* \brief Create elements by sweeping an element
- * \param elem - element to sweep
- * \param newNodesItVec - nodes generated from each node of the element
- * \param newElems - generated elements
- * \param nbSteps - number of sweeping steps
- * \param srcElements - to append elem for each generated element
+ * \param elem - element to sweep
+ * \param newNodesItVec - nodes generated from each node of the element
+ * \param newElems - generated elements
+ * \param nbSteps - number of sweeping steps
+ * \param srcElements - to append elem for each generated element
*/
void sweepElement(const SMDS_MeshElement* elem,
const std::vector<TNodeOfNodeListMapItr> & newNodesItVec,
/*!
* \brief Create 1D and 2D elements around swept elements
- * \param mapNewNodes - source nodes and ones generated from them
- * \param newElemsMap - source elements and ones generated from them
- * \param elemNewNodesMap - nodes generated from each node of each element
- * \param elemSet - all swept elements
- * \param nbSteps - number of sweeping steps
- * \param srcElements - to append elem for each generated element
+ * \param mapNewNodes - source nodes and ones generated from them
+ * \param newElemsMap - source elements and ones generated from them
+ * \param elemNewNodesMap - nodes generated from each node of each element
+ * \param elemSet - all swept elements
+ * \param nbSteps - number of sweeping steps
+ * \param srcElements - to append elem for each generated element
*/
void makeWalls (TNodeOfNodeListMap & mapNewNodes,
TElemOfElemListMap & newElemsMap,