Merge branch V7_main

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

diff --git a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx
index cffd88a3ab5ee2e4135d53825e507339a25ab481..388227ed83ca2fe17d1b3af2f63b6f60aa76521b 100644 (file)
--- a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx
+++ b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.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 __PARAMEDMEM_MEDCOUPLINGNORMALIZEDUNSTRUCTUREDMESH_HXX__
 #define __PARAMEDMEM_MEDCOUPLINGNORMALIZEDUNSTRUCTUREDMESH_HXX__
@@ -24,11 +25,11 @@
 
 namespace ParaMEDMEM
 {
-  class MEDCouplingUMesh;
+  class MEDCouplingPointSet;
 }
 
 template<int SPACEDIM,int MESHDIM>
-class MEDCouplingNormalizedUnstructuredMesh : public INTERP_KERNEL::GenericMesh
+class MEDCouplingNormalizedUnstructuredMesh
 {
 public:
   static const int MY_SPACEDIM=SPACEDIM;
@@ -36,12 +37,12 @@ public:
   typedef int MyConnType;
   static const INTERP_KERNEL::NumberingPolicy My_numPol=INTERP_KERNEL::ALL_C_MODE;
 public:
-  MEDCouplingNormalizedUnstructuredMesh(const ParaMEDMEM::MEDCouplingUMesh *mesh);
+  MEDCouplingNormalizedUnstructuredMesh(const ParaMEDMEM::MEDCouplingPointSet *mesh);
   void getBoundingBox(double *boundingBox) const;
   INTERP_KERNEL::NormalizedCellType getTypeOfElement(int eltId) const;
-  unsigned char getNumberOfNodesOfElement(int eltId) const;
-  unsigned long getNumberOfElements() const;
-  unsigned long getNumberOfNodes() const;
+  int getNumberOfNodesOfElement(int eltId) const;
+  int getNumberOfElements() const;
+  int getNumberOfNodes() const;
   const int *getConnectivityPtr() const;
   const double *getCoordinatesPtr() const;
   const int *getConnectivityIndexPtr() const;
@@ -50,7 +51,7 @@ public:
 private:
   void prepare();
 private:
-  const ParaMEDMEM::MEDCouplingUMesh *_mesh;
+  const ParaMEDMEM::MEDCouplingPointSet *_mesh;
   int *_conn_for_interp;
   int *_conn_index_for_interp;
 };