X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDPartitioner%2FMEDPARTITIONER_ParallelTopology.cxx;h=6ba589222319767eaa31eceb1946646976a39d46;hb=b7e277ad50223814bc479c5bd64cf12abe8fc959;hp=a8a4ab5bf1f4e000ca5622c9070fa86dfb54d619;hpb=1ca2b215a1ae474745fabc87dd9c5c98e9af6354;p=tools%2Fmedcoupling.git diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx index a8a4ab5bf..6ba589222 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 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 @@ -20,10 +20,12 @@ #include "MEDPARTITIONER_MeshCollection.hxx" #include "MEDPARTITIONER_Topology.hxx" #include "MEDPARTITIONER_Graph.hxx" +#include "MEDPARTITIONER_ParaDomainSelector.hxx" #include "MEDPARTITIONER_ParallelTopology.hxx" #include "MEDPARTITIONER_ConnectZone.hxx" #include "MEDPARTITIONER_Utils.hxx" +#include "MEDCouplingSkyLineArray.hxx" #include "MEDCouplingUMesh.hxx" #include "InterpKernelHashMap.hxx" @@ -43,7 +45,7 @@ ParallelTopology::ParallelTopology():_nb_domain(0),_mesh_dimension(0) } //constructing topology according to mesh collection without global numerotation (use setGlobalNumerotation later) -ParallelTopology::ParallelTopology(const std::vector& meshes) +ParallelTopology::ParallelTopology(const std::vector& meshes) { _nb_domain=meshes.size(); _nb_cells.resize(_nb_domain); @@ -138,7 +140,7 @@ void ParallelTopology::setGlobalNumerotationDefault(ParaDomainSelector* domainSe } //constructing topology according to mesh collection -ParallelTopology::ParallelTopology(const std::vector& meshes, +ParallelTopology::ParallelTopology(const std::vector& meshes, const std::vector& cz, std::vector& cellglobal, std::vector& nodeglobal, @@ -327,9 +329,9 @@ ParallelTopology::ParallelTopology(Graph* graph, Topology* oldTopology, int nb_d { cellCorresp[ idomain ].resize( nb_domain ); } - const ParaMEDMEM::MEDCouplingSkyLineArray* skylinegraph = graph->getGraph(); + const MEDCoupling::MEDCouplingSkyLineArray* skylinegraph = graph->getGraph(); const int* index = skylinegraph->getIndex(); - const int* value = skylinegraph->getValue(); + const int* value = skylinegraph->getValues(); const int nbCells = skylinegraph->getNumberOf(); for ( int iGlob = 0; iGlob < nbCells; ++iGlob )