X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FParaMEDMEM%2FExplicitTopology.cxx;h=0d46627db0acb29c9345f960528b4103ea761d64;hb=740f93fb5c29f8a2b5439f25381c0963d854272e;hp=3812db4f9c3c21a789989c6ac61cb231858a77a2;hpb=5da72d398d0eb1820c3ce6dd90b8579b6b14edf5;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEM/ExplicitTopology.cxx b/src/ParaMEDMEM/ExplicitTopology.cxx index 3812db4f9..0d46627db 100644 --- a/src/ParaMEDMEM/ExplicitTopology.cxx +++ b/src/ParaMEDMEM/ExplicitTopology.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D +// Copyright (C) 2007-2019 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 @@ -43,10 +43,10 @@ _proc_group(paramesh.getBlockTopology()->getProcGroup()), _nb_components(1) { _nb_elems=paramesh.getCellMesh()->getNumberOfCells(); - const int* global=paramesh.getGlobalNumberingCell(); - _loc2glob=new int[_nb_elems]; + const mcIdType* global=paramesh.getGlobalNumberingCell(); + _loc2glob=new mcIdType[_nb_elems]; - for (int i=0; i<_nb_elems; i++) + for (mcIdType i=0; i<_nb_elems; i++) { _loc2glob[i]=global[i]; _glob2loc[global[i]]=i; @@ -58,8 +58,8 @@ ExplicitTopology::ExplicitTopology(const ExplicitTopology& topo, int nb_componen _proc_group = topo._proc_group; _nb_elems = topo._nb_elems; _nb_components = nb_components; - _loc2glob=new int[_nb_elems]; - for (int i=0; i<_nb_elems; i++) + _loc2glob=new mcIdType[_nb_elems]; + for (mcIdType i=0; i<_nb_elems; i++) { _loc2glob[i]=topo._loc2glob[i]; } @@ -75,18 +75,18 @@ ExplicitTopology::~ExplicitTopology() /*! Serializes the data contained in the Explicit Topology * for communication purposes*/ -void ExplicitTopology::serialize(int* & serializer, int& size) const +void ExplicitTopology::serialize(mcIdType* & serializer, mcIdType& size) const { - vector buffer; + vector buffer; buffer.push_back(_nb_elems); - for (int i=0; i<_nb_elems; i++) + for (mcIdType i=0; i<_nb_elems; i++) { buffer.push_back(_loc2glob[i]); } - serializer=new int[buffer.size()]; - size= buffer.size(); + serializer=new mcIdType[buffer.size()]; + size=ToIdType(buffer.size()); copy(buffer.begin(), buffer.end(), serializer); } @@ -94,14 +94,14 @@ void ExplicitTopology::serialize(int* & serializer, int& size) const * after communication. Uses the same structure as the one used for serialize() * * */ -void ExplicitTopology::unserialize(const int* serializer,const CommInterface& comm_interface) +void ExplicitTopology::unserialize(const mcIdType* serializer,const CommInterface& comm_interface) { - const int* ptr_serializer=serializer; + const mcIdType* ptr_serializer=serializer; cout << "unserialize..."<