ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-03 23:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

PR: DoubleNodesOnGroupBoundaries in progress

Browse Source
This commit is contained in:
prascle 2011-03-28 14:46:16 +00:00
parent 9e3ba593d5
commit 4ac8d07584
6 changed files with 82 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/salome/tui/doxyfile.in
View File

@ -262,4 +262,4 @@ DOT_CLEANUP = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Configuration::additions related to the search engine # Configuration::additions related to the search engine
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
SEARCHENGINE = NO SEARCHENGINE = YES

3
src/SMDS/SMDS_UnstructuredGrid.cxx
View File

@ -3,6 +3,7 @@
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "SMDS_MeshInfo.hxx" #include "SMDS_MeshInfo.hxx"
#include "SMDS_Downward.hxx" #include "SMDS_Downward.hxx"
#include "SMDS_MeshVolume.hxx"
#include "utilities.h" #include "utilities.h"
@ -924,7 +925,7 @@ void SMDS_UnstructuredGrid::BuildLinks()
* @param nodeDomains: map(original id --> map(domain --> duplicated node id)) * @param nodeDomains: map(original id --> map(domain --> duplicated node id))
* @return ok if success. * @return ok if success.
*/ */
bool SMDS_UnstructuredGrid::extrudeVolumeFromFace(int vtkVolId, SMDS_MeshVolume* SMDS_UnstructuredGrid::extrudeVolumeFromFace(int vtkVolId,
int domain1, int domain1,
int domain2, int domain2,
std::set<int>& originalNodes, std::set<int>& originalNodes,

16
src/SMDS/SMDS_UnstructuredGrid.hxx
View File

@ -18,7 +18,7 @@
//#define VTK_HAVE_POLYHEDRON //#define VTK_HAVE_POLYHEDRON
//#ifdef VTK_HAVE_POLYHEDRON //#ifdef VTK_HAVE_POLYHEDRON
#define VTK_MAXTYPE VTK_POLYHEDRON #define VTK_MAXTYPE VTK_POLYHEDRON
//#else //#else
// #define VTK_MAXTYPE VTK_QUADRATIC_PYRAMID // #define VTK_MAXTYPE VTK_QUADRATIC_PYRAMID
//#endif //#endif
@ -30,6 +30,7 @@
class SMDS_Downward; class SMDS_Downward;
class SMDS_Mesh; class SMDS_Mesh;
class SMDS_MeshVolume;
class SMDS_CellLinks: public vtkCellLinks class SMDS_CellLinks: public vtkCellLinks
{ {
@ -54,9 +55,9 @@ public:
virtual void UpdateInformation(); virtual void UpdateInformation();
virtual vtkPoints *GetPoints(); virtual vtkPoints *GetPoints();
//#ifdef VTK_HAVE_POLYHEDRON //#ifdef VTK_HAVE_POLYHEDRON
int InsertNextLinkedCell(int type, int npts, vtkIdType *pts); int InsertNextLinkedCell(int type, int npts, vtkIdType *pts);
//#endif //#endif
int CellIdToDownId(int vtkCellId); int CellIdToDownId(int vtkCellId);
void setCellIdToDownId(int vtkCellId, int downId); void setCellIdToDownId(int vtkCellId, int downId);
@ -68,12 +69,9 @@ public:
void ModifyCellNodes(int vtkVolId, std::map<int, int> localClonedNodeIds); void ModifyCellNodes(int vtkVolId, std::map<int, int> localClonedNodeIds);
int getOrderedNodesOfFace(int vtkVolId, std::vector<vtkIdType>& orderedNodes); int getOrderedNodesOfFace(int vtkVolId, std::vector<vtkIdType>& orderedNodes);
void BuildLinks(); void BuildLinks();
bool extrudeVolumeFromFace(int vtkVolId, SMDS_MeshVolume* extrudeVolumeFromFace(int vtkVolId, int domain1, int domain2, std::set<int>& originalNodes,
int domain1, std::map<int, std::map<int, int> >& nodeDomains,
int domain2, std::map<int, std::map<long,int> >& nodeQuadDomains);
std::set<int>& originalNodes,
std::map<int,std::map<int,int> >& nodeDomains,
std::map<int,std::map<long,int> >& nodeQuadDomains);
vtkCellLinks* GetLinks() vtkCellLinks* GetLinks()
{ {
return Links; return Links;

46
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -95,6 +95,7 @@
#include <numeric> #include <numeric>
#include <limits> #include <limits>
#include <algorithm> #include <algorithm>
#include <sstream>
#define cast2Node(elem) static_cast<const SMDS_MeshNode*>( elem ) #define cast2Node(elem) static_cast<const SMDS_MeshNode*>( elem )
@ -5307,7 +5308,7 @@ void SMESH_MeshEditor::LinearAngleVariation(const int nbSteps,
* \param theCopy - if true, create translated copies of theElems * \param theCopy - if true, create translated copies of theElems
* \param theMakeGroups - if true and theCopy, create translated groups * \param theMakeGroups - if true and theCopy, create translated groups
* \param theTargetMesh - mesh to copy translated elements into * \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
*/ */
//================================================================================ //================================================================================
@ -9184,7 +9185,7 @@ void SMESH_MeshEditor::UpdateVolumes (const SMDS_MeshNode* theBetweenNode
//======================================================================= //=======================================================================
/*! /*!
* \brief Convert elements contained in a submesh to quadratic * \brief Convert elements contained in a submesh to quadratic
* \retval int - nb of checked elements * \return int - nb of checked elements
*/ */
//======================================================================= //=======================================================================
@ -9536,7 +9537,7 @@ void SMESH_MeshEditor::ConvertToQuadratic(const bool theForce3d,
//======================================================================= //=======================================================================
/*! /*!
* \brief Convert quadratic elements to linear ones and remove quadratic nodes * \brief Convert quadratic elements to linear ones and remove quadratic nodes
* \retval int - nb of checked elements * \return int - nb of checked elements
*/ */
//======================================================================= //=======================================================================
@ -10337,7 +10338,7 @@ SMESH_MeshEditor::SewSideElements (TIDSortedElemSet& theSide1,
* \param theSecondNode1 - a boundary node of set 1 linked with theFirstNode1 * \param theSecondNode1 - a boundary node of set 1 linked with theFirstNode1
* \param theSecondNode2 - a node of set 2 corresponding to theSecondNode1 * \param theSecondNode2 - a node of set 2 corresponding to theSecondNode1
* \param nReplaceMap - output map of corresponding nodes * \param nReplaceMap - output map of corresponding nodes
* \retval bool - is a success or not * \return bool - is a success or not
*/ */
//================================================================================ //================================================================================
@ -10847,6 +10848,7 @@ double SMESH_MeshEditor::OrientedAngle(const gp_Pnt& p0, const gp_Pnt& p1, const
* The nodes of the internal faces at the boundaries of the groups are doubled. * The nodes of the internal faces at the boundaries of the groups are doubled.
* In option, the internal faces are replaced by flat elements. * In option, the internal faces are replaced by flat elements.
* Triangles are transformed in prisms, and quadrangles in hexahedrons. * 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 * @param theElems - list of groups of volumes, where a group of volume is a set of
* SMDS_MeshElements sorted by Id. * SMDS_MeshElements sorted by Id.
* @param createJointElems - if TRUE, create the elements * @param createJointElems - if TRUE, create the elements
@ -11125,11 +11127,12 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
// (domain1 X domain2) = domain1 + MAXINT*domain2 // (domain1 X domain2) = domain1 + MAXINT*domain2
std::map<int, std::map<long,int> > nodeQuadDomains; std::map<int, std::map<long,int> > nodeQuadDomains;
std::map<std::string, SMESH_Group*> mapOfJunctionGroups;
if (createJointElems) if (createJointElems)
{ {
itface = faceDomains.begin(); itface = faceDomains.begin();
for( ; itface != faceDomains.end();++itface ) for (; itface != faceDomains.end(); ++itface)
{ {
DownIdType face = itface->first; DownIdType face = itface->first;
std::set<int> oldNodes; std::set<int> oldNodes;
@ -11137,13 +11140,27 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
oldNodes.clear(); oldNodes.clear();
grid->GetNodeIds(oldNodes, face.cellId, face.cellType); grid->GetNodeIds(oldNodes, face.cellId, face.cellType);
std::map<int,int> domvol = itface->second; std::map<int, int> domvol = itface->second;
std::map<int,int>::iterator itdom = domvol.begin(); std::map<int, int>::iterator itdom = domvol.begin();
int dom1 = itdom->first; int dom1 = itdom->first;
int vtkVolId = itdom->second; int vtkVolId = itdom->second;
itdom++; itdom++;
int dom2 = itdom->first; 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());
} }
} }
@ -11168,7 +11185,18 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
else else
for (int idom = orderDom.size()-1; idom >=0; idom--) for (int idom = orderDom.size()-1; idom >=0; idom--)
orderedNodes.push_back( nodeDomains[nodes[ino]][orderDom[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 else
{ {

66
src/SMESH/SMESH_MeshEditor.hxx
View File

@ -20,7 +20,7 @@
// 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 // File : SMESH_MeshEditor.hxx
// Created : Mon Apr 12 14:56:19 2004 // Created : Mon Apr 12 14:56:19 2004
// Author : Edward AGAPOV (eap) // Author : Edward AGAPOV (eap)
@ -149,7 +149,7 @@ public:
* \param theCriterion - Is used to choose a neighbour to fuse with. * \param theCriterion - Is used to choose a neighbour to fuse with.
* \param theMaxAngle - Is a max angle between element normals at which fusion * \param theMaxAngle - Is a max angle between element normals at which fusion
* is still performed; theMaxAngle is mesured in radians. * is still performed; theMaxAngle is mesured in radians.
* \retval bool - Success or not. * \return bool - Success or not.
*/ */
bool TriToQuad (TIDSortedElemSet & theElems, bool TriToQuad (TIDSortedElemSet & theElems,
SMESH::Controls::NumericalFunctorPtr theCriterion, SMESH::Controls::NumericalFunctorPtr theCriterion,
@ -159,7 +159,7 @@ public:
* \brief Split quadrangles into triangles. * \brief Split quadrangles into triangles.
* \param theElems - The faces to be splitted. * \param theElems - The faces to be splitted.
* \param theCriterion - Is used to choose a diagonal for splitting. * \param theCriterion - Is used to choose a diagonal for splitting.
* \retval bool - Success or not. * \return bool - Success or not.
*/ */
bool QuadToTri (TIDSortedElemSet & theElems, bool QuadToTri (TIDSortedElemSet & theElems,
SMESH::Controls::NumericalFunctorPtr theCriterion); SMESH::Controls::NumericalFunctorPtr theCriterion);
@ -168,7 +168,7 @@ public:
* \brief Split quadrangles into triangles. * \brief Split quadrangles into triangles.
* \param theElems - The faces to be splitted. * \param theElems - The faces to be splitted.
* \param the13Diag - Is used to choose a diagonal for splitting. * \param the13Diag - Is used to choose a diagonal for splitting.
* \retval bool - Success or not. * \return bool - Success or not.
*/ */
bool QuadToTri (TIDSortedElemSet & theElems, bool QuadToTri (TIDSortedElemSet & theElems,
const bool the13Diag); const bool the13Diag);
@ -177,7 +177,7 @@ public:
* \brief Find better diagonal for splitting. * \brief Find better diagonal for splitting.
* \param theQuad - The face to find better splitting of. * \param theQuad - The face to find better splitting of.
* \param theCriterion - Is used to choose a diagonal for splitting. * \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, int BestSplit (const SMDS_MeshElement* theQuad,
SMESH::Controls::NumericalFunctorPtr theCriterion); SMESH::Controls::NumericalFunctorPtr theCriterion);
@ -230,7 +230,7 @@ public:
}; };
/*! /*!
* special structire for control of extrusion functionality * special structure for control of extrusion functionality
*/ */
struct ExtrusParam { struct ExtrusParam {
gp_Dir myDir; // direction of extrusion gp_Dir myDir; // direction of extrusion
@ -240,7 +240,7 @@ public:
/*! /*!
* Create new node in the mesh with given coordinates * 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 SMDS_MeshNode* CreateNode(const double x,
const double y, const double y,
@ -252,12 +252,12 @@ public:
* Generate new elements by extrusion of theElements * Generate new elements by extrusion of theElements
* It is a method used in .idl file. All functionality * It is a method used in .idl file. All functionality
* is implemented in the next method (see below) which * is implemented in the next method (see below) which
* is used in the cuurent method. * is used in the current method.
* param theElems - list of elements for extrusion * @param theElems - list of elements for extrusion
* param newElemsMap returns history of extrusion * @param newElemsMap returns history of extrusion
* param theFlags set flags for performing extrusion (see description * @param theFlags set flags for performing extrusion (see description
* of enum ExtrusionFlags for additional information) * 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 * EXTRUSION_FLAG_SEW is set
*/ */
PGroupIDs ExtrusionSweep (TIDSortedElemSet & theElems, PGroupIDs ExtrusionSweep (TIDSortedElemSet & theElems,
@ -270,13 +270,13 @@ public:
/*! /*!
* Generate new elements by extrusion of theElements * Generate new elements by extrusion of theElements
* param theElems - list of elements for extrusion * @param theElems - list of elements for extrusion
* param newElemsMap returns history of extrusion * @param newElemsMap returns history of extrusion
* param theFlags set flags for performing extrusion (see description * @param theFlags set flags for performing extrusion (see description
* of enum ExtrusionFlags for additional information) * 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 * 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, PGroupIDs ExtrusionSweep (TIDSortedElemSet & theElems,
ExtrusParam& theParams, ExtrusParam& theParams,
@ -342,7 +342,7 @@ public:
SMESH_NodeSearcher* GetNodeSearcher(); 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();
SMESH_ElementSearcher* GetElementSearcher( SMDS_ElemIteratorPtr elemIt ); SMESH_ElementSearcher* GetElementSearcher( SMDS_ElemIteratorPtr elemIt );
@ -523,7 +523,7 @@ public:
* \param theSecondNode1 - a boundary node of set 1 linked with theFirstNode1 * \param theSecondNode1 - a boundary node of set 1 linked with theFirstNode1
* \param theSecondNode2 - a node of set 2 corresponding to theSecondNode1 * \param theSecondNode2 - a node of set 2 corresponding to theSecondNode1
* \param nReplaceMap - output map of corresponding nodes * \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, static Sew_Error FindMatchingNodes(std::set<const SMDS_MeshElement*>& theSide1,
std::set<const SMDS_MeshElement*>& theSide2, std::set<const SMDS_MeshElement*>& theSide2,
@ -537,7 +537,7 @@ public:
* \brief Returns true if given node is medium * \brief Returns true if given node is medium
* \param n - node to check * \param n - node to check
* \param typeToCheck - type of elements containing the node to ask about node status * \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, static bool IsMedium(const SMDS_MeshNode* node,
const SMDSAbs_ElementType typeToCheck = SMDSAbs_All); const SMDSAbs_ElementType typeToCheck = SMDSAbs_All);
@ -593,7 +593,7 @@ public:
/*! /*!
* \brief Convert elements contained in a submesh to quadratic * \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, int convertElemToQuadratic(SMESHDS_SubMesh * theSm,
SMESH_MesherHelper& theHelper, SMESH_MesherHelper& theHelper,
@ -601,7 +601,7 @@ public:
/*! /*!
* \brief Convert quadratic elements to linear ones and remove quadratic nodes * \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, int removeQuadElem( SMESHDS_SubMesh * theSm,
SMDS_ElemIteratorPtr theItr, SMDS_ElemIteratorPtr theItr,
@ -625,11 +625,11 @@ public:
/*! /*!
* \brief Create elements by sweeping an element * \brief Create elements by sweeping an element
* \param elem - element to sweep * \param elem - element to sweep
* \param newNodesItVec - nodes generated from each node of the element * \param newNodesItVec - nodes generated from each node of the element
* \param newElems - generated elements * \param newElems - generated elements
* \param nbSteps - number of sweeping steps * \param nbSteps - number of sweeping steps
* \param srcElements - to append elem for each generated element * \param srcElements - to append elem for each generated element
*/ */
void sweepElement(const SMDS_MeshElement* elem, void sweepElement(const SMDS_MeshElement* elem,
const std::vector<TNodeOfNodeListMapItr> & newNodesItVec, const std::vector<TNodeOfNodeListMapItr> & newNodesItVec,
@ -639,12 +639,12 @@ public:
/*! /*!
* \brief Create 1D and 2D elements around swept elements * \brief Create 1D and 2D elements around swept elements
* \param mapNewNodes - source nodes and ones generated from them * \param mapNewNodes - source nodes and ones generated from them
* \param newElemsMap - source elements 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 elemNewNodesMap - nodes generated from each node of each element
* \param elemSet - all swept elements * \param elemSet - all swept elements
* \param nbSteps - number of sweeping steps * \param nbSteps - number of sweeping steps
* \param srcElements - to append elem for each generated element * \param srcElements - to append elem for each generated element
*/ */
void makeWalls (TNodeOfNodeListMap & mapNewNodes, void makeWalls (TNodeOfNodeListMap & mapNewNodes,
TElemOfElemListMap & newElemsMap, TElemOfElemListMap & newElemsMap,

2
src/SMESH_I/SMESH_MeshEditor_i.cxx
View File

@ -5588,6 +5588,7 @@ CORBA::Boolean SMESH_MeshEditor_i::Make2DMeshFrom3D()
* The nodes of the internal faces at the boundaries of the groups are doubled. * The nodes of the internal faces at the boundaries of the groups are doubled.
* In option, the internal faces are replaced by flat elements. * In option, the internal faces are replaced by flat elements.
* Triangles are transformed in prisms, and quadrangles in hexahedrons. * Triangles are transformed in prisms, and quadrangles in hexahedrons.
* The flat elements are stored in groups of volumes.
* @param theDomains - list of groups of volumes * @param theDomains - list of groups of volumes
* @param createJointElems - if TRUE, create the elements * @param createJointElems - if TRUE, create the elements
* @return TRUE if operation has been completed successfully, FALSE otherwise * @return TRUE if operation has been completed successfully, FALSE otherwise
@ -5620,6 +5621,7 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodesOnGroupBoundaries( const SMESH::Li
} }
bool aResult = aMeshEditor.DoubleNodesOnGroupBoundaries( domains, createJointElems ); bool aResult = aMeshEditor.DoubleNodesOnGroupBoundaries( domains, createJointElems );
// TODO publish the groups of flat elements in study
storeResult( aMeshEditor) ; storeResult( aMeshEditor) ;
myMesh->GetMeshDS()->Modified(); myMesh->GetMeshDS()->Modified();