From 5dcce0b37dfa04dac8c55b9016728be8f606ac4a Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 1 Jun 2017 08:26:23 +0200 Subject: [PATCH] Fix merge errors post 8.3.0 --- src/MEDCoupling/MEDCouplingVoronoi.cxx | 50 ++----------------- .../MEDCouplingBasicsTest5.py | 9 ++++ 2 files changed, 13 insertions(+), 46 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingVoronoi.cxx b/src/MEDCoupling/MEDCouplingVoronoi.cxx index deac49856..12807437d 100644 --- a/src/MEDCoupling/MEDCouplingVoronoi.cxx +++ b/src/MEDCoupling/MEDCouplingVoronoi.cxx @@ -448,9 +448,9 @@ MCAuto MEDCoupling::Voronizer2D::doIt(const MEDCouplingUMesh * vorTess->getCellsContainingPoint(cPtr,eps,zeCandidatesTmp); zeCandidates.insert(zeCandidatesTmp.begin(),zeCandidatesTmp.end()); } - std::set tmp,newElementsToDo; - std::set_difference(zeCandidates.begin(),zeCandidates.end(),elemsDone.begin(),elemsDone.end(),std::inserter(tmp,tmp.begin())); - std::set_union(elemsToDo.begin(),elemsToDo.end(),tmp.begin(),tmp.end(),std::inserter(newElementsToDo,newElementsToDo.begin())); + std::set tmp2,newElementsToDo; + std::set_difference(zeCandidates.begin(),zeCandidates.end(),elemsDone.begin(),elemsDone.end(),std::inserter(tmp2,tmp2.begin())); + std::set_union(elemsToDo.begin(),elemsToDo.end(),tmp2.begin(),tmp2.end(),std::inserter(newElementsToDo,newElementsToDo.begin())); elemsToDo=newElementsToDo; } newVorCells.push_back(newVorCell); @@ -509,15 +509,9 @@ MCAuto MEDCoupling::Voronizer3D::doIt(const MEDCouplingUMesh * vorTess->getCellsContainingPoint(pt,eps,polygsToIterOn); if(polygsToIterOn.size()<1) throw INTERP_KERNEL::Exception("Voronoize3D : presence of a point outside the given cell !"); - std::set elemsToDo(polygsToIterOn.begin(),polygsToIterOn.end()),elemsDone; - std::size_t ii(0); std::vector< MCAuto > newVorCells; - MCAuto d(DataArrayInt::New()),dI(DataArrayInt::New()),rd(DataArrayInt::New()),rdI(DataArrayInt::New()); - MCAuto faces(vorTess->buildDescendingConnectivity(d,dI,rd,rdI)); - // - while(!elemsToDo.empty()) + for(int poly=0;polygetNumberOfCells();poly++) { - int poly(*elemsToDo.begin()); elemsToDo.erase(elemsToDo.begin()); elemsDone.insert(poly); const double *seed(pts+3*poly); MCAuto tile(l0[poly]); tile->zipCoords(); @@ -535,42 +529,6 @@ MCAuto MEDCoupling::Voronizer3D::doIt(const MEDCouplingUMesh * newVorCell->zipCoords(); MCAuto modifiedCell(cells->buildPartOfMySelfSlice(0,1,1,true)); modifiedCell->zipCoords(); - l0[poly]=modifiedCell; - if(std::find(polygsToIterOn.begin(),polygsToIterOn.end(),poly)!=polygsToIterOn.end())// we iterate on a polyhedron containg the point to add pt -> add cells sharing faces with just computed newVorCell - { - MCAuto faces2; - { - MCAuto d2(DataArrayInt::New()),d2I(DataArrayInt::New()),rd2(DataArrayInt::New()),rd2I(DataArrayInt::New()); - faces2=newVorCell->buildDescendingConnectivity(d2,d2I,rd2,rd2I); - } - MCAuto faces3(faces2->buildPartOfMySelfSlice(1,faces2->getNumberOfCells(),1,true));// suppress internal face - MCAuto facesOfCurSplitPol(faces->buildPartOfMySelf(d->begin()+dI->getIJ(poly,0),d->begin()+dI->getIJ(poly+1,0),true)); - // intersection between the out faces of newVorCell and the neighbor faces of poly polyhedron -> candidates - MEDCouplingNormalizedUnstructuredMesh<3,2> source_mesh_wrapper(facesOfCurSplitPol); - MEDCouplingNormalizedUnstructuredMesh<3,2> target_mesh_wrapper(faces3); - INTERP_KERNEL::Interpolation3DSurf interpolation; - interpolation.setMinDotBtwPlane3DSurfIntersect(eps2); - interpolation.setMaxDistance3DSurfIntersect(eps); - interpolation.setPrecision(1e-12); - std::vector > matrix; - interpolation.interpolateMeshes(source_mesh_wrapper,target_mesh_wrapper,matrix,"P0P0"); - std::set zeCandidates; - for(std::vector >::const_iterator it2=matrix.begin();it2!=matrix.end();it2++) - for(std::map::const_iterator it3=(*it2).begin();it3!=(*it2).end();it3++) - { - int faceIdInVorTess(d->getIJ(dI->getIJ(poly,0)+(*it3).first,0)); - for(const int *it4=rd->begin()+rdI->getIJ(faceIdInVorTess,0);it4!=rd->begin()+rdI->getIJ(faceIdInVorTess+1,0);it4++) - { - if(*it4!=poly) - zeCandidates.insert(*it4); - } - } - std::set tmp2,newElementsToDo; - std::set_difference(zeCandidates.begin(),zeCandidates.end(),elemsDone.begin(),elemsDone.end(),std::inserter(tmp2,tmp2.begin())); - std::set_union(elemsToDo.begin(),elemsToDo.end(),tmp2.begin(),tmp2.end(),std::inserter(newElementsToDo,newElementsToDo.begin())); - elemsToDo=newElementsToDo; - } - // newVorCells.push_back(newVorCell); l0[poly]=modifiedCell; } diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py index 5929051f4..3b8a0feaf 100644 --- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py +++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py @@ -4729,6 +4729,15 @@ class MEDCouplingBasicsTest5(unittest.TestCase): res=m.computePlaneEquationOf3DFaces() self.assertTrue(res.isEqual(ref,1e-12)) pass + + def testBugInComputationOfEqOfPlane1(self): + coo=DataArrayDouble([-1.0, 1.0, -0.3872983455657959, -1.0, 1.0, 0.3872983455657959, -1.0, 1.0, 0.693649172782898, 1.0, 1.0, 0.693649172782898, 1.0, 1.0, 0.3872983455657959, 1.0, 1.0, -0.3872983455657959],6,3) + m=MEDCouplingUMesh("",2) + m.setCoords(coo) + m.allocateCells() + m.insertNextCell(NORM_POLYGON,[0,1,2,3,4,5]) + self.assertTrue(m.computePlaneEquationOf3DFaces().isEqual(DataArrayDouble([0,1,0,-1],1,4),1e-12)) + pass pass -- 2.39.2