Merge branch 'master' of salome:modules/med

[tools/medcoupling.git] / src / MEDCoupling / MEDCouplingNormalizedCartesianMesh.hxx

diff --git a/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx b/src/MEDCoupling/MEDCouplingNormalizedCartesianMesh.hxx
index 60cbfdb34d7b1246dc22c698ae2940767a776021..2921a823cc0d6f33284bf79d1a910bb41fe8ce56 100644 (file)
--- 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-2014  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
@@ -16,6 +16,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// Author : Anthony Geay (CEA/DEN)
 
 #ifndef __PARAMEDMEM_MEDCOUPLINGNORMALIZEDCARTESIANMESH_HXX__
 #define __PARAMEDMEM_MEDCOUPLINGNORMALIZEDCARTESIANMESH_HXX__
@@ -28,7 +29,7 @@ namespace ParaMEDMEM
 }
 
 template<int SPACEDIM>
-class MEDCouplingNormalizedCartesianMesh : public INTERP_KERNEL::GenericMesh
+class MEDCouplingNormalizedCartesianMesh
 {
 public:
   static const int MY_SPACEDIM=SPACEDIM;
@@ -36,17 +37,17 @@ public:
   typedef int MyConnType;
   static const INTERP_KERNEL::NumberingPolicy My_numPol=INTERP_KERNEL::ALL_C_MODE;
 public:
-  MEDCouplingNormalizedCartesianMesh(ParaMEDMEM::MEDCouplingCMesh *mesh);
+  MEDCouplingNormalizedCartesianMesh(const ParaMEDMEM::MEDCouplingCMesh *mesh);
   //void getBoundingBox(double *boundingBox) const;
   //INTERP_KERNEL::NormalizedCellType getTypeOfElement(int eltId) const;
-  //unsigned char getNumberOfNodesOfElement(int eltId) const;
-  //unsigned long getNumberOfNodes() const;
+  //int getNumberOfNodesOfElement(int eltId) const;
+  //int getNumberOfNodes() const;
   unsigned long getNumberOfElements() const;
   unsigned long nbCellsAlongAxis(int axis) const;
   const double * getCoordsAlongAxis(int axis) const;
   ~MEDCouplingNormalizedCartesianMesh();
 private:
-  ParaMEDMEM::MEDCouplingCMesh *_mesh;
+  const ParaMEDMEM::MEDCouplingCMesh *_mesh;
 };
 
 #endif