X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDPartitioner%2FMEDPARTITIONER_ConnectZone.hxx;h=0c51ac8e22d60e377a6b04cd5ef4d586b516d34e;hb=4b4c848900cf2fb2cd8cb585c6ff21c7d284b87b;hp=258d8b1dcb7066a9c3c8b6cc970cae14c1192cb2;hpb=378cb2ebe08f8f4543ef632b2bd5f77fe180f978;p=tools%2Fmedcoupling.git

diff --git a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx
old mode 100755
new mode 100644
index 258d8b1dc..0c51ac8e2
--- a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,12 +21,20 @@
 #define __MEDPARTITIONER_CONNECTZONE_HXX__
 
 #include "MEDPARTITIONER.hxx"
-#include "MEDCouplingUMesh.hxx"
-#include "MEDPARTITIONER_SkyLineArray.hxx"
+#include "MCAuto.hxx"
+
+namespace MEDCoupling
+{
+  class MEDCouplingUMesh;
+  class MEDCouplingSkyLineArray;
+}
 
 #include <map>
+#include <vector>
 #include <string>
 
+using namespace MEDCoupling;
+
 namespace MEDPARTITIONER
 {
   class MEDPARTITIONER_EXPORT ConnectZone
@@ -40,16 +48,18 @@ namespace MEDPARTITIONER
     std::string getDescription() const ;
     int getDistantDomainNumber() const ;
     int getLocalDomainNumber() const ;
-    ParaMEDMEM::MEDCouplingUMesh *getLocalMesh() const ;
-    ParaMEDMEM::MEDCouplingUMesh *getDistantMesh() const ;
+    MEDCouplingUMesh *getLocalMesh() const ;
+    MEDCouplingUMesh *getDistantMesh() const ;
 
     bool isEntityCorrespPresent(int localEntity,int distantEntity) const;
     const int *getNodeCorrespIndex() const;
     const int *getNodeCorrespValue() const;
     int getNodeNumber() const;
+    const MEDCouplingSkyLineArray * getNodeCorresp() const;
     const int *getFaceCorrespIndex() const;
     const int *getFaceCorrespValue() const;
     int getFaceNumber() const;
+    const MEDCouplingSkyLineArray * getFaceCorresp() const;
     const int *getEntityCorrespIndex(int localEntity,
                                      int distantEntity) const;
     const int *getEntityCorrespValue(int localEntity,
@@ -58,34 +68,38 @@ namespace MEDPARTITIONER
                                int distantEntity) const;
     int getEntityCorrespLength(int localEntity,
                                int distantEntity) const;
+    const MEDCouplingSkyLineArray * getEntityCorresp(int localEntity,
+                                                                 int distantEntity) const;
+    std::vector< std::pair< int,int > > getEntities() const;
+
     void setName(const std::string& name) ;
     void setDescription(const std::string& description) ;
     void setDistantDomainNumber(int distantDomainNumber) ;
     void setLocalDomainNumber(int distantDomainNumber) ;
-    void setLocalMesh(ParaMEDMEM::MEDCouplingUMesh * localMesh) ;
-    void setDistantMesh(ParaMEDMEM::MEDCouplingUMesh * distantMesh) ;
+    void setLocalMesh(MEDCouplingUMesh * localMesh) ;
+    void setDistantMesh(MEDCouplingUMesh * distantMesh) ;
 
-    void setNodeCorresp(int * nodeCorresp, int nbnode);
-    void setNodeCorresp(MEDPARTITIONER::SkyLineArray* array);
-    void setFaceCorresp(int * faceCorresp, int nbface);
-    void setFaceCorresp(MEDPARTITIONER::SkyLineArray* array);
+    void setNodeCorresp(const int * nodeCorresp, int nbnode);
+    void setNodeCorresp(MEDCouplingSkyLineArray* array);
+    void setFaceCorresp(const int * faceCorresp, int nbface);
+    void setFaceCorresp(MEDCouplingSkyLineArray* array);
     void setEntityCorresp(int localEntity, int distantEntity,
-                          int * entityCorresp, int nbentity);
+                          const int * entityCorresp, int nbentity);
     void setEntityCorresp(int localEntity, int distantEntity,
-                          MEDPARTITIONER::SkyLineArray *array);
+                          MEDCouplingSkyLineArray *array);
   private :
     std::string _name;
     std::string _description;
     int _local_domain_number;
     int _distant_domain_number;
 
-    ParaMEDMEM::MEDCouplingUMesh * _local_mesh;
-    ParaMEDMEM::MEDCouplingUMesh * _distant_mesh;
+    MEDCouplingUMesh * _local_mesh;
+    MEDCouplingUMesh * _distant_mesh;
 
-    SkyLineArray * _node_corresp;
-    SkyLineArray * _face_corresp;
+    MCAuto<MEDCouplingSkyLineArray> _node_corresp;
+    MCAuto<MEDCouplingSkyLineArray> _face_corresp;
   
-    std::map < std::pair <int,int>, SkyLineArray * > _entity_corresp;
+    std::map < std::pair <int,int>, MEDCouplingSkyLineArray * > _entity_corresp;
   };
 }
 # endif