[Bug fix] : creation of redundant nodes in BuildSlice3D

[tools/medcoupling.git] / src / RENUMBER / RENUMBER_BOOSTRenumbering.cxx

diff --git a/src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx b/src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx
index 99c225ec59b559b7143eb1fff60eefb2a0e874cb..a87d68c541128be39f384934bca1fbd924556f52 100644 (file)
--- a/src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx
+++ b/src/RENUMBER/RENUMBER_BOOSTRenumbering.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2021  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
@@ -20,7 +20,7 @@
 #include "RENUMBER_BOOSTRenumbering.hxx"
 
 #include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingAutoRefCountObjectPtr.hxx"
+#include "MCAuto.hxx"
 
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>
@@ -28,27 +28,25 @@
 #include <boost/graph/properties.hpp>
 #include <boost/graph/bandwidth.hpp>
 
-void BOOSTRenumbering::renumber(const int *graph, const int *index_graph, int nbCell, MEDCoupling::DataArrayInt *&iperm, MEDCoupling::DataArrayInt *&perm)
+void BOOSTRenumbering::renumber(const mcIdType *graph, const mcIdType *index_graph, mcIdType nbCell, MEDCoupling::DataArrayIdType *&iperm, MEDCoupling::DataArrayIdType *&perm)
 {
-  MEDCoupling::MEDCouplingAutoRefCountObjectPtr<MEDCoupling::DataArrayInt> out0(MEDCoupling::DataArrayInt::New()),out1(MEDCoupling::DataArrayInt::New());
+  MEDCoupling::MCAuto<MEDCoupling::DataArrayIdType> out0(MEDCoupling::DataArrayIdType::New()),out1(MEDCoupling::DataArrayIdType::New());
   out0->alloc(nbCell,1); out1->alloc(nbCell,1);
   out0->fillWithZero(); out1->fillWithZero();
   //
   typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS, 
      boost::property<boost::vertex_color_t, boost::default_color_type,
-       boost::property<boost::vertex_degree_t,int> > > Graph;
-  typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
-  typedef boost::graph_traits<Graph>::vertices_size_type size_type;
+       boost::property<boost::vertex_degree_t,mcIdType> > > Graph;
   Graph G(nbCell);
-  for (int i=0;i<nbCell;++i)
-    for (int j=index_graph[i];j<index_graph[i+1];++j)
+  for (mcIdType i=0;i<nbCell;++i)
+    for (mcIdType j=index_graph[i];j<index_graph[i+1];++j)
       add_edge(i,graph[j],G);
   boost::property_map<Graph, boost::vertex_index_t>::type
     index_map = boost::get(boost::vertex_index, G);
   boost::cuthill_mckee_ordering(G, out0->getPointer(), boost::get(boost::vertex_color, G),
                            boost::make_degree_map(G));
-  int *out0Ptr(out0->getPointer()),*out1Ptr(out1->getPointer());
-  for(int c=0;c!=nbCell;++c)
+  mcIdType *out0Ptr(out0->getPointer()),*out1Ptr(out1->getPointer());
+  for(mcIdType c=0;c!=nbCell;++c)
     out1Ptr[index_map[out0Ptr[nbCell-c-1]]]=c;
   out0->reverse();
   iperm=out0.retn(); perm=out1.retn();