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

bos #24368 EDF 23667 - Duplicates nodes

Browse Source 
+  Suppress warnings
This commit is contained in:
eap 2021-07-07 14:58:51 +03:00
parent d5aa4efde2
commit 882ff39283
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
View File

@ -70,7 +70,7 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
SCRUTE(nb_of_volumes); SCRUTE(nb_of_volumes);
//fprintf(stdout, "%d %d\n", nbNodes, nbCells); //fprintf(stdout, "%d %d\n", nbNodes, nbCells);
fprintf(aFileId, "%ld %ld\n", nbNodes, nbCells); fprintf(aFileId, "%ld %ld\n", nbNodes, static_cast< long >( nbCells ));
/**************************************************************************** /****************************************************************************
* ECRITURE DES NOEUDS * * ECRITURE DES NOEUDS *
@ -107,7 +107,7 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
smIdType nodeID = it->next()->GetID(); smIdType nodeID = it->next()->GetID();
if ( !nodeNumByID.empty() ) if ( !nodeNumByID.empty() )
nodeID = nodeNumByID[ nodeID ]; nodeID = nodeNumByID[ nodeID ];
fprintf(aFileId, "%ld ", nodeID ); fprintf(aFileId, "%ld ", static_cast< long >( nodeID ));
} }
fprintf(aFileId, "\n"); fprintf(aFileId, "\n");
} }
@ -123,7 +123,7 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
smIdType nodeID = it->next()->GetID(); smIdType nodeID = it->next()->GetID();
if ( !nodeNumByID.empty() ) if ( !nodeNumByID.empty() )
nodeID = nodeNumByID[ nodeID ]; nodeID = nodeNumByID[ nodeID ];
fprintf(aFileId, "%ld ", nodeID ); fprintf(aFileId, "%ld ", static_cast< long >( nodeID ));
} }
fprintf(aFileId, "\n"); fprintf(aFileId, "\n");
} }
@ -158,7 +158,7 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
smIdType nodeID = it->next()->GetID(); smIdType nodeID = it->next()->GetID();
if ( !nodeNumByID.empty() ) if ( !nodeNumByID.empty() )
nodeID = nodeNumByID[ nodeID ]; nodeID = nodeNumByID[ nodeID ];
fprintf(aFileId, "%ld ", nodeID ); fprintf(aFileId, "%ld ", static_cast< long >( nodeID ));
} }
fprintf(aFileId, "\n"); fprintf(aFileId, "\n");

59
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -11107,16 +11107,9 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
// build the list of nodes shared by 2 or more domains, with their domain indexes // build the list of nodes shared by 2 or more domains, with their domain indexes
std::map<DownIdType, std::map<int,int>, DownIdCompare> faceDomains; // face --> (id domain --> id volume) std::map<DownIdType, std::map<int,int>, DownIdCompare> faceDomains; // face --> (id domain --> id volume)
std::map<int,int>celldom; // cell vtkId --> domain std::map<int,int> celldom; // cell vtkId --> domain
std::map<DownIdType, std::map<int,int>, DownIdCompare> cellDomains; // oldNode --> (id domain --> id cell) std::map<DownIdType, std::map<int,int>, DownIdCompare> cellDomains; // oldNode --> (id domain --> id cell)
std::map<int, std::map<int,int> > nodeDomains; // oldId --> (domainId --> newId) std::map<int, std::map<int,int> > nodeDomains; // oldId --> (domainId --> newId)
faceDomains.clear();
celldom.clear();
cellDomains.clear();
nodeDomains.clear();
std::map<int,int> emptyMap;
std::set<int> emptySet;
emptyMap.clear();
//MESSAGE(".. Number of domains :"<<theElems.size()); //MESSAGE(".. Number of domains :"<<theElems.size());
@ -11226,7 +11219,6 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
DownIdType face = itface->first; DownIdType face = itface->first;
//MESSAGE(" --- face " << face.cellId); //MESSAGE(" --- face " << face.cellId);
std::set<int> oldNodes; std::set<int> oldNodes;
oldNodes.clear();
grid->GetNodeIds(oldNodes, face.cellId, face.cellType); grid->GetNodeIds(oldNodes, face.cellId, face.cellType);
std::set<int>::iterator itn = oldNodes.begin(); std::set<int>::iterator itn = oldNodes.begin();
for (; itn != oldNodes.end(); ++itn) for (; itn != oldNodes.end(); ++itn)
@ -11281,7 +11273,6 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
DownIdType face = itface->first; DownIdType face = itface->first;
//MESSAGE(" --- face " << face.cellId); //MESSAGE(" --- face " << face.cellId);
std::set<int> oldNodes; std::set<int> oldNodes;
oldNodes.clear();
grid->GetNodeIds(oldNodes, face.cellId, face.cellType); grid->GetNodeIds(oldNodes, face.cellId, face.cellType);
std::set<int>::iterator itn = oldNodes.begin(); std::set<int>::iterator itn = oldNodes.begin();
for (; itn != oldNodes.end(); ++itn) for (; itn != oldNodes.end(); ++itn)
@ -11342,7 +11333,6 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
DownIdType face = itface->first; DownIdType face = itface->first;
//MESSAGE(" --- face " << face.cellId); //MESSAGE(" --- face " << face.cellId);
std::set<int> oldNodes; std::set<int> oldNodes;
oldNodes.clear();
grid->GetNodeIds(oldNodes, face.cellId, face.cellType); grid->GetNodeIds(oldNodes, face.cellId, face.cellType);
int nbMultipleNodes = 0; int nbMultipleNodes = 0;
std::set<int>::iterator itn = oldNodes.begin(); std::set<int>::iterator itn = oldNodes.begin();
@ -11467,7 +11457,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
std::map<std::string, SMESH_Group*> mapOfJunctionGroups; std::map<std::string, SMESH_Group*> mapOfJunctionGroups;
//MESSAGE(".. Creation of elements: simple junction"); //MESSAGE(".. Creation of elements: simple junction");
if (createJointElems) if ( createJointElems )
{ {
string joints2DName = "joints2D"; string joints2DName = "joints2D";
mapOfJunctionGroups[joints2DName] = this->myMesh->AddGroup(SMDSAbs_Face, joints2DName.c_str()); mapOfJunctionGroups[joints2DName] = this->myMesh->AddGroup(SMDSAbs_Face, joints2DName.c_str());
@ -11482,15 +11472,14 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
DownIdType face = itface->first; DownIdType face = itface->first;
std::set<int> oldNodes; std::set<int> oldNodes;
std::set<int>::iterator itn; std::set<int>::iterator itn;
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;
SMDS_MeshCell *vol = grid->extrudeVolumeFromFace(vtkVolId, dom1, dom2, oldNodes, nodeDomains, SMDS_MeshCell *vol = grid->extrudeVolumeFromFace(vtkVolId, dom1, dom2, oldNodes, nodeDomains,
nodeQuadDomains); nodeQuadDomains);
stringstream grpname; stringstream grpname;
@ -11547,7 +11536,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
std::map<std::vector<int>, std::vector<int> >::iterator ite = edgesMultiDomains.begin(); std::map<std::vector<int>, std::vector<int> >::iterator ite = edgesMultiDomains.begin();
for (; ite != edgesMultiDomains.end(); ++ite) for (; ite != edgesMultiDomains.end(); ++ite)
{ {
vector<int> nodes = ite->first; vector<int> nodes = ite->first;
vector<int> orderDom = ite->second; vector<int> orderDom = ite->second;
vector<vtkIdType> orderedNodes; vector<vtkIdType> orderedNodes;
if (nodes.size() == 2) if (nodes.size() == 2)
@ -11584,10 +11573,9 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
std::map<DownIdType, std::map<int,int>, DownIdCompare> faceOrEdgeDom; // cellToModify --> (id domain --> id cell) std::map<DownIdType, std::map<int,int>, DownIdCompare> faceOrEdgeDom; // cellToModify --> (id domain --> id cell)
std::map<int,int> feDom; // vtk id of cell to modify --> id domain std::map<int,int> feDom; // vtk id of cell to modify --> id domain
faceOrEdgeDom.clear();
feDom.clear();
//MESSAGE(".. Modification of elements"); //MESSAGE(".. Modification of elements");
SMDSAbs_ElementType domainType = (*theElems[0].begin())->GetType();
for (int idomain = idom0; idomain < nbDomains; idomain++) for (int idomain = idom0; idomain < nbDomains; idomain++)
{ {
std::map<int, std::map<int, int> >::const_iterator itnod = nodeDomains.begin(); std::map<int, std::map<int, int> >::const_iterator itnod = nodeDomains.begin();
@ -11605,13 +11593,29 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
continue; // new cells: not to be modified continue; // new cells: not to be modified
DownIdType aCell(downId, vtkType); DownIdType aCell(downId, vtkType);
int volParents[1000]; int volParents[1000];
int nbvol = grid->GetParentVolumes(volParents, vtkId); int nbvol = 0;
nbvol = grid->GetParentVolumes(volParents, vtkId);
if ( domainType == SMDSAbs_Volume )
{
nbvol = grid->GetParentVolumes(volParents, vtkId);
}
else // domainType == SMDSAbs_Face
{
const int nbFaces = grid->getDownArray(vtkType)->getNumberOfUpCells(downId);
const int *upCells = grid->getDownArray(vtkType)->getUpCells(downId);
const unsigned char* upTypes = grid->getDownArray(vtkType)->getUpTypes(downId);
for (int i=0; i< nbFaces; i++)
{
int vtkFaceId = grid->getDownArray( upTypes[i] )->getVtkCellId(upCells[i]);
if (vtkFaceId >= 0)
volParents[nbvol++] = vtkFaceId;
}
}
for (int j = 0; j < nbvol; j++) for (int j = 0; j < nbvol; j++)
if (celldom.count(volParents[j]) && (celldom[volParents[j]] == idomain)) if (celldom.count(volParents[j]) && (celldom[volParents[j]] == idomain))
if (!feDom.count(vtkId)) if (!feDom.count(vtkId))
{ {
feDom[vtkId] = idomain; feDom[vtkId] = idomain;
faceOrEdgeDom[aCell] = emptyMap;
faceOrEdgeDom[aCell][idomain] = vtkId; // affect face or edge to the first domain only faceOrEdgeDom[aCell][idomain] = vtkId; // affect face or edge to the first domain only
//MESSAGE("affect cell " << this->GetMeshDS()->FromVtkToSmds(vtkId) << " domain " << idomain //MESSAGE("affect cell " << this->GetMeshDS()->FromVtkToSmds(vtkId) << " domain " << idomain
// << " type " << vtkType << " downId " << downId); // << " type " << vtkType << " downId " << downId);
@ -11634,7 +11638,6 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
DownIdType face = itface->first; DownIdType face = itface->first;
std::set<int> oldNodes; std::set<int> oldNodes;
std::set<int>::iterator itn; std::set<int>::iterator itn;
oldNodes.clear();
grid->GetNodeIds(oldNodes, face.cellId, face.cellType); grid->GetNodeIds(oldNodes, face.cellId, face.cellType);
//MESSAGE("examine cell, downId " << face.cellId << " type " << int(face.cellType)); //MESSAGE("examine cell, downId " << face.cellId << " type " << int(face.cellType));
std::map<int, int> localClonedNodeIds; std::map<int, int> localClonedNodeIds;
@ -11701,10 +11704,7 @@ bool SMESH_MeshEditor::CreateFlatElementsOnFacesGroups(const std::vector<TIDSort
std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> clonedNodes; std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> clonedNodes;
std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> intermediateNodes; std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> intermediateNodes;
clonedNodes.clear();
intermediateNodes.clear();
std::map<std::string, SMESH_Group*> mapOfJunctionGroups; std::map<std::string, SMESH_Group*> mapOfJunctionGroups;
mapOfJunctionGroups.clear();
for ( size_t idom = 0; idom < theElems.size(); idom++ ) for ( size_t idom = 0; idom < theElems.size(); idom++ )
{ {
@ -11951,7 +11951,6 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius,
std::set<int> setOfVolToCheck; std::set<int> setOfVolToCheck;
std::vector<gp_Pnt> gpnts; std::vector<gp_Pnt> gpnts;
gpnts.clear();
if (isNodeGroup) // --- a group of nodes is provided : find all the volumes using one or more of this nodes if (isNodeGroup) // --- a group of nodes is provided : find all the volumes using one or more of this nodes
{ {
@ -12038,7 +12037,6 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius,
// Fill the group of inside volumes // Fill the group of inside volumes
std::map<int, double> mapOfNodeDistance2; std::map<int, double> mapOfNodeDistance2;
mapOfNodeDistance2.clear();
std::set<int> setOfOutsideVol; std::set<int> setOfOutsideVol;
while (!setOfVolToCheck.empty()) while (!setOfVolToCheck.empty())
{ {
@ -12215,9 +12213,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius,
// project polylines on subshapes, and partition, to get geom faces // project polylines on subshapes, and partition, to get geom faces
std::map<int, std::set<int> > shapeIdToVtkIdSet; // shapeId --> set of vtkId on skin std::map<int, std::set<int> > shapeIdToVtkIdSet; // shapeId --> set of vtkId on skin
std::set<int> emptySet; std::set<int> shapeIds;
emptySet.clear();
std::set<int> shapeIds;
SMDS_ElemIteratorPtr itelem = sgrps->GetElements(); SMDS_ElemIteratorPtr itelem = sgrps->GetElements();
while (itelem->more()) while (itelem->more())
@ -12227,7 +12223,6 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius,
int vtkId = elem->GetVtkID(); int vtkId = elem->GetVtkID();
if (!shapeIdToVtkIdSet.count(shapeId)) if (!shapeIdToVtkIdSet.count(shapeId))
{ {
shapeIdToVtkIdSet[shapeId] = emptySet;
shapeIds.insert(shapeId); shapeIds.insert(shapeId);
} }
shapeIdToVtkIdSet[shapeId].insert(vtkId); shapeIdToVtkIdSet[shapeId].insert(vtkId);
@ -12235,7 +12230,6 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius,
std::map<int, std::set<DownIdType, DownIdCompare> > shapeIdToEdges; // shapeId --> set of downward edges std::map<int, std::set<DownIdType, DownIdCompare> > shapeIdToEdges; // shapeId --> set of downward edges
std::set<DownIdType, DownIdCompare> emptyEdges; std::set<DownIdType, DownIdCompare> emptyEdges;
emptyEdges.clear();
std::map<int, std::set<int> >::iterator itShape = shapeIdToVtkIdSet.begin(); std::map<int, std::set<int> >::iterator itShape = shapeIdToVtkIdSet.begin();
for (; itShape != shapeIdToVtkIdSet.end(); ++itShape) for (; itShape != shapeIdToVtkIdSet.end(); ++itShape)
@ -12278,7 +12272,6 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius,
} }
std::list<int> order; std::list<int> order;
order.clear();
if (nodesEdges.size() > 0) if (nodesEdges.size() > 0)
{ {
order.push_back(nodesEdges[0]); //MESSAGE(" --- back " << order.back()+1); // SMDS id = VTK id + 1; order.push_back(nodesEdges[0]); //MESSAGE(" --- back " << order.back()+1); // SMDS id = VTK id + 1;