Merge branch 'master' of ssh://git.salome-platform.org/tools/medcoupling

[tools/medcoupling.git] / src / MEDPartitioner / MEDPARTITIONER_MeshCollectionDriver.hxx

diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx
index c378a34089fa80765f689586bec91360143704fe..ca67f9a0331c0a3fc055a13d3323816f02f256a0 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx
@@ -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
@@ -25,7 +25,7 @@
 #include <vector>
 #include <string>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class DataArrayDouble;
   class MEDCouplingFieldDouble;
@@ -46,15 +46,15 @@ namespace MEDPARTITIONER
     virtual ~MeshCollectionDriver() { }
     virtual int read(const char*, ParaDomainSelector* sel=0) = 0;
     int readSeq(const char*,const char*);
-    ParaMEDMEM::MEDFileData *getMEDFileData();
+    MEDCoupling::MEDFileData *getMEDFileData();
     virtual void write(const char*, ParaDomainSelector* sel=0) const = 0;
-    void readMEDFileData(const ParaMEDMEM::MEDFileData* filedata);
+    void readMEDFileData(const MEDCoupling::MEDFileData* filedata);
   protected:
     void readSubdomain(int idomain);
-    void readData(ParaMEDMEM::MEDFileUMesh* mfm, int idomain) const;
+    void readData(MEDCoupling::MEDFileUMesh* mfm, int idomain) const;
     void readFileData(std::string file,std::string meshname,int idomain) const;
-    ParaMEDMEM::MEDFileMesh* getMesh(int idomain) const;
-    ParaMEDMEM::MEDCouplingFieldDouble* getField(std::string key, std::string description, ParaMEDMEM::DataArrayDouble* data, ParaMEDMEM::MEDFileMesh* mfm, int idomain) const;
+    MEDCoupling::MEDFileMesh* getMesh(int idomain) const;
+    MEDCoupling::MEDCouplingFieldDouble* getField(std::string key, std::string description, MEDCoupling::DataArrayDouble* data, MEDCoupling::MEDFileMesh* mfm, int idomain) const;
     void writeMedFile(int idomain, const std::string& distfilename) const;
   protected:
     MeshCollection* _collection;