Merge from V6_main 06/03/2013

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

diff --git a/src/MEDLoader/MEDLoader.hxx b/src/MEDLoader/MEDLoader.hxx
index 33907f2197dd951d33402d7191946bbb1df151e6..7fd9f43b8ee0ac9707737c7f89621288c6a37b54 100644 (file)
--- a/src/MEDLoader/MEDLoader.hxx
+++ b/src/MEDLoader/MEDLoader.hxx
@@ -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__
@@ -65,17 +66,19 @@ class MEDLOADER_EXPORT MEDLoader
   class MEDFieldDoublePerCellType
   {
   public:
-    MEDFieldDoublePerCellType(INTERP_KERNEL::NormalizedCellType type, double *values, int ncomp, int ntuple, const int *cellIdPerType, const char *locName);
+    MEDFieldDoublePerCellType(INTERP_KERNEL::NormalizedCellType type, double *values, int ncomp, int nGeoElt, int nbi, 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; }
+    int getNbOfGeoElt() const { return _ngeo_elt; }
+    int getNbOfTuple() const { return _nbi*_ngeo_elt; }
+    int getNbOfValues() const { return _ncomp*_nbi*_ngeo_elt; }
     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 _ngeo_elt;
+    int _nbi;
     int _ncomp;
     double *_values;
     std::string _loc_name;