From 48cd9ef4242554ea7fcd3dc96168d003575feee7 Mon Sep 17 00:00:00 2001
From: Anthony Geay <anthony.geay@edf.fr>
Date: Tue, 19 Apr 2022 11:30:28 +0200
Subject: [PATCH] [EDF25207] : More robust implementation keeping the same
 amount size of object for MeshElement objects

---
 src/INTERP_KERNEL/MeshElement.hxx |  5 +++--
 src/INTERP_KERNEL/MeshElement.txx | 26 ++++++++++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/INTERP_KERNEL/MeshElement.hxx b/src/INTERP_KERNEL/MeshElement.hxx
index 2953cf960..fa452b785 100644
--- a/src/INTERP_KERNEL/MeshElement.hxx
+++ b/src/INTERP_KERNEL/MeshElement.hxx
@@ -37,6 +37,7 @@ namespace INTERP_KERNEL
   {
 
   public:
+    using nbnodesincelltype = std::uint32_t;
     template<class MyMeshType>
     MeshElement(const ConnType index, const MyMeshType& mesh);
     
@@ -44,7 +45,7 @@ namespace INTERP_KERNEL
     
     ConnType getIndex() const { return _index; }
     
-    std::uint16_t getNumberOfNodes() const { return _number; }
+    nbnodesincelltype getNumberOfNodes() const { return _number; }
     
     const BoundingBox* getBoundingBox() const { return _box; }
 
@@ -58,7 +59,7 @@ namespace INTERP_KERNEL
     /// global number of the element
     const ConnType _index;
 
-    const std::uint16_t _number;
+    nbnodesincelltype _number;
     
     /// bounding box of the element - does not change after having been initialised
     BoundingBox* _box;
diff --git a/src/INTERP_KERNEL/MeshElement.txx b/src/INTERP_KERNEL/MeshElement.txx
index e73d8074c..3c4d745b2 100755
--- a/src/INTERP_KERNEL/MeshElement.txx
+++ b/src/INTERP_KERNEL/MeshElement.txx
@@ -26,6 +26,8 @@
 #include "MeshUtils.hxx"
 #include "BoundingBox.hxx"
 #include <assert.h>
+#include <type_traits>
+#include <limits>
 
 namespace INTERP_KERNEL
 {
@@ -39,16 +41,24 @@ namespace INTERP_KERNEL
   template<class ConnType>
   template<class MyMeshType>
   MeshElement<ConnType>::MeshElement(const ConnType index, const MyMeshType& mesh)
-    : _index(index), _number( static_cast<std::uint16_t>(mesh.getNumberOfNodesOfElement(OTT<typename MyMeshType::MyConnType,MyMeshType::My_numPol>::indFC(index))) ), _box(nullptr)
+    : _index(index), _number( 0 ), _box(nullptr)
   {
-    const double**vertices = new const double*[_number];
+    auto numberCore = mesh.getNumberOfNodesOfElement(OTT<typename MyMeshType::MyConnType,MyMeshType::My_numPol>::indFC(index));
+    if(numberCore < std::numeric_limits<nbnodesincelltype>::max())
+    {
+      _number = static_cast< nbnodesincelltype >(numberCore);
+      const double**vertices = new const double*[_number];
+      for( nbnodesincelltype i = 0 ; i < _number ; ++i)
+        vertices[i] = getCoordsOfNode(i , OTT<typename MyMeshType::MyConnType,MyMeshType::My_numPol>::indFC(index), mesh);
 
-    for(std::uint16_t i = 0 ; i < _number ; ++i)
-      vertices[i] = getCoordsOfNode(i , OTT<typename MyMeshType::MyConnType,MyMeshType::My_numPol>::indFC(index), mesh);
-
-    // create bounding box
-    _box = new BoundingBox(vertices,_number);
-    delete [] vertices;
+      // create bounding box
+      _box = new BoundingBox(vertices,_number);
+      delete [] vertices;
+    }
+    else
+    {
+      std::cerr << "ERROR at index " << index << " : exceeding capacity !" << std::endl;
+    }
   }
     
   /**
-- 
2.39.2