getCellsContainingPoints is sensitive to 2D quadratic static cells.

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

diff --git a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx
index cffd88a3ab5ee2e4135d53825e507339a25ab481..9bb4dd35e2d52cb9ca757c29eff4f8079867c3ae 100644 (file)
--- a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx
+++ b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  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,19 +16,20 @@
 //
 // 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__
 
 #include "NormalizedUnstructuredMesh.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;
@@ -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 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;
+  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 MEDCoupling::MEDCouplingPointSet *_mesh;
   int *_conn_for_interp;
   int *_conn_index_for_interp;
 };