Skip to content
Snippets Groups Projects
Commit d0d038fa authored by Gaetan Bricteux's avatar Gaetan Bricteux
Browse files

fix r9868 for multiple regions

parent 7fc662e2
No related branches found
No related tags found
No related merge requests found
...@@ -1197,11 +1197,13 @@ GModel *buildCutMesh(GModel *gm, gLevelset *ls, ...@@ -1197,11 +1197,13 @@ GModel *buildCutMesh(GModel *gm, gLevelset *ls,
std::vector<DI_Hexa *> hexas; std::vector<DI_Hexa *> hexas;
std::vector<const gLevelset *> RPN; std::vector<const gLevelset *> RPN;
ls->getRPN(RPN); ls->getRPN(RPN);
std::vector<int> lsLineRegs;
for(unsigned int i = 0; i < gmEntities.size(); i++) { for(unsigned int i = 0; i < gmEntities.size(); i++) {
std::vector<int> oldLineRegs; std::vector<int> oldLineRegs;
for (std::map<int, std::vector<MElement*> >::iterator it = elements[1].begin(); for (std::map<int, std::vector<MElement*> >::iterator it = elements[1].begin();
it != elements[1].end(); it++) it != elements[1].end(); it++)
oldLineRegs.push_back(it->first); oldLineRegs.push_back(it->first);
int nbBorders = borders[0].size();
for(unsigned int j = 0; j < gmEntities[i]->getNumMeshElements(); j++) { for(unsigned int j = 0; j < gmEntities[i]->getNumMeshElements(); j++) {
MElement *e = gmEntities[i]->getMeshElement(j); MElement *e = gmEntities[i]->getMeshElement(j);
e->setVolumePositive(); e->setVolumePositive();
...@@ -1212,18 +1214,17 @@ GModel *buildCutMesh(GModel *gm, gLevelset *ls, ...@@ -1212,18 +1214,17 @@ GModel *buildCutMesh(GModel *gm, gLevelset *ls,
} }
// Create elementary and physical for non connected border lines // Create elementary and physical for non connected border lines
if(triangles.size() && lines.size()){ if(borders[0].size() > nbBorders && gmEntities[i]->dim() == 2){
std::vector<int> newLineRegs;
int k = 0; int k = 0;
for (std::map<int, std::vector<MElement*> >::iterator it = elements[1].begin(); for (std::map<int, std::vector<MElement*> >::iterator it = elements[1].begin();
it != elements[1].end(); it++){ it != elements[1].end(); it++){
if(oldLineRegs.size() && it->first == oldLineRegs[k]) if(oldLineRegs.size() && it->first == oldLineRegs[k])
k++; k++;
else else
newLineRegs.push_back(it->first); lsLineRegs.push_back(it->first);
} }
for(unsigned int j = 0; j < newLineRegs.size(); j++){ for(unsigned int j = 0; j < lsLineRegs.size(); j++){
int nLR = newLineRegs[j]; int nLR = lsLineRegs[j];
while(1){ while(1){
std::vector<MElement*> conLines; std::vector<MElement*> conLines;
conLines.push_back(elements[1][nLR][0]); conLines.push_back(elements[1][nLR][0]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment