//#define VTK_HAVE_POLYHEDRON
//#ifdef VTK_HAVE_POLYHEDRON
- #define VTK_MAXTYPE VTK_POLYHEDRON
+#define VTK_MAXTYPE VTK_POLYHEDRON
//#else
// #define VTK_MAXTYPE VTK_QUADRATIC_PYRAMID
//#endif
class SMDS_Downward;
class SMDS_Mesh;
+class SMDS_MeshVolume;
class SMDS_CellLinks: public vtkCellLinks
{
virtual void UpdateInformation();
virtual vtkPoints *GetPoints();
-//#ifdef VTK_HAVE_POLYHEDRON
+ //#ifdef VTK_HAVE_POLYHEDRON
int InsertNextLinkedCell(int type, int npts, vtkIdType *pts);
-//#endif
+ //#endif
int CellIdToDownId(int vtkCellId);
void setCellIdToDownId(int vtkCellId, int downId);
void ModifyCellNodes(int vtkVolId, std::map<int, int> localClonedNodeIds);
int getOrderedNodesOfFace(int vtkVolId, std::vector<vtkIdType>& orderedNodes);
void BuildLinks();
- bool extrudeVolumeFromFace(int vtkVolId,
- int domain1,
- int domain2,
- std::set<int>& originalNodes,
- std::map<int,std::map<int,int> >& nodeDomains,
- std::map<int,std::map<long,int> >& nodeQuadDomains);
+ SMDS_MeshVolume* extrudeVolumeFromFace(int vtkVolId, int domain1, int domain2, std::set<int>& originalNodes,
+ std::map<int, std::map<int, int> >& nodeDomains,
+ std::map<int, std::map<long,int> >& nodeQuadDomains);
vtkCellLinks* GetLinks()
{
return Links;
#include <numeric>
#include <limits>
#include <algorithm>
+#include <sstream>
#define cast2Node(elem) static_cast<const SMDS_MeshNode*>( elem )
* \param theCopy - if true, create translated copies of theElems
* \param theMakeGroups - if true and theCopy, create translated groups
* \param theTargetMesh - mesh to copy translated elements into
- * \retval SMESH_MeshEditor::PGroupIDs - list of ids of created groups
+ * \return SMESH_MeshEditor::PGroupIDs - list of ids of created groups
*/
//================================================================================
//=======================================================================
/*!
* \brief Convert elements contained in a submesh to quadratic
- * \retval int - nb of checked elements
+ * \return int - nb of checked elements
*/
//=======================================================================
//=======================================================================
/*!
* \brief Convert quadratic elements to linear ones and remove quadratic nodes
- * \retval int - nb of checked elements
+ * \return int - nb of checked elements
*/
//=======================================================================
* \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 bool - is a success or not
+ * \return bool - is a success or not
*/
//================================================================================
* The nodes of the internal faces at the boundaries of the groups are doubled.
* In option, the internal faces are replaced by flat elements.
* Triangles are transformed in prisms, and quadrangles in hexahedrons.
+ * The flat elements are stored in groups of volumes.
* @param theElems - list of groups of volumes, where a group of volume is a set of
* SMDS_MeshElements sorted by Id.
* @param createJointElems - if TRUE, create the elements
// (domain1 X domain2) = domain1 + MAXINT*domain2
std::map<int, std::map<long,int> > nodeQuadDomains;
+ std::map<std::string, SMESH_Group*> mapOfJunctionGroups;
if (createJointElems)
{
itface = faceDomains.begin();
- for( ; itface != faceDomains.end();++itface )
+ for (; itface != faceDomains.end(); ++itface)
{
DownIdType face = itface->first;
std::set<int> oldNodes;
oldNodes.clear();
grid->GetNodeIds(oldNodes, face.cellId, face.cellType);
- std::map<int,int> domvol = itface->second;
- std::map<int,int>::iterator itdom = domvol.begin();
+ std::map<int, int> domvol = itface->second;
+ std::map<int, int>::iterator itdom = domvol.begin();
int dom1 = itdom->first;
int vtkVolId = itdom->second;
itdom++;
int dom2 = itdom->first;
- grid->extrudeVolumeFromFace(vtkVolId, dom1, dom2, oldNodes, nodeDomains, nodeQuadDomains);
+ SMDS_MeshVolume *vol = grid->extrudeVolumeFromFace(vtkVolId, dom1, dom2, oldNodes, nodeDomains,
+ nodeQuadDomains);
+ stringstream grpname;
+ grpname << "junction_";
+ if (dom1 < dom2)
+ grpname << dom1 << "_" << dom2;
+ else
+ grpname << dom2 << "_" << dom1;
+ int idg;
+ string namegrp = grpname.str();
+ if (!mapOfJunctionGroups.count(namegrp))
+ mapOfJunctionGroups[namegrp] = this->myMesh->AddGroup(SMDSAbs_Volume, namegrp.c_str(), idg);
+ SMESHDS_Group *sgrp = dynamic_cast<SMESHDS_Group*>(mapOfJunctionGroups[namegrp]->GetGroupDS());
+ if (sgrp)
+ sgrp->Add(vol->GetID());
}
}
else
for (int idom = orderDom.size()-1; idom >=0; idom--)
orderedNodes.push_back( nodeDomains[nodes[ino]][orderDom[idom]] );
- this->GetMeshDS()->AddVolumeFromVtkIds(orderedNodes);
+ SMDS_MeshVolume* vol = this->GetMeshDS()->AddVolumeFromVtkIds(orderedNodes);
+
+ stringstream grpname;
+ grpname << "junction_";
+ grpname << 0 << "_" << 0;
+ int idg;
+ string namegrp = grpname.str();
+ if (!mapOfJunctionGroups.count(namegrp))
+ mapOfJunctionGroups[namegrp] = this->myMesh->AddGroup(SMDSAbs_Volume, namegrp.c_str(), idg);
+ SMESHDS_Group *sgrp = dynamic_cast<SMESHDS_Group*>(mapOfJunctionGroups[namegrp]->GetGroupDS());
+ if (sgrp)
+ sgrp->Add(vol->GetID());
}
else
{
// 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)
* \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 );
* \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);
/*!
* \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,
