From 5b2a9cc1cc18fffd5674a589aacf368008983b45 Mon Sep 17 00:00:00 2001 From: abn Date: Thu, 12 May 2022 21:16:40 +0200 Subject: [PATCH] [Bug fix]: buildInnerBoundaryAlongM1Group + some tetrahedral configurations not handled properly + rewrote algorithm for findCellsToRenumber() --- src/MEDCoupling/MEDCouplingUMesh.cxx | 217 +++++++-------------------- src/MEDLoader/Swig/MEDLoaderTest3.py | 42 ++++++ 2 files changed, 93 insertions(+), 166 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx index 4d01f5e7c..e62c5611d 100755 --- a/src/MEDCoupling/MEDCouplingUMesh.cxx +++ b/src/MEDCoupling/MEDCouplingUMesh.cxx @@ -2497,8 +2497,6 @@ DataArrayIdType* MEDCouplingUMesh::findNodesToDuplicate(const MEDCouplingUMesh& void MEDCouplingUMesh::findCellsToRenumber(const MEDCouplingUMesh& otherDimM1OnSameCoords, const mcIdType *nodeIdsToDuplicateBg, const mcIdType *nodeIdsToDuplicateEnd, DataArrayIdType *& cellIdsNeededToBeRenum, DataArrayIdType *& cellIdsNotModified) const { - // DEBUG NOTE: in case of issue with the algorithm in this method, see Python script in resources/dev - // which mimicks the C++ using DAInt = MCAuto; using MCUMesh = MCAuto; @@ -2509,192 +2507,79 @@ void MEDCouplingUMesh::findCellsToRenumber(const MEDCouplingUMesh& otherDimM1OnS if(otherDimM1OnSameCoords.getMeshDimension()!=getMeshDimension()-1) throw INTERP_KERNEL::Exception("MEDCouplingUMesh::findCellsToRenumber: the mesh given in other parameter must have this->getMeshDimension()-1 !"); + // Compute cell IDs of the mesh with cells that touch the M1 group with a least one node: DAInt cellsAroundGroupLarge = getCellIdsLyingOnNodes(nodeIdsToDuplicateBg, nodeIdsToDuplicateEnd, false); // false= take cell in, even if not all nodes are in dupl - - // MCUMesh mAroundGrpLarge=static_cast(buildPartOfMySelf(cellsAroundGroupLarge->begin(),cellsAroundGroupLarge->end(),true)); + mcIdType nCellsLarge=cellsAroundGroupLarge->getNumberOfTuples(); DAInt descL=DataArrayIdType::New(),descIL=DataArrayIdType::New(),revDescL=DataArrayIdType::New(),revDescIL=DataArrayIdType::New(); MCUMesh mArGrpLargeDesc=mAroundGrpLarge->buildDescendingConnectivity(descL,descIL,revDescL,revDescIL); const mcIdType *descILP=descIL->begin(), *descLP=descL->begin(); - - // Extract now all N D cells which have a complete face in touch with the group: - // 1. Identify cells of M1 group in sub-mesh mAroundGrp DataArrayIdType *idsOfM1t; mArGrpLargeDesc->areCellsIncludedIn(&otherDimM1OnSameCoords,2, idsOfM1t); DAInt idsOfM1Large(idsOfM1t); mcIdType nL = mArGrpLargeDesc->getNumberOfCells(); - DAInt idsStrict = DataArrayIdType::New(); idsStrict->alloc(0,1); - // 2. Build map giving for each cell ID in mAroundGrp (not in mAroundGrpLarge) the corresponding cell - // ID on the other side of the crack: - std::map toOtherSide, pos; - mcIdType cnt = 0; + + // Computation of the neighbor information of the mesh WITH the crack (some neighbor links are removed): + // In the neighbor information remove the connection between high dimension cells and its low level constituents which are part + // of the frontier given in parameter (i.e. the cells of low dimension from the group delimiting the crack): + DAInt descLTrunc = descL->deepCopy(), descILTrunc = descIL->deepCopy(); + DataArrayIdType::RemoveIdsFromIndexedArrays(idsOfM1Large->begin(), idsOfM1Large->end(),descLTrunc,descILTrunc); + DataArrayIdType *neight=0, *neighIt=0; + MEDCouplingUMesh::ComputeNeighborsOfCellsAdv(descLTrunc,descILTrunc,revDescL,revDescIL, neight, neighIt); + DAInt neighL(neight), neighIL(neighIt); + + DAInt hitCellsLarge = DataArrayIdType::New(); hitCellsLarge->alloc(nCellsLarge,1); + hitCellsLarge->fillWithValue(0); // 0 : not hit, +1: one side of the crack, -1: other side of the crack, + mcIdType* hitCellsLargeP = hitCellsLarge->rwBegin(); + + // Now loop on the faces of the M1 group and fill spread zones on either side of the crack: const mcIdType *revDescILP=revDescIL->begin(), *revDescLP=revDescL->begin(); for(const auto& v: *idsOfM1Large) { - if (v >= nL) // Keep valid match only - continue; + if (v >= nL) continue; // Keep valid match only - see doc of areCellsIncludedIn() mcIdType idx0 = revDescILP[v]; - // Keep the two cells on either side of the face v of M1: + // Retrieve the two cells on either side of the face v of M1: mcIdType c1=revDescLP[idx0], c2=revDescLP[idx0+1]; - DAInt t1=idsStrict->findIdsEqual(c1), t2=idsStrict->findIdsEqual(c2); - - if (!t1->getNumberOfTuples()) - { pos[c1] = cnt++; idsStrict->pushBackSilent(c1); } - if (!t2->getNumberOfTuples()) - { pos[c2] = cnt++; idsStrict->pushBackSilent(c2); } - - mcIdType k1 = pos[c1], k2=pos[c2]; - toOtherSide[k1] = k2; - toOtherSide[k2] = k1; - } - - DAInt cellsAroundGroup = cellsAroundGroupLarge->selectByTupleId(idsStrict->begin(), idsStrict->end()); - MCUMesh mAroundGrp = static_cast(buildPartOfMySelf(cellsAroundGroup->begin(), cellsAroundGroup->end(), true)); - mcIdType nCells=cellsAroundGroup->getNumberOfTuples(), nCellsLarge=cellsAroundGroupLarge->getNumberOfTuples(); - DAInt desc=DataArrayIdType::New(),descI=DataArrayIdType::New(),revDesc=DataArrayIdType::New(),revDescI=DataArrayIdType::New(); - MCUMesh mArGrpDesc=mAroundGrp->buildDescendingConnectivity(desc,descI,revDesc,revDescI); - DataArrayIdType *idsOfM1t2; - mArGrpDesc->areCellsIncludedIn(&otherDimM1OnSameCoords,2, idsOfM1t2); // TODO can we avoid recomputation here? - DAInt idsOfM1(idsOfM1t2); - - // Neighbor information of the mesh WITH the crack (some neighbors are removed): - // In the neighbor information remove the connection between high dimension cells and its low level constituents which are part - // of the frontier given in parameter (i.e. the cells of low dimension from the group delimiting the crack): - DataArrayIdType::RemoveIdsFromIndexedArrays(idsOfM1->begin(), idsOfM1->end(),desc,descI); - // Compute the neighbor of each cell in mAroundGrp, taking into account the broken link above. Two - // cells on either side of the crack (defined by the mesh of low dimension) are not neighbor anymore. - DataArrayIdType *neight=0, *neighIt=0; - MEDCouplingUMesh::ComputeNeighborsOfCellsAdv(desc,descI,revDesc,revDescI, neight, neighIt); - DAInt neigh(neight), neighI(neighIt); - - // For each initial connex part of the M1 mesh (or said differently for each independent crack): - mcIdType seed=0, nIter=0; - mcIdType nIterMax = nCells+1; // Safety net for the loop - DAInt hitCells = DataArrayIdType::New(); hitCells->alloc(nCells,1); - mcIdType* hitCellsP = hitCells->rwBegin(); - hitCells->fillWithValue(0); // 0 : not hit, +x: one side of the crack, -x: other side of the crack, with 'x' the index of the connex component - mcIdType PING_FULL, PONG_FULL; - mcIdType MAX_CP = 10000; // the choices below assume we won't have more than 10000 different connex parts ... - mcIdType PING_FULL_init = 0, PING_PART = MAX_CP; - mcIdType PONG_FULL_init = 0, PONG_PART = -MAX_CP; - cnt=0; - while (nIter < nIterMax) - { - DAInt t = hitCells->findIdsEqual(0); - if(!t->getNumberOfTuples()) - break; - mcIdType seed = t->getIJ(0,0); - bool done = false; - cnt++; - PING_FULL = PING_FULL_init+cnt; - PONG_FULL = PONG_FULL_init-cnt; - // while the connex bits in correspondance on either side of the crack are not fully covered - while(!done && nIter < nIterMax) // Start of the ping-pong + std::map toOther = {{c1, c2}, {c2, c1}}; + // Handle the spread zones on the two sides of the crack: + for (const auto c: {c1, c2}) { - nIter++; - // Identify connex zone around the seed - this zone corresponds to some cells on the other side - // of the crack that might extend further away. So we will need to compute spread zone on the other side - // too ... and this process can repeat, hence the "ping-pong" logic. + if (hitCellsLargeP[c]) continue; + // Identify connex zone around this cell - if we find a value already assigned there, use it. mcIdType dnu; - DAInt spreadZone = MEDCouplingUMesh::ComputeSpreadZoneGraduallyFromSeed(&seed, &seed+1, neigh,neighI, -1, dnu); - done = true; - for(const mcIdType& s: *spreadZone) - { - hitCellsP[s] = PING_FULL; - const auto& it = toOtherSide.find(s); - if (it != toOtherSide.end()) - { - mcIdType other = it->second; - if (hitCellsP[other] != PONG_FULL) - { - // On the other side of the crack we hit a cell which was not fully covered previously by the - // ComputeSpreadZone process, so we are not done yet, ComputeSreadZone will need to be applied there - done = false; - hitCellsP[other] = PONG_PART; - // Compute next seed, i.e. a cell on the other side of the crack - seed = other; - } - } - } - if (done) - { - // we might have several disjoint PONG parts in front of a single PING connex part: - DAInt idsPong = hitCells->findIdsEqual(PONG_PART); - if (idsPong->getNumberOfTuples()) - { - seed = idsPong->getIJ(0,0); - done = false; - } - continue; // continue without switching side (or break if 'done' remains false) - } - else + DAInt spreadZone = MEDCouplingUMesh::ComputeSpreadZoneGraduallyFromSeed(&c, &c+1, neighL,neighIL, -1, dnu); + std::set sv; + for (const mcIdType& s: *spreadZone) + if (hitCellsLargeP[s]) sv.insert(hitCellsLargeP[s]); + if (sv.size() > 1) + // Strange: we find in the same spread zone a +1 and -1 ! + throw INTERP_KERNEL::Exception("MEDCouplingUMesh::findCellsToRenumber: internal error #0 - conflicting values - should not happen!"); + // If a valid value was found, use it: + mcIdType val = sv.size()==1 ? *sv.begin() : 0; + // Hopefully this does not conflict with an potential value on the other side: + mcIdType other = toOther[c]; + if (hitCellsLargeP[other]) { - // Go to the other side - std::swap(PING_FULL, PONG_FULL); - std::swap(PING_PART, PONG_PART); - } - } // while (!done ...) - DAInt nonHitCells = hitCells->findIdsEqual(0); - if (nonHitCells->getNumberOfTuples()) - seed = nonHitCells->getIJ(0,0); - else - break; - } // while (nIter < nIterMax ... - if (nIter >= nIterMax) - throw INTERP_KERNEL::Exception("MEDCouplingUMesh::findCellsToRenumber: Too many iterations - should not happen"); - - // Now we have handled all N D cells which have a face touching the M1 group. It remains the cells - // which are just touching the group by one (or several) node(s) (see for example testBuildInnerBoundaryAlongM1Group4) - // All those cells are in direct contact with a cell which is either PING_FULL or PONG_FULL - // So first reproject the PING/PONG info onto mAroundGrpLarge: - DAInt hitCellsLarge = DataArrayIdType::New(); hitCellsLarge->alloc(nCellsLarge,1); - hitCellsLarge->fillWithValue(0); - mcIdType *hitCellsLargeP=hitCellsLarge->rwBegin(), tt=0; - for(const auto &i: *idsStrict) - { hitCellsLargeP[i] = hitCellsP[tt++]; } - DAInt nonHitCells = hitCellsLarge->findIdsEqual(0); - // Neighbor information in mAroundGrpLarge: - DataArrayIdType *neighLt=0, *neighILt=0; - MEDCouplingUMesh::ComputeNeighborsOfCellsAdv(descL,descIL,revDescL,revDescIL, neighLt, neighILt); - DAInt neighL(neighLt), neighIL(neighILt); - const mcIdType *neighILP=neighIL->begin(), *neighLP=neighL->begin(); - for(const auto& c : *nonHitCells) - { - mcIdType cnt00 = neighILP[c]; - for (const mcIdType *n=neighLP+cnt00; cnt00 < neighILP[c+1]; n++, cnt00++) - { - mcIdType neighVal = hitCellsLargeP[*n]; - if (neighVal != 0 && std::abs(neighVal) < MAX_CP) // (@test_T0) second part of the test to skip cells being assigned and target only cells assigned in the first part of the algo above - { - mcIdType currVal = hitCellsLargeP[c]; - if (currVal != 0) // Several neighbors have a candidate number - { - // Unfortunately in some weird cases (see testBuildInnerBoundary8) a cell in mAroundGrpLarge - // might have as neighbor two conflicting spread zone ... - if (currVal*neighVal < 0) - { - // If we arrive here, the cell was already assigned a number and we found a neighbor with - // a different sign ... we must swap the whole spread zone!! - DAInt ids1 = hitCellsLarge->findIdsEqual(neighVal), ids1b = hitCellsLarge->findIdsEqual(-neighVal); - DAInt ids2 = hitCellsLarge->findIdsEqual(MAX_CP*neighVal), ids2b = hitCellsLarge->findIdsEqual(-MAX_CP*neighVal); - // A nice little lambda to multiply part of a DAInt by -1 ... - auto mul_part_min1 = [hitCellsLargeP](const DAInt& ids) { for(const auto& i: *ids) hitCellsLargeP[i] *= -1; }; - mul_part_min1(ids1); - mul_part_min1(ids1b); - mul_part_min1(ids2); - mul_part_min1(ids2b); - } - } - else // First assignation - hitCellsLargeP[c] = MAX_CP*neighVal; // Same sign, but different value to preserve PING_FULL and PONG_FULL + if(val && hitCellsLargeP[other] != -val) + throw INTERP_KERNEL::Exception("MEDCouplingUMesh::findCellsToRenumber: internal error #1 - conflictint values - should not happen!");; + // We do not yet have a value, but other side has one. Use it! + if(!val) val = -hitCellsLargeP[other]; } + // Cover first initialisation: + if (!val) val = 1; + // And finally, fill the current spread zone: + for(const mcIdType& s: *spreadZone) hitCellsLargeP[s] = val; } } - DAInt cellsRet1 = hitCellsLarge->findIdsInRange(1,MAX_CP*MAX_CP); // Positive spread zone number - DAInt cellsRet2 = hitCellsLarge->findIdsInRange(-MAX_CP*MAX_CP, 0); // Negative spread zone number + + DAInt cellsRet1 = hitCellsLarge->findIdsEqual(1); + DAInt cellsRet2 = hitCellsLarge->findIdsEqual(-1); if (cellsRet1->getNumberOfTuples() + cellsRet2->getNumberOfTuples() != cellsAroundGroupLarge->getNumberOfTuples()) - throw INTERP_KERNEL::Exception("MEDCouplingUMesh::findCellsToRenumber: Some cells not hit - Internal error should not happen"); + { + DAInt nonHitCells = hitCellsLarge->findIdsEqual(0); // variable kept for debug ... + throw INTERP_KERNEL::Exception("MEDCouplingUMesh::findCellsToRenumber: Some cells not hit - Internal error should not happen"); + } cellsRet1->transformWithIndArr(cellsAroundGroupLarge->begin(),cellsAroundGroupLarge->end()); cellsRet2->transformWithIndArr(cellsAroundGroupLarge->begin(),cellsAroundGroupLarge->end()); // diff --git a/src/MEDLoader/Swig/MEDLoaderTest3.py b/src/MEDLoader/Swig/MEDLoaderTest3.py index 71740199d..7402c5de4 100644 --- a/src/MEDLoader/Swig/MEDLoaderTest3.py +++ b/src/MEDLoader/Swig/MEDLoaderTest3.py @@ -1728,6 +1728,48 @@ class MEDLoaderTest3(unittest.TestCase): m_desc.checkDeepEquivalOnSameNodesWith(m2_bis, 2, 9.9999) pass + def testBuildInnerBoundary9(self): + """ 3D test where the crack is performed so that two non-connex parts are found facing one single connex part on the other side + of the crack. + """ + m3 = MEDCouplingUMesh('box', 3) + coo = DataArrayDouble([(0,4.6,0),(3,4.6,0),(5,4.6,0),(15,4.6,0),(15,0,0),(5,-1.60551e-25,0),(5,3,0),(3,0,0),(3,3.8,0),(0,0,0),(0,3.8,0),(0,4.6,10),(0,4.6,20),(3,4.6,10),(3,4.6,20),(5,4.6,10),(5,4.6,20),(15,4.6,10),(15,4.6,20),(15,0,10),(15,0,20),(5,-1.60551e-25,10),(5,-1.60551e-25,20),(5,3,10),(5,3,20),(3,0,10),(3,0,20),(3,3.8,10),(3,3.8,20),(0,0,10),(0,0,20),(0,3.8,10),(0,3.8,20),(3,3,0),(0,3,0),(3,3,10),(3,3,20),(0,3,10),(0,3,20)]) + m3.setCoords(coo) + c = DataArrayInt([31, 7, 33, 6, 5, -1, 25, 21, 23, 35, -1, 7, 25, 35, 33, -1, 33, 35, 23, 6, -1, 6, 23, 21, 5, -1, 5, 21, 25, 7, 31, 25, 35, 23, 21, -1, 26, 22, 24, 36, -1, 25, 26, 36, 35, -1, 35, 36, 24, 23, -1, 23, 24, 22, 21, -1, 21, 22, 26, 25, 31, 9, 34, 33, 7, -1, 29, 25, 35, 37, -1, 9, 29, 37, 34, -1, 34, 37, 35, 33, -1, 33, 35, 25, 7, -1, 7, 25, 29, 9, 31, 29, 37, 35, 25, -1, 30, 26, 36, 38, -1, 29, 30, 38, 37, -1, 37, 38, 36, 35, -1, 35, 36, 26, 25, -1, 25, 26, 30, 29, 31, 0, 1, 8, 10, -1, 11, 31, 27, 13, -1, 0, 11, 13, 1, -1, 1, 13, 27, 8, -1, 8, 27, 31, 10, -1, 10, 31, 11, 0, 31, 11, 13, 27, 31, -1, 12, 32, 28, 14, -1, 11, 12, 14, 13, -1, 13, 14, 28, 27, -1, 27, 28, 32, 31, -1, 31, 32, 12, 11, 31, 6, 8, 1, 2, -1, 23, 15, 13, 27, -1, 6, 23, 27, 8, -1, 8, 27, 13, 1, -1, 1, 13, 15, 2, -1, 2, 15, 23, 6, 31, 23, 27, 13, 15, -1, 24, 16, 14, 28, -1, 23, 24, 28, 27, -1, 27, 28, 14, 13, -1, 13, 14, 16, 15, -1, 15, 16, 24, 23, 31, 6, 2, 3, 4, 5, -1, 23, 21, 19, 17, 15, -1, 2, 6, 23, 15, -1, 3, 2, 15, 17, -1, 4, 3, 17, 19, -1, 5, 4, 19, 21, -1, 6, 5, 21, 23, 31, 23, 15, 17, 19, 21, -1, 24, 22, 20, 18, 16, -1, 15, 23, 24, 16, -1, 17, 15, 16, 18, -1, 19, 17, 18, 20, -1, 21, 19, 20, 22, -1, 23, 21, 22, 24]) + cI = DataArrayInt([0, 30, 60, 90, 120, 150, 180, 210, 240, 277, 314]) + m3.setConnectivity(c, cI) + m3.checkConsistency() + m2, _, _,_,_ = m3.buildDescendingConnectivity() + grpIds = DataArrayInt([4,9,35,39]); grpIds.setName("group") + mfu = MEDFileUMesh() + mfu.setMeshAtLevel(0, m3) + mfu.setMeshAtLevel(-1, m2) + mfu.setGroupsAtLevel(-1, [grpIds]) + m2, _, _, _, _ = m3.buildDescendingConnectivity() + grpIds = DataArrayInt([4,9,35,39]); grpIds.setName("group") + mfu = MEDFileUMesh() + mfu.setMeshAtLevel(0, m3) + mfu.setMeshAtLevel(-1, m2) + mfu.setGroupsAtLevel(-1, [grpIds]) + nNod = m3.getNumberOfNodes() + nodesDup, cells1, cells2 = mfu.buildInnerBoundaryAlongM1Group("group") + m3_bis = mfu.getMeshAtLevel(0) + m3_bis.checkConsistency() + m2_bis = mfu.getMeshAtLevel(-1) + m2_bis.checkConsistency() + self.assertEqual(nNod+9, mfu.getNumberOfNodes()) + self.assertEqual(nNod+9, m3_bis.getNumberOfNodes()) + self.assertEqual(nNod+9, m2_bis.getNumberOfNodes()) + self.assertEqual([2, 5, 6, 15, 16, 21, 22, 23, 24], nodesDup.getValues()) + self.assertEqual(m3_bis.getCoords()[nodesDup].getValues(), m3_bis.getCoords()[nNod:].getValues()) + self.assertEqual(set([0,1,6,7]), set(cells1.getValues())) + self.assertEqual(set([8,9]), set(cells2.getValues())) + self.assertEqual([4,9,35,39],mfu.getGroupArr(-1,"group").getValues()) + self.assertEqual([49, 50, 51, 52],mfu.getGroupArr(-1,"group_dup").getValues()) # here only one cell has been duplicated + m_desc, _, _, _, _ = m3_bis.buildDescendingConnectivity() + m_desc.checkDeepEquivalOnSameNodesWith(m2_bis, 2, 9.9999) + pass + @WriteInTmpDir def testBasicConstructors(self): GeneratePyfile18(self) -- 2.39.2