Debug revealed with convertTo

[tools/medcoupling.git] / src / MEDLoader / MEDLoader.hxx

diff --git a/src/MEDLoader/MEDLoader.hxx b/src/MEDLoader/MEDLoader.hxx
index 33907f2197dd951d33402d7191946bbb1df151e6..27dede9fcac8f8f2fec04b6ca88cc0b9cb69eaf4 100644 (file)
--- a/src/MEDLoader/MEDLoader.hxx
+++ b/src/MEDLoader/MEDLoader.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  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
@@ -16,6 +16,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// Author : Anthony Geay (CEA/DEN)
 
 #ifndef __MEDLOADER_HXX__
 #define __MEDLOADER_HXX__
@@ -38,54 +39,9 @@ namespace ParaMEDMEM
 class MEDLOADER_EXPORT MEDLoader
 {
  public:
-/// @cond INTERNAL
-  class MEDConnOfOneElemType
-  {
-  public:
-    MEDConnOfOneElemType(INTERP_KERNEL::NormalizedCellType type, int *conn, int *index, int *fam, int lgth, int connLgth);
-    INTERP_KERNEL::NormalizedCellType getType() const { return _type; }
-    int getLength() const { return _lgth; }
-    int getConnLength() const { return _conn_lgth; }
-    int *getArray() const { return _conn; }
-    int *getIndex() const { return _index; }
-    int *getFam() const { return _fam; }
-    void setGlobal(int *global);
-    const int *getGlobal() const { return _global; }
-    void releaseArray();
-  private:
-    int _lgth;
-    int *_fam;
-    int *_conn;
-    int *_index;
-    int *_global;
-    int _conn_lgth;
-    INTERP_KERNEL::NormalizedCellType _type;
-  };
-
-  class MEDFieldDoublePerCellType
-  {
-  public:
-    MEDFieldDoublePerCellType(INTERP_KERNEL::NormalizedCellType type, double *values, int ncomp, int ntuple, const int *cellIdPerType, const char *locName);
-    INTERP_KERNEL::NormalizedCellType getType() const { return _type; }
-    int getNbComp() const { return _ncomp; }
-    int getNbOfTuple() const { return _ntuple; }
-    int getNbOfValues() const { return _ncomp*_ntuple; }
-    double *getArray() const { return _values; }
-    const std::string& getLocName() const { return _loc_name; }
-    const std::vector<int>& getCellIdPerType() const { return _cell_id_per_type; }
-    void releaseArray();
-  private:
-    int _ntuple;
-    int _ncomp;
-    double *_values;
-    std::string _loc_name;
-    std::vector<int> _cell_id_per_type;
-    INTERP_KERNEL::NormalizedCellType _type;
-  };
-/// @endcond
-  static void setEpsilonForNodeComp(double val) throw(INTERP_KERNEL::Exception);
-  static void setCompPolicyForCell(int val) throw(INTERP_KERNEL::Exception);
-  static void setTooLongStrPolicy(int val) throw(INTERP_KERNEL::Exception);
+  static void SetEpsilonForNodeComp(double val) throw(INTERP_KERNEL::Exception);
+  static void SetCompPolicyForCell(int val) throw(INTERP_KERNEL::Exception);
+  static void SetTooLongStrPolicy(int val) throw(INTERP_KERNEL::Exception);
   static void CheckFileForRead(const char *fileName) throw(INTERP_KERNEL::Exception);
   static std::vector<std::string> GetMeshNames(const char *fileName) throw(INTERP_KERNEL::Exception);
   static std::vector< std::vector< std::pair<INTERP_KERNEL::NormalizedCellType,int> > > GetUMeshGlobalInfo(const char *fileName, const char *meshName, int &meshDim, int& spaceDim, int& numberOfNodes) throw(INTERP_KERNEL::Exception);
@@ -104,7 +60,7 @@ class MEDLOADER_EXPORT MEDLoader
   static std::vector< std::pair<int,int> > GetFieldIterations(ParaMEDMEM::TypeOfField type, const char *fileName, const char *meshName, const char *fieldName) throw(INTERP_KERNEL::Exception);
   static std::vector< std::pair<int,int> > GetCellFieldIterations(const char *fileName, const char *meshName, const char *fieldName) throw(INTERP_KERNEL::Exception);
   static std::vector< std::pair<int,int> > GetNodeFieldIterations(const char *fileName, const char *meshName, const char *fieldName) throw(INTERP_KERNEL::Exception);
-  static std::vector< std::pair< std::pair<int,int>, double> > GetAllFieldIterations(const char *fileName, const char *meshName, const char *fieldName) throw(INTERP_KERNEL::Exception);
+  static std::vector< std::pair< std::pair<int,int>, double> > GetAllFieldIterations(const char *fileName, const char *fieldName) throw(INTERP_KERNEL::Exception);
   static double GetTimeAttachedOnFieldIteration(const char *fileName, const char *fieldName, int iteration, int order) throw(INTERP_KERNEL::Exception);
   static ParaMEDMEM::MEDCouplingUMesh *ReadUMeshFromFamilies(const char *fileName, const char *meshName, int meshDimRelToMax, const std::vector<std::string>& fams) throw(INTERP_KERNEL::Exception);
   static ParaMEDMEM::MEDCouplingUMesh *ReadUMeshFromGroups(const char *fileName, const char *meshName, int meshDimRelToMax, const std::vector<std::string>& grps) throw(INTERP_KERNEL::Exception);