ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-06 21:14:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

PR: correction bug EDF 2299.

Browse Source
This commit is contained in:
prascle 2012-09-06 13:27:46 +00:00
parent 97220d5bca
commit 4cde840048
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -11088,7 +11088,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
// --- build a map (face to duplicate --> volume to modify) // --- build a map (face to duplicate --> volume to modify)
// with all the faces shared by 2 domains (group of elements) // with all the faces shared by 2 domains (group of elements)
// and corresponding volume of this domain, for each shared face. // and corresponding volume of this domain, for each shared face.
// a volume has a face shared by 2 domains if it has a neighbor which is not in is domain. // a volume has a face shared by 2 domains if it has a neighbor which is not in his domain.
//MESSAGE("Domain " << idom); //MESSAGE("Domain " << idom);
const TIDSortedElemSet& domain = theElems[idom]; const TIDSortedElemSet& domain = theElems[idom];
@ -11204,7 +11204,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
std::set<int> oldNodes; std::set<int> oldNodes;
oldNodes.clear(); oldNodes.clear();
grid->GetNodeIds(oldNodes, face.cellId, face.cellType); grid->GetNodeIds(oldNodes, face.cellId, face.cellType);
bool isMultipleDetected = false; // bool isMultipleDetected = false;
std::set<int>::iterator itn = oldNodes.begin(); std::set<int>::iterator itn = oldNodes.begin();
for (; itn != oldNodes.end(); ++itn) for (; itn != oldNodes.end(); ++itn)
{ {
@ -11225,7 +11225,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
{ {
vector<int> orderedDoms; vector<int> orderedDoms;
//MESSAGE("multiple node " << oldId); //MESSAGE("multiple node " << oldId);
isMultipleDetected =true; // isMultipleDetected =true;
if (mutipleNodes.count(oldId)) if (mutipleNodes.count(oldId))
orderedDoms = mutipleNodes[oldId]; orderedDoms = mutipleNodes[oldId];
else else
@ -11247,14 +11247,38 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
nodeDomains[oldId][idom] = newId; // cloned node for other domains nodeDomains[oldId][idom] = newId; // cloned node for other domains
//MESSAGE(" newNode " << newId << " oldNode " << oldId << " size=" <<nodeDomains[oldId].size()); //MESSAGE(" newNode " << newId << " oldNode " << oldId << " size=" <<nodeDomains[oldId].size());
} }
if (nodeDomains[oldId].size() >= 3) // if (nodeDomains[oldId].size() >= 3)
{ // {
//MESSAGE("confirm multiple node " << oldId); // //MESSAGE("confirm multiple node " << oldId);
isMultipleDetected =true; // isMultipleDetected =true;
} // }
} }
} }
if (isMultipleDetected) // check if an edge of the face is shared between 3 or more domains }
}
for (int idomain = 0; idomain < theElems.size(); idomain++)
{
itface = faceDomains.begin();
for (; itface != faceDomains.end(); ++itface)
{
std::map<int, int> domvol = itface->second;
if (!domvol.count(idomain))
continue;
DownIdType face = itface->first;
//MESSAGE(" --- face " << face.cellId);
std::set<int> oldNodes;
oldNodes.clear();
grid->GetNodeIds(oldNodes, face.cellId, face.cellType);
int nbMultipleNodes = 0;
std::set<int>::iterator itn = oldNodes.begin();
for (; itn != oldNodes.end(); ++itn)
{
int oldId = *itn;
if (mutipleNodes.count(oldId))
nbMultipleNodes++;
}
if (nbMultipleNodes > 1) // check if an edge of the face is shared between 3 or more domains
{ {
//MESSAGE("multiple Nodes detected on a shared face"); //MESSAGE("multiple Nodes detected on a shared face");
int downId = itface->first.cellId; int downId = itface->first.cellId;
@ -11268,7 +11292,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
if (mutipleNodes.count(nodes[i])) if (mutipleNodes.count(nodes[i]))
if (!mutipleNodesToFace.count(nodes[i])) if (!mutipleNodesToFace.count(nodes[i]))
mutipleNodesToFace[nodes[i]] = mutipleNodes[nodes[i]]; mutipleNodesToFace[nodes[i]] = mutipleNodes[nodes[i]];
} }
else // shared face (between two volumes) else // shared face (between two volumes)
{ {
int nbEdges = grid->getDownArray(cellType)->getNumberOfDownCells(downId); int nbEdges = grid->getDownArray(cellType)->getNumberOfDownCells(downId);
@ -11282,9 +11306,12 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
{ {
vector<int> vn0 = mutipleNodes[nodes[0]]; vector<int> vn0 = mutipleNodes[nodes[0]];
vector<int> vn1 = mutipleNodes[nodes[nbNodes - 1]]; vector<int> vn1 = mutipleNodes[nodes[nbNodes - 1]];
sort( vn0.begin(), vn0.end() ); vector<int> doms;
sort( vn1.begin(), vn1.end() ); for (int i0 = 0; i0 < vn0.size(); i0++)
if (vn0 == vn1) for (int i1 = 0; i1 < vn1.size(); i1++)
if (vn0[i0] == vn1[i1])
doms.push_back(vn0[i0]);
if (doms.size() >2)
{ {
//MESSAGE(" detect edgesMultiDomains " << nodes[0] << " " << nodes[nbNodes - 1]); //MESSAGE(" detect edgesMultiDomains " << nodes[0] << " " << nodes[nbNodes - 1]);
double *coords = grid->GetPoint(nodes[0]); double *coords = grid->GetPoint(nodes[0]);
@ -11296,9 +11323,9 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector<TIDSorted
map<int, SMDS_VtkVolume*> domvol; // domain --> a volume with the edge map<int, SMDS_VtkVolume*> domvol; // domain --> a volume with the edge
map<int, double> angleDom; // oriented angles between planes defined by edge and volume centers map<int, double> angleDom; // oriented angles between planes defined by edge and volume centers
int nbvol = grid->GetParentVolumes(vtkVolIds, downEdgeIds[ie], edgeType[ie]); int nbvol = grid->GetParentVolumes(vtkVolIds, downEdgeIds[ie], edgeType[ie]);
for (int id=0; id < vn0.size(); id++) for (int id=0; id < doms.size(); id++)
{ {
int idom = vn0[id]; int idom = doms[id];
for (int ivol=0; ivol<nbvol; ivol++) for (int ivol=0; ivol<nbvol; ivol++)
{ {
int smdsId = meshDS->fromVtkToSmds(vtkVolIds[ivol]); int smdsId = meshDS->fromVtkToSmds(vtkVolIds[ivol]);