Various fixes for test runs - introducing MEDCOUPLING_RESOURCE_DIR env variable

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

diff --git a/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx b/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx
index 2447079eeea8b016e8bf80d78f1af74ddda735d3..d884f963df093d633c1899344a801484b2360b6f 100644 (file)
--- a/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx
+++ b/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -26,7 +26,7 @@
 #include "InterpolationOptions.hxx"
 #include "DECOptions.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class ParaFIELD;
   class MEDCouplingPointSet;
@@ -45,37 +45,35 @@ namespace ParaMEDMEM
                                ParaFIELD *target_field,
                                const ProcessorGroup& group,
                                const DECOptions& dec_opt,
-                               const InterpolationOptions& i_opt);
+                               const InterpolationOptions& i_opt,
+                               const OverlapElementLocator & loc);
 
-    void keepTracksOfSourceIds(int procId, DataArrayInt *ids);
+    void keepTracksOfSourceIds(int procId, DataArrayIdType *ids);
 
-    void keepTracksOfTargetIds(int procId, DataArrayInt *ids);
+    void keepTracksOfTargetIds(int procId, DataArrayIdType *ids);
 
-    void addContribution(const MEDCouplingPointSet *src, const DataArrayInt *srcIds, const std::string& srcMeth, int srcProcId,
-                         const MEDCouplingPointSet *trg, const DataArrayInt *trgIds, const std::string& trgMeth, int trgProcId);
+    void computeLocalIntersection(const MEDCouplingPointSet *src, const DataArrayIdType *srcIds, const std::string& srcMeth, int srcProcId,
+                         const MEDCouplingPointSet *trg, const DataArrayIdType *trgIds, const std::string& trgMeth, int trgProcId);
 
     void prepare(const std::vector< int > & procsToSendField);
     
-    void computeDeno();
+    void computeSurfacesAndDeno();
 
-    void multiply();
+    void multiply(double default_val);
 
     void transposeMultiply();
     
     virtual ~OverlapInterpolationMatrix();
   private:
 
-    static void TransposeMatrix(const std::vector<SparseDoubleVec>& matIn, int nbColsMatIn,
+    static void TransposeMatrix(const std::vector<SparseDoubleVec>& matIn, mcIdType nbColsMatIn,
                                 std::vector<SparseDoubleVec>& matOut);
-//    bool isSurfaceComputationNeeded(const std::string& method) const;
   private:
     ParaFIELD           *_source_field;
     ParaFIELD           *_target_field;
     MEDCouplingPointSet *_source_support;
     MEDCouplingPointSet *_target_support;
     OverlapMapping      _mapping;
- 
-    const ProcessorGroup& _group;
   };
 }