X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingNormalizedCartesianMesh.hxx;h=ffb944d31931ea0b731bba26c4d536f368f4581d;hb=e7a9d4f59978fd384ee98db1dfdd5ec2118331ca;hp=64c97d5f50a0e15276d1c9351799cd8d3fdefe7e;hpb=0511285d155a0682ff6dad10ac916ac53f577476;p=tools%2Fmedcoupling.git

diff --git a/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx b/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx
index 64c97d5f5..ffb944d31 100644
--- a/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx
+++ b/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,31 +23,31 @@
 
 #include "NormalizedUnstructuredMesh.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingCMesh;
 }
 
 template<int SPACEDIM>
-class MEDCouplingNormalizedCartesianMesh : public INTERP_KERNEL::GenericMesh
+class MEDCouplingNormalizedCartesianMesh
 {
 public:
   static const int MY_SPACEDIM=SPACEDIM;
   static const int MY_MESHDIM=SPACEDIM;
-  typedef int MyConnType;
+  typedef mcIdType MyConnType;
   static const INTERP_KERNEL::NumberingPolicy My_numPol=INTERP_KERNEL::ALL_C_MODE;
 public:
-  MEDCouplingNormalizedCartesianMesh(const ParaMEDMEM::MEDCouplingCMesh *mesh);
+  MEDCouplingNormalizedCartesianMesh(const MEDCoupling::MEDCouplingCMesh *mesh);
   //void getBoundingBox(double *boundingBox) const;
   //INTERP_KERNEL::NormalizedCellType getTypeOfElement(int eltId) const;
-  //unsigned char getNumberOfNodesOfElement(int eltId) const;
-  //unsigned long getNumberOfNodes() const;
-  unsigned long getNumberOfElements() const;
-  unsigned long nbCellsAlongAxis(int axis) const;
+  //int getNumberOfNodesOfElement(int eltId) const;
+  //int getNumberOfNodes() const;
+  mcIdType getNumberOfElements() const;
+  mcIdType nbCellsAlongAxis(int axis) const;
   const double * getCoordsAlongAxis(int axis) const;
   ~MEDCouplingNormalizedCartesianMesh();
 private:
-  const ParaMEDMEM::MEDCouplingCMesh *_mesh;
+  const MEDCoupling::MEDCouplingCMesh *_mesh;
 };
 
 #endif