X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMEDLoader%2FMEDFileFieldOverView.cxx;h=e9709a9203e0f25342a92cb2e3369120e7f523bb;hb=1b5fb5650409b0ad3a61da3215496f2adf2dae02;hp=c2b54d60bfd34305e660301202b0f801bac93bf6;hpb=ffb8188e28b2b60ee207a8644286821bc4e8fcdc;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/MEDFileFieldOverView.cxx b/src/MEDLoader/MEDFileFieldOverView.cxx index c2b54d60b..e9709a920 100644 --- a/src/MEDLoader/MEDFileFieldOverView.cxx +++ b/src/MEDLoader/MEDFileFieldOverView.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2020 CEA/DEN, EDF R&D +// Copyright (C) 2007-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -398,14 +398,19 @@ DataArrayIdType *MEDMeshMultiLev::retrieveGlobalNodeIdsIfAny() const { const MEDFileUMesh *umesh(dynamic_cast(_mesh)); if(!umesh) - return 0; + return nullptr; const PartDefinition *pd(umesh->getPartDefAtLevel(1)); if(!pd) - return 0; + { + MCAuto gni = umesh->getGlobalNumFieldAtLevel(1); + if(gni.isNull()) + return nullptr; + return gni->deepCopy(); + } MCAuto tmp(pd->toDAI()); const DataArrayIdType *tmpCpp(tmp); if(!tmpCpp) - return 0; + return nullptr; // const DataArrayIdType *nr(_node_reduction); if(nr) @@ -1400,7 +1405,7 @@ MEDMeshMultiLev *MEDCMeshMultiLev::prepare() const MCAuto nnr; std::vector cgs,ngs(getNodeGridStructure()); cgs.resize(ngs.size()); - std::transform(ngs.begin(),ngs.end(),cgs.begin(),std::bind2nd(std::plus(),-1)); + std::transform(ngs.begin(),ngs.end(),cgs.begin(),std::bind(std::plus(),std::placeholders::_1,-1)); if(pfl) { std::vector< std::pair > cellParts; @@ -1536,7 +1541,7 @@ MEDMeshMultiLev *MEDCurveLinearMeshMultiLev::prepare() const MCAuto nnr; std::vector cgs,ngs(getNodeGridStructure()); cgs.resize(ngs.size()); - std::transform(ngs.begin(),ngs.end(),cgs.begin(),std::bind2nd(std::plus(),-1)); + std::transform(ngs.begin(),ngs.end(),cgs.begin(),std::bind(std::plus(),std::placeholders::_1,-1)); if(pfl) { std::vector< std::pair > cellParts,nodeParts;