Bug fix: bounding box for quadratic elements spaceDim=2/meshDim=1 (i.e. SEG3)

[tools/medcoupling.git] / src / INTERP_KERNEL / Bases / NormalizedUnstructuredMesh.hxx

diff --git a/src/INTERP_KERNEL/Bases/NormalizedUnstructuredMesh.hxx b/src/INTERP_KERNEL/Bases/NormalizedUnstructuredMesh.hxx
index 07633641c9cf283f08f06696a9692618ef677be0..8c65333ae4576a1133a30cc287539182e999e855 100644 (file)
--- a/src/INTERP_KERNEL/Bases/NormalizedUnstructuredMesh.hxx
+++ b/src/INTERP_KERNEL/Bases/NormalizedUnstructuredMesh.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
@@ -21,6 +21,8 @@
 #ifndef __NORMALIZEDUNSTRUCTUREDMESH_HXX__
 #define __NORMALIZEDUNSTRUCTUREDMESH_HXX__
 
+#include "NormalizedGeometricTypes"
+
 namespace INTERP_KERNEL
 {
   typedef enum
@@ -28,47 +30,6 @@ namespace INTERP_KERNEL
       ALL_C_MODE       ,
       ALL_FORTRAN_MODE
     } NumberingPolicy;
-
-
-  typedef enum
-    {
-      NORM_POINT1  =  0,
-      NORM_SEG2    =  1,
-      NORM_SEG3    =  2,
-      NORM_SEG4    =  10,
-      NORM_POLYL   =  33,
-      NORM_TRI3    =  3,
-      NORM_QUAD4   =  4,
-      NORM_POLYGON =  5,
-      NORM_TRI6    =  6,
-      NORM_TRI7    =  7,
-      NORM_QUAD8   =  8,
-      NORM_QUAD9   =  9,
-      NORM_QPOLYG  =  32,
-      //
-      NORM_TETRA4  = 14,
-      NORM_PYRA5   = 15,
-      NORM_PENTA6  = 16,
-      NORM_HEXA8   = 18,
-      NORM_TETRA10 = 20,
-      NORM_HEXGP12 = 22,
-      NORM_PYRA13  = 23,
-      NORM_PENTA15 = 25,
-      NORM_HEXA20  = 30,
-      NORM_HEXA27  = 27,
-      NORM_POLYHED = 31,
-      NORM_ERROR   = 40,
-      NORM_MAXTYPE = 33
-    } NormalizedCellType;
-
-  /// Type describing the different ways in which the hexahedron can be split into tetrahedra.
-  /// The PLANAR_* policies persume that each face is to be considered planar, while the general
-  /// policies make no such hypothesis. The integer at the end gives the number of tetrahedra
-  /// that result from the split.
-  typedef enum  { PLANAR_FACE_5 = 5, PLANAR_FACE_6 = 6, GENERAL_24 = 24, GENERAL_48 = 48 } SplittingPolicy;
-
-  class GenericMesh
-  {};
 }
 
 #endif