X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDLoader%2FParaMEDFileMesh.hxx;h=775ab258fbdd31f5ef4cb72a182840a9c3cb3b73;hb=8411b13fec372c7635bf04d2bb81a869dc038fdd;hp=52d5697a89f61258458670998723bbe38e3a0a63;hpb=47da75a11690a8e0c5253b8263c244437064e8b5;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDLoader/ParaMEDFileMesh.hxx b/src/ParaMEDLoader/ParaMEDFileMesh.hxx index 52d5697a8..775ab258f 100644 --- a/src/ParaMEDLoader/ParaMEDFileMesh.hxx +++ b/src/ParaMEDLoader/ParaMEDFileMesh.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D +// Copyright (C) 2007-2020 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 @@ -21,11 +21,13 @@ #ifndef __PARAMEDFILEMESH_HXX__ #define __PARAMEDFILEMESH_HXX__ +#include "med.h" + #include "mpi.h" #include -namespace ParaMEDMEM +namespace MEDCoupling { class MEDFileMesh; class MEDFileUMesh; @@ -35,19 +37,24 @@ namespace ParaMEDMEM class ParaMEDFileMesh { public: - static MEDFileMesh *New(const MPI_Comm com, const MPI_Info nfo, const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); + static MEDFileMesh *New(int iPart, int nbOfParts, const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); + static MEDFileMesh *ParaNew(int iPart, int nbOfParts, const MPI_Comm& com, const MPI_Info& nfo, const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); }; class ParaMEDFileUMesh { public: - static MEDFileUMesh *New(const MPI_Comm com, const MPI_Info nfo, const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); + static MEDFileUMesh *New(int iPart, int nbOfParts, const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); + static MEDFileUMesh *ParaNew(int iPart, int nbOfParts, const MPI_Comm& com, const MPI_Info& nfo, const std::string& fileName, const std::string& mName, int dt=-1, int it=-1, MEDFileMeshReadSelector *mrs=0); + private: + static MEDFileUMesh *NewPrivate(med_idt fid, int iPart, int nbOfParts, const std::string& fileName, const std::string& mName, int dt, int it, MEDFileMeshReadSelector *mrs); }; class ParaMEDFileMeshes { public: - static MEDFileMeshes *New(const MPI_Comm com, const MPI_Info nfo, const std::string& fileName); + static MEDFileMeshes *New(int iPart, int nbOfParts, const std::string& fileName); + static MEDFileMeshes *ParaNew(int iPart, int nbOfParts, const MPI_Comm& com, const MPI_Info& nfo, const std::string& fileName); }; }