From 2022d0d3cc72212e9222e53bbf1a2ad11c8aae6f Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 6 Feb 2020 14:35:10 +0100 Subject: [PATCH] Update C++ API consecutively to previous integration --- src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx | 2 +- src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx | 2 +- src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.cxx | 2 +- src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.hxx | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx index d5e84c0a0..281ac4de5 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx @@ -144,7 +144,7 @@ MEDCoupling::MEDFileData* MEDPARTITIONER::MEDPartitioner::getMEDFileData() return _output_collection->retrieveDriver()->getMEDFileData(); } -MEDPARTITIONER::Graph* MEDPARTITIONER::MEDPartitioner::Graph(MEDCoupling::MEDCouplingSkyLineArray* graph, Graph::splitter_type split, int* edgeweight, DataArrayInt *vlbloctab) +MEDPARTITIONER::Graph* MEDPARTITIONER::MEDPartitioner::Graph(MEDCoupling::MEDCouplingSkyLineArray* graph, Graph::splitter_type split, int* edgeweight, DataArrayIdType *vlbloctab) { MEDPARTITIONER::Graph* cellGraph=0; // will be destroyed by XXXGraph class: diff --git a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx index e020b731c..fe5a1306a 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx @@ -44,7 +44,7 @@ namespace MEDPARTITIONER MEDPartitioner(const std::string& filename, int ndomains=1, const std::string& library="metis",bool create_boundary_faces=false, bool create_joints=false, bool mesure_memory=false); MEDPartitioner(const MEDCoupling::MEDFileData* fileData, int ndomains=1, const std::string& library="metis",bool create_boundary_faces=false, bool create_joints=false, bool mesure_memory=false); MEDPartitioner(const MEDCoupling::MEDFileData* fileData, Graph* graph, bool create_boundary_faces=false, bool create_joints=false, bool mesure_memory=false); - static MEDPARTITIONER::Graph* Graph(MEDCoupling::MEDCouplingSkyLineArray* graph, Graph::splitter_type split=Graph::METIS, int* edgeweight=0, DataArrayInt* vlbloctab=0); + static MEDPARTITIONER::Graph* Graph(MEDCoupling::MEDCouplingSkyLineArray* graph, Graph::splitter_type split=Graph::METIS, int* edgeweight=0, DataArrayIdType* vlbloctab=0); static std::vector AvailableAlgorithms(); static std::vector AllAlgorithms(); static bool HasMetisAlg(); diff --git a/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.cxx b/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.cxx index 3d44cb216..a5498c203 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.cxx @@ -38,7 +38,7 @@ extern "C" using namespace MEDPARTITIONER; -PTSCOTCHGraph::PTSCOTCHGraph(MEDCoupling::MEDCouplingSkyLineArray *graph, int *edgeweight, DataArrayInt *vlbloctab):Graph(graph,edgeweight),_vlbloctab(vlbloctab) +PTSCOTCHGraph::PTSCOTCHGraph(MEDCoupling::MEDCouplingSkyLineArray *graph, int *edgeweight, DataArrayIdType *vlbloctab):Graph(graph,edgeweight),_vlbloctab(vlbloctab) { } diff --git a/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.hxx b/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.hxx index 986d8abec..b584ec358 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_PTScotchGraph.hxx @@ -36,11 +36,11 @@ namespace MEDPARTITIONER { public: PTSCOTCHGraph() { } - PTSCOTCHGraph(MEDCoupling::MEDCouplingSkyLineArray* , int *edgeweight=0, DataArrayInt *vlbloctab=0); + PTSCOTCHGraph(MEDCoupling::MEDCouplingSkyLineArray* , int *edgeweight=0, DataArrayIdType *vlbloctab=0); virtual ~PTSCOTCHGraph(); void partGraph(int ndomain, const std::string& options_string="", ParaDomainSelector* sel=0); protected: - MEDCoupling::DataArrayInt *_vlbloctab; + MEDCoupling::DataArrayIdType *_vlbloctab; }; } -- 2.39.2