X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMEDPartitioner%2FMEDPARTITIONER_ConnectZone.hxx;h=15a3c9f7a6551134f93bbbb7c7b03a1ba5ec9870;hb=95dc805fa1b8b94ef0c8509b0a597ae7aee13903;hp=3ec4096a13606932cbfd5ea67c2249317df61729;hpb=1e36a6710aab710674e20fbd89f6a9a8f238c023;p=tools%2Fmedcoupling.git

diff --git a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx
index 3ec4096a1..15a3c9f7a 100644
--- a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020  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,6 +21,8 @@
 #define __MEDPARTITIONER_CONNECTZONE_HXX__
 
 #include "MEDPARTITIONER.hxx"
+#include "MCAuto.hxx"
+#include "MCType.hxx"
 
 namespace MEDCoupling
 {
@@ -32,6 +34,8 @@ namespace MEDCoupling
 #include <vector>
 #include <string>
 
+using namespace MEDCoupling;
+
 namespace MEDPARTITIONER
 {
   class MEDPARTITIONER_EXPORT ConnectZone
@@ -45,58 +49,58 @@ namespace MEDPARTITIONER
     std::string getDescription() const ;
     int getDistantDomainNumber() const ;
     int getLocalDomainNumber() const ;
-    MEDCoupling::MEDCouplingUMesh *getLocalMesh() const ;
-    MEDCoupling::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 MEDCoupling::MEDCouplingSkyLineArray * getNodeCorresp() const;
-    const int *getFaceCorrespIndex() const;
-    const int *getFaceCorrespValue() const;
-    int getFaceNumber() const;
-    const MEDCoupling::MEDCouplingSkyLineArray * getFaceCorresp() const;
-    const int *getEntityCorrespIndex(int localEntity,
-                                     int distantEntity) const;
-    const int *getEntityCorrespValue(int localEntity,
-                                     int distantEntity) const;
-    int getEntityCorrespNumber(int localEntity,
-                               int distantEntity) const;
-    int getEntityCorrespLength(int localEntity,
-                               int distantEntity) const;
-    const MEDCoupling::MEDCouplingSkyLineArray * getEntityCorresp(int localEntity,
-                                                                 int distantEntity) const;
-    std::vector< std::pair< int,int > > getEntities() const;
+    bool isEntityCorrespPresent(mcIdType localEntity,mcIdType distantEntity) const;
+    const mcIdType *getNodeCorrespIndex() const;
+    const mcIdType *getNodeCorrespValue() const;
+    mcIdType getNodeNumber() const;
+    const MEDCouplingSkyLineArray * getNodeCorresp() const;
+    const mcIdType *getFaceCorrespIndex() const;
+    const mcIdType *getFaceCorrespValue() const;
+    mcIdType getFaceNumber() const;
+    const MEDCouplingSkyLineArray * getFaceCorresp() const;
+    const mcIdType *getEntityCorrespIndex(mcIdType localEntity,
+                                          mcIdType distantEntity) const;
+    const mcIdType *getEntityCorrespValue(mcIdType localEntity,
+                                          mcIdType distantEntity) const;
+    mcIdType getEntityCorrespNumber(mcIdType localEntity,
+                                    mcIdType distantEntity) const;
+    mcIdType getEntityCorrespLength(mcIdType localEntity,
+                                    mcIdType distantEntity) const;
+    const MEDCouplingSkyLineArray * getEntityCorresp(mcIdType localEntity,
+                                                     mcIdType distantEntity) const;
+    std::vector< std::pair< mcIdType,mcIdType > > getEntities() const;
 
     void setName(const std::string& name) ;
     void setDescription(const std::string& description) ;
     void setDistantDomainNumber(int distantDomainNumber) ;
     void setLocalDomainNumber(int distantDomainNumber) ;
-    void setLocalMesh(MEDCoupling::MEDCouplingUMesh * localMesh) ;
-    void setDistantMesh(MEDCoupling::MEDCouplingUMesh * distantMesh) ;
+    void setLocalMesh(MEDCouplingUMesh * localMesh) ;
+    void setDistantMesh(MEDCouplingUMesh * distantMesh) ;
 
-    void setNodeCorresp(const int * nodeCorresp, int nbnode);
-    void setNodeCorresp(MEDCoupling::MEDCouplingSkyLineArray* array);
-    void setFaceCorresp(const int * faceCorresp, int nbface);
-    void setFaceCorresp(MEDCoupling::MEDCouplingSkyLineArray* array);
-    void setEntityCorresp(int localEntity, int distantEntity,
-                          const int * entityCorresp, int nbentity);
-    void setEntityCorresp(int localEntity, int distantEntity,
-                          MEDCoupling::MEDCouplingSkyLineArray *array);
+    void setNodeCorresp(const mcIdType * nodeCorresp, mcIdType nbnode);
+    void setNodeCorresp(MEDCouplingSkyLineArray* array);
+    void setFaceCorresp(const mcIdType * faceCorresp, mcIdType nbface);
+    void setFaceCorresp(MEDCouplingSkyLineArray* array);
+    void setEntityCorresp(mcIdType localEntity, mcIdType distantEntity,
+                          const mcIdType * entityCorresp, mcIdType nbentity);
+    void setEntityCorresp(mcIdType localEntity, mcIdType distantEntity,
+                          MEDCouplingSkyLineArray *array);
   private :
     std::string _name;
     std::string _description;
     int _local_domain_number;
     int _distant_domain_number;
 
-    MEDCoupling::MEDCouplingUMesh * _local_mesh;
-    MEDCoupling::MEDCouplingUMesh * _distant_mesh;
+    MEDCouplingUMesh * _local_mesh;
+    MEDCouplingUMesh * _distant_mesh;
 
-    MEDCoupling::MEDCouplingSkyLineArray * _node_corresp;
-    MEDCoupling::MEDCouplingSkyLineArray * _face_corresp;
+    MCAuto<MEDCouplingSkyLineArray> _node_corresp;
+    MCAuto<MEDCouplingSkyLineArray> _face_corresp;
   
-    std::map < std::pair <int,int>, MEDCoupling::MEDCouplingSkyLineArray * > _entity_corresp;
+    std::map < std::pair <mcIdType,mcIdType>, MEDCouplingSkyLineArray * > _entity_corresp;
   };
 }
 # endif