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

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

diff --git a/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx b/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx
index 1fcdc33a2a1ca5a26ffdfa7f2795081f71bba812..6a469b5974505197ea1ada92e5529176b3c72bce 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  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
 // 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
@@ -77,18 +77,18 @@ namespace MEDPARTITIONER
   MEDPARTITIONER_EXPORT void FieldShortDescriptionToData(const std::string& description,
                                    std::string& fieldName, int& typeField, int& entity, int& DT, int& IT);
   
-  ParaMEDMEM::DataArrayInt *CreateDataArrayIntFromVector(const std::vector<int>& v);
-  ParaMEDMEM::DataArrayInt *CreateDataArrayIntFromVector(const std::vector<int>& v, const int nbComponents);
-  ParaMEDMEM::DataArrayDouble *CreateDataArrayDoubleFromVector(const std::vector<double>& v);
+  MEDCoupling::DataArrayInt *CreateDataArrayIntFromVector(const std::vector<int>& v);
+  MEDCoupling::DataArrayInt *CreateDataArrayIntFromVector(const std::vector<int>& v, const int nbComponents);
+  MEDCoupling::DataArrayDouble *CreateDataArrayDoubleFromVector(const std::vector<double>& v);
   
-  ParaMEDMEM::MEDCouplingUMesh *CreateEmptyMEDCouplingUMesh();
+  MEDCoupling::MEDCouplingUMesh *CreateEmptyMEDCouplingUMesh();
 
-  std::vector<std::string> BrowseFieldDouble(const ParaMEDMEM::MEDCouplingFieldDouble* fd);
+  std::vector<std::string> BrowseFieldDouble(const MEDCoupling::MEDCouplingFieldDouble* fd);
   std::vector<std::string> BrowseAllFields(const std::string& myfile);
   std::vector<std::string> BrowseAllFieldsOnMesh(const std::string& myfile, const std::string& mymesh, const int idomain);
   std::vector<std::string> GetInfosOfField(const char *fileName, const char *meshName, const int idomain );
 
-#ifdef HAVE_MPI2
+#ifdef HAVE_MPI
   //not adviced, interblocking, use sendAndReceive
   //void SendVectorOfString(const std::vector<std::string>& vec, const int target);
   //std::vector<std::string> RecvVectorOfString(const int source);
@@ -104,10 +104,10 @@ namespace MEDPARTITIONER
   std::vector<int>* RecvIntVec(int source);
   void RecvIntVec(std::vector<int>& vec, const int source);
   
-  void SendDataArrayInt(const ParaMEDMEM::DataArrayInt* da, const int target);
-  ParaMEDMEM::DataArrayInt *RecvDataArrayInt(const int source);
-  void SendDataArrayDouble(const ParaMEDMEM::DataArrayDouble* da, const int target);
-  ParaMEDMEM::DataArrayDouble *RecvDataArrayDouble(const int source);
+  void SendDataArrayInt(const MEDCoupling::DataArrayInt* da, const int target);
+  MEDCoupling::DataArrayInt *RecvDataArrayInt(const int source);
+  void SendDataArrayDouble(const MEDCoupling::DataArrayDouble* da, const int target);
+  MEDCoupling::DataArrayDouble *RecvDataArrayDouble(const int source);
 
   void TestVectorOfStringMpi();
   void TestMapOfStringIntMpi();
@@ -127,6 +127,7 @@ namespace MEDPARTITIONER
     static int _Randomize;
     static int _Atomize;
     static int _Creates_Boundary_Faces;
+    static int _Create_Joints;
     static int _Is0verbose; //trace cout if rank 0 and verbose
     static std::vector<std::string> _File_Names;    //on [iold]
     static std::vector<std::string> _Mesh_Names;    //on [iold]