X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FMEDFileMeshSupport.hxx;h=1f69588dc9d8bfee0905f5411edd9f35baf9e64a;hb=35287602e212fd35b8a4b11215cb111b929a4875;hp=e26c0a0d04ba8d9a1389b3d2d2923ef460f097f0;hpb=872b4400d3e50dc07f967016bf9031eb547eaef4;p=tools%2Fmedcoupling.git

diff --git a/src/MEDLoader/MEDFileMeshSupport.hxx b/src/MEDLoader/MEDFileMeshSupport.hxx
index e26c0a0d0..1f69588dc 100644
--- a/src/MEDLoader/MEDFileMeshSupport.hxx
+++ b/src/MEDLoader/MEDFileMeshSupport.hxx
@@ -23,59 +23,31 @@
 
 #include "MEDLoaderDefines.hxx"
 #include "MEDFileUtilities.txx"
+#include "MEDFileMesh.hxx"
 
 #include "MEDCouplingRefCountObject.hxx"
 
 namespace MEDCoupling
 {
-  class MEDFileMeshSupport : public RefCountObject, public MEDFileWritableStandAlone
-  {
-  public:
-    MEDLOADER_EXPORT static MEDFileMeshSupport *New(const std::string& fileName);
-    MEDLOADER_EXPORT static MEDFileMeshSupport *New(const std::string& fileName, int smid);
-    MEDLOADER_EXPORT static MEDFileMeshSupport *New(med_idt fid, int smid);
-    MEDLOADER_EXPORT static MEDFileMeshSupport *New();
-    MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
-    MEDLOADER_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;
-    MEDLOADER_EXPORT int getSpaceDim() const;
-    MEDLOADER_EXPORT void setSpaceDim(int dim);
-    MEDLOADER_EXPORT int getMeshDim() const;
-    MEDLOADER_EXPORT void setMeshDim(int dim);
-    MEDLOADER_EXPORT void setAxisType(MEDCouplingAxisType at) { _axis_type=at; }
-    MEDLOADER_EXPORT MEDCouplingAxisType getAxisType() const { return _axis_type; }
-  public:
-    void writeLL(med_idt fid) const;
-  private:
-    MEDFileMeshSupport(med_idt fid, int smid);
-    MEDFileMeshSupport();
-    ~MEDFileMeshSupport();
-  private:
-    int _space_dim;
-    int _mesh_dim;
-    std::string _name;
-    std::string _description;
-    MEDCouplingAxisType _axis_type;
-    MCAuto<DataArrayDouble> _coords;
-    MCAuto<DataArrayInt> _fam_coords;
-    MCAuto<DataArrayInt> _num_coords;
-    MCAuto<DataArrayAsciiChar> _name_coords;
-  };
-
   class MEDFileMeshSupports : public RefCountObject, public MEDFileWritableStandAlone
   {
   public:
+    MEDLOADER_EXPORT static MEDFileMeshSupports *New(const std::string& fileName);
     MEDLOADER_EXPORT static MEDFileMeshSupports *New(med_idt fid);
     MEDLOADER_EXPORT static MEDFileMeshSupports *New();
   public:
-    std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
-    std::size_t getHeapMemorySizeWithoutChildren() const;
-    void writeLL(med_idt fid) const;
+    MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
+    MEDLOADER_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;
+    MEDLOADER_EXPORT void writeLL(med_idt fid) const;
+    MEDLOADER_EXPORT std::vector<std::string> getSupMeshNames() const;
+    MEDLOADER_EXPORT const MEDFileUMesh *getSupMeshWithName(const std::string& name) const;
+    MEDLOADER_EXPORT int getNumberOfNodesInConnOf(TypeOfField entity, const std::string& name) const;
   private:
     MEDFileMeshSupports(med_idt fid);
     MEDFileMeshSupports();
     ~MEDFileMeshSupports();
   private:
-    std::vector< MCAuto<MEDFileMeshSupport> > _supports;
+    std::vector< MCAuto<MEDFileUMesh> > _supports;
   };
 }