Fix partitionner

diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx
index 0f748cb6e7ac7fedda4903244a7a1b208e3b2535..cc4aed453b9aa2a0954d933990582d4d13146b06 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx
@@ -151,7 +151,7 @@ MEDPARTITIONER::MeshCollection::MeshCollection(MeshCollection& initialCollection
                this->getMesh(),
                initialCollection.getCellFamilyIds(),
                "cellFamily");
-  castIntField(initialCollection.getFaceMesh(), 
+  castIntField(initialCollection.getFaceMesh(),
                this->getFaceMesh(),
                initialCollection.getFaceFamilyIds(),
                "faceFamily");
@@ -489,6 +489,8 @@ void MEDPARTITIONER::MeshCollection::castFaceMeshes(MeshCollection& initialColle
       //initial face mesh known : in my domain
       if (meshesCastFrom[iold] != 0)
         {
+//          std::cerr << "NUMBER OF FACES = " << meshesCastFrom[iold]->getNumberOfCells() <<  std::endl;
+//          WriteUMesh("OrigMesh.med",meshesCastFrom[iold],true);
           for (mcIdType ielem=0; ielem<meshesCastFrom[iold]->getNumberOfCells(); ielem++)
             {
               vector<mcIdType> nodes;
@@ -520,6 +522,7 @@ void MEDPARTITIONER::MeshCollection::castFaceMeshes(MeshCollection& initialColle
           
               for (map<int,mcIdType>::iterator iter=faces.begin(); iter!=faces.end(); iter++)
                 {
+//                  std::cerr << "TREATING FACE " << iter->first << " " << boundaryElem->findIdFirstEqual(iter->first) << std::endl;
                   if (iter->second==ToIdType(nodes.size()))
                     //cvw eligible but may be have to be face of a cell of this->getMesh()[inew]?
                     //it is not sure here...
@@ -591,13 +594,16 @@ void MEDPARTITIONER::MeshCollection::castFaceMeshes(MeshCollection& initialColle
   meshesCastTo.resize(nbNewDomain);
   for (int inew=0; inew<nbNewDomain; inew++)
     {
-      vector<const MEDCoupling::MEDCouplingUMesh*> myMeshes;
+      vector<MEDCoupling::MEDCouplingUMesh*> myMeshes;
       for (int iold=0; iold<nbOldDomain; iold++)
         {
           MEDCoupling::MEDCouplingUMesh *umesh=splitMeshes[inew][iold];
           if (umesh!=0)
             if (umesh->getNumberOfCells()>0)
+              {
                 myMeshes.push_back(umesh);
+//                WriteUMesh("mesh_"+std::to_string(inew)+".med",umesh,true);
+              }
         }
 
       MEDCoupling::MEDCouplingUMesh *bndMesh = 0;
@@ -608,12 +614,25 @@ void MEDPARTITIONER::MeshCollection::castFaceMeshes(MeshCollection& initialColle
           bndMesh =
             ((MEDCoupling::MEDCouplingUMesh *)_mesh[inew]->buildBoundaryMesh(/*keepCoords=*/true));
           if (bndMesh->getNumberOfCells()>0)
-            myMeshes.push_back( bndMesh );
+            {
+//              WriteUMesh("boundary_mesh_"+std::to_string(inew)+".med",bndMesh,true);
+              myMeshes.push_back( bndMesh );
+            }
         }
 
+//      for(int loc_mesh = 0;loc_mesh < myMeshes.size(); loc_mesh++)
+//        WriteUMesh("mesh_"+std::to_string(inew)+"_"+std::to_string(loc_mesh)+".med",myMeshes[loc_mesh],true);
+
       if (myMeshes.size()>0)
         {
-          meshesCastTo[inew]=MEDCoupling::MEDCouplingUMesh::MergeUMeshes(myMeshes);
+          // Need to merge faces that are both in the initial set of faces and in the boundary mesh
+          // which is the last element in myMeshes:
+          for (int iold2 = 0; iold2 < nbOldDomain-1; iold2++)
+            myMeshes[iold2]->tryToShareSameCoordsPermute(*bndMesh, 1.e-10);
+          vector<const MEDCoupling::MEDCouplingUMesh*> myMeshes_c;
+          for (auto & e: myMeshes) myMeshes_c.push_back(e);
+          meshesCastTo[inew]=MEDCoupling::MEDCouplingUMesh::MergeUMeshesOnSameCoords(myMeshes_c);
+          MCAuto<DataArrayIdType> tmp = meshesCastTo[inew]->zipConnectivityTraducer(2);
           meshesCastTo[inew]->sortCellsInMEDFileFrmt()->decrRef();
         }
       else