Various fixes for test runs - introducing MEDCOUPLING_RESOURCE_DIR env variable

[tools/medcoupling.git] / src / ParaMEDMEM / ElementLocator.hxx

diff --git a/src/ParaMEDMEM/ElementLocator.hxx b/src/ParaMEDMEM/ElementLocator.hxx
old mode 100755 (executable)
new mode 100644 (file)
index e3ff0f2..dd14082
--- a/src/ParaMEDMEM/ElementLocator.hxx
+++ b/src/ParaMEDMEM/ElementLocator.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
@@ -22,20 +22,23 @@
 
 #include "InterpolationOptions.hxx"
 #include "MEDCouplingNatureOfField.hxx"
+#include "MCType.hxx"
 
 #include <mpi.h>
 #include <vector>
 #include <set>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class ParaFIELD;
   class ProcessorGroup;
-  class ParaSUPPORT;
   class InterpolationMatrix;
   class MEDCouplingPointSet;
   class DataArrayInt;
 
+  /*! Internal class, not part of the public API. Used in InterpolationMatrix.
+   *
+   */
   class ElementLocator : public INTERP_KERNEL::InterpolationOptions
   {
   public:
@@ -44,7 +47,7 @@ namespace ParaMEDMEM
     virtual ~ElementLocator();
     void exchangeMesh(int idistantrank,
                       MEDCouplingPointSet*& target_mesh,
-                      int*& distant_ids);
+                      mcIdType*& distant_ids);
     void exchangeMethod(const std::string& sourceMeth, int idistantrank, std::string& targetMeth);
     const std::vector<int>& getDistantProcIds() const { return _distant_proc_ids; }
     const MPI_Comm *getCommunicator() const;
@@ -53,15 +56,15 @@ namespace ParaMEDMEM
     bool isM1DCorr() const { return _is_m1d_corr; }
     //Working side methods
     void recvPolicyFromLazySideW(std::vector<int>& policy);
-    void sendSumToLazySideW(const std::vector< std::vector<int> >& distantLocEltIds, const std::vector< std::vector<double> >& partialSumRelToDistantIds);
+    void sendSumToLazySideW(const std::vector< std::vector<mcIdType> >& distantLocEltIds, const std::vector< std::vector<double> >& partialSumRelToDistantIds);
     void recvSumFromLazySideW(std::vector< std::vector<double> >& globalSumRelToDistantIds);
-    void sendCandidatesForAddElementsW(const std::vector<int>& distantGlobIds);
-    void recvAddElementsFromLazyProcsW(std::vector<std::vector<int> >& elementsToAdd);
+    void sendCandidatesForAddElementsW(const std::vector<mcIdType>& distantGlobIds);
+    void recvAddElementsFromLazyProcsW(std::vector<std::vector<mcIdType> >& elementsToAdd);
     //
-    void sendLocalIdsToLazyProcsW(const std::vector< std::vector<int> >& distantLocEltIds);
-    void recvGlobalIdsFromLazyProcsW(const std::vector< std::vector<int> >& distantLocEltIds, std::vector< std::vector<int> >& globalIds);
-    void recvCandidatesGlobalIdsFromLazyProcsW(std::vector< std::vector<int> >& globalIds);
-    void sendPartialSumToLazyProcsW(const std::vector<int>& distantGlobIds, const std::vector<double>& sum);
+    void sendLocalIdsToLazyProcsW(const std::vector< std::vector<mcIdType> >& distantLocEltIds);
+    void recvGlobalIdsFromLazyProcsW(const std::vector< std::vector<mcIdType> >& distantLocEltIds, std::vector< std::vector<mcIdType> >& globalIds);
+    void recvCandidatesGlobalIdsFromLazyProcsW(std::vector< std::vector<mcIdType> >& globalIds);
+    void sendPartialSumToLazyProcsW(const std::vector<mcIdType>& distantGlobIds, const std::vector<double>& sum);
     //Lazy side methods
     int sendPolicyToWorkingSideL();
     void recvFromWorkingSideL();
@@ -78,8 +81,8 @@ namespace ParaMEDMEM
     void _computeBoundingBoxes();
     bool _intersectsBoundingBox(int irank);
     void _exchangeMesh(MEDCouplingPointSet* local_mesh, MEDCouplingPointSet*& distant_mesh,
-                       int iproc_distant, const DataArrayInt* distant_ids_send,
-                       int*& distant_ids_recv);
+                       int iproc_distant, const DataArrayIdType* distant_ids_send,
+                       mcIdType*& distant_ids_recv);
   private:
     const ParaFIELD&  _local_para_field ;
     MEDCouplingPointSet* _local_cell_mesh;
@@ -96,8 +99,8 @@ namespace ParaMEDMEM
     const MPI_Comm *_comm;
     //Attributes only used by lazy side
     std::vector<double> _values_added;
-    std::vector< std::vector<int> > _ids_per_working_proc;
-    std::vector< std::vector<int> > _ids_per_working_proc3;
+    std::vector< std::vector<mcIdType> > _ids_per_working_proc;
+    std::vector< std::vector<mcIdType> > _ids_per_working_proc3;
     std::vector< std::vector<double> > _values_per_working_proc;
   public:
     static const int CUMULATIVE_POLICY=3;