X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingNormalizedUnstructuredMesh.hxx;h=7a090585d1da84aba3d112a012b32d189a543a01;hb=2ae2dc6fcedbf241c7637284b3c7bde12aded04a;hp=9c50cdaf2583699368e1a881087358dfa752a65d;hpb=f1a947b32a36d8dc8e3079b25305bb50e8cb59a0;p=tools%2Fmedcoupling.git

diff --git a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx
index 9c50cdaf2..7a090585d 100644
--- a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx
+++ b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  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
@@ -22,38 +22,39 @@
 #define __PARAMEDMEM_MEDCOUPLINGNORMALIZEDUNSTRUCTUREDMESH_HXX__
 
 #include "NormalizedUnstructuredMesh.hxx"
+#include "MCType.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
-  class MEDCouplingUMesh;
+  class MEDCouplingPointSet;
 }
 
 template<int SPACEDIM,int MESHDIM>
-class MEDCouplingNormalizedUnstructuredMesh : public INTERP_KERNEL::GenericMesh
+class MEDCouplingNormalizedUnstructuredMesh
 {
 public:
   static const int MY_SPACEDIM=SPACEDIM;
   static const int MY_MESHDIM=MESHDIM;
-  typedef int MyConnType;
+  typedef mcIdType MyConnType;
   static const INTERP_KERNEL::NumberingPolicy My_numPol=INTERP_KERNEL::ALL_C_MODE;
 public:
-  MEDCouplingNormalizedUnstructuredMesh(const ParaMEDMEM::MEDCouplingUMesh *mesh);
+  MEDCouplingNormalizedUnstructuredMesh(const MEDCoupling::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;
-  const int *getConnectivityPtr() const;
+  INTERP_KERNEL::NormalizedCellType getTypeOfElement(mcIdType eltId) const;
+  mcIdType getNumberOfNodesOfElement(mcIdType eltId) const;
+  mcIdType getNumberOfElements() const;
+  mcIdType getNumberOfNodes() const;
+  const mcIdType *getConnectivityPtr() const;
   const double *getCoordinatesPtr() const;
-  const int *getConnectivityIndexPtr() const;
+  const mcIdType *getConnectivityIndexPtr() const;
   void releaseTempArrays();
   ~MEDCouplingNormalizedUnstructuredMesh();
 private:
   void prepare();
 private:
-  const ParaMEDMEM::MEDCouplingUMesh *_mesh;
-  int *_conn_for_interp;
-  int *_conn_index_for_interp;
+  const MEDCoupling::MEDCouplingPointSet *_mesh;
+  mcIdType *_conn_for_interp;
+  mcIdType *_conn_index_for_interp;
 };
 
 #endif