X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDLoader%2FParaMEDLoader.cxx;h=dbd238af10989506f8f22812baa6da6314fdd68b;hb=bb91878b3fb670041c09ea7aefce3132e157b126;hp=9c8df2aee6f2149975c0f2bea64f2bb1f47821d4;hpb=293a6104470482e450701aa8061d9b244f2057d5;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDLoader/ParaMEDLoader.cxx b/src/ParaMEDLoader/ParaMEDLoader.cxx index 9c8df2aee..dbd238af1 100644 --- a/src/ParaMEDLoader/ParaMEDLoader.cxx +++ b/src/ParaMEDLoader/ParaMEDLoader.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2012 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 // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,14 +25,15 @@ #include "MEDCouplingUMesh.hxx" #include +#include -using namespace ParaMEDMEM; +using namespace MEDCoupling; ParaMEDLoader::ParaMEDLoader() { } -void ParaMEDLoader::WriteParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh) +void ParaMEDLoader::WriteParaMesh(const char *fileName, MEDCoupling::ParaMESH *mesh) { if(!mesh->getBlockTopology()->getProcGroup()->containsMyRank()) return ; @@ -46,8 +47,8 @@ void ParaMEDLoader::WriteParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *me fileNames[i]=sstr.str(); } if(myRank==0) - WriteMasterFile(fileName,fileNames,mesh->getCellMesh()->getName()); - MEDLoader::WriteUMesh(fileNames[myRank].c_str(),dynamic_cast(mesh->getCellMesh()),true); + WriteMasterFile(fileName,fileNames,mesh->getCellMesh()->getName().c_str()); + WriteUMesh(fileNames[myRank].c_str(),dynamic_cast(mesh->getCellMesh()),true); } /*! @@ -55,11 +56,11 @@ void ParaMEDLoader::WriteParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *me */ void ParaMEDLoader::WriteMasterFile(const char *fileName, const std::vector& fileNames, const char *meshName) { - int nbOfDom=fileNames.size(); + std::size_t nbOfDom=fileNames.size(); std::ofstream fs(fileName); fs << "#MED Fichier V 2.3" << " " << std::endl; fs << "#"<<" " << std::endl; fs << nbOfDom <<" " << std::endl; - for(int i=0;i