fix conflict

[modules/med.git] / medtool / src / ParaMEDMEM / OverlapInterpolationMatrix.hxx

diff --git a/medtool/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx b/medtool/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx
index 2190e9adddb3f6651f162cfc51092dccbffbafa8..d652ad0244dcbc92cc48be7b542717b1ec0e3f22 100644 (file)
--- a/medtool/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx
+++ b/medtool/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx
@@ -45,86 +45,37 @@ 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 keepTracksOfTargetIds(int procId, DataArrayInt *ids);
 
-    void addContribution(const MEDCouplingPointSet *src, const DataArrayInt *srcIds, const std::string& srcMeth, int srcProcId,
+    void computeLocalIntersection(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 prepare(const std::vector< std::vector<int> >& procsInInteraction);
+    void prepare(const std::vector< int > & procsToSendField);
     
-    void computeDeno();
+    void computeSurfacesAndDeno();
 
-    void multiply();
+    void multiply(double default_val);
 
     void transposeMultiply();
     
     virtual ~OverlapInterpolationMatrix();
-#if 0
-    void addContribution(MEDCouplingPointSet& distant_support, int iproc_distant,
-                         const int* distant_elems, const std::string& srcMeth, const std::string& targetMeth);
-    void finishContributionW(ElementLocator& elementLocator);
-    void finishContributionL(ElementLocator& elementLocator);
-    void multiply(MEDCouplingFieldDouble& field) const;
-    void transposeMultiply(MEDCouplingFieldDouble& field)const;
-    void prepare();
-    int getNbRows() const { return _row_offsets.size(); }
-    MPIAccessDEC* getAccessDEC() { return _mapping.getAccessDEC(); }
   private:
-    void computeConservVolDenoW(ElementLocator& elementLocator);
-    void computeIntegralDenoW(ElementLocator& elementLocator);
-    void computeRevIntegralDenoW(ElementLocator& elementLocator);
-    void computeGlobConstraintDenoW(ElementLocator& elementLocator);
-    void computeConservVolDenoL(ElementLocator& elementLocator);
-    void computeIntegralDenoL(ElementLocator& elementLocator);
-    void computeRevIntegralDenoL(ElementLocator& elementLocator);
-    
-    void computeLocalColSum(std::vector<double>& res) const;
-    void computeLocalRowSum(const std::vector<int>& distantProcs, std::vector<std::vector<int> >& resPerProcI,
-                            std::vector<std::vector<double> >& resPerProcD) const;
-    void computeGlobalRowSum(ElementLocator& elementLocator, std::vector<std::vector<double> >& denoStrorage, std::vector<std::vector<double> >& denoStrorageInv);
-    void computeGlobalColSum(std::vector<std::vector<double> >& denoStrorage);
-    void resizeGlobalColSum(std::vector<std::vector<double> >& denoStrorage);
-    void fillDSFromVM(int iproc_distant, const int* distant_elems, const std::vector< std::map<int,double> >& values, MEDCouplingFieldDouble *surf);
-    void serializeMe(std::vector< std::vector< std::map<int,double> > >& data1, std::vector<int>& data2) const;
-    void initialize();
-    void findAdditionnalElements(ElementLocator& elementLocator, std::vector<std::vector<int> >& elementsToAdd,
-                                 const std::vector<std::vector<int> >& resPerProcI, const std::vector<std::vector<int> >& globalIdsPartial);
-    void addGhostElements(const std::vector<int>& distantProcs, const std::vector<std::vector<int> >& elementsToAdd);
-    int mergePolicies(const std::vector<int>& policyPartial);
-    void mergeRowSum(const std::vector< std::vector<double> >& rowsPartialSumD, const std::vector< std::vector<int> >& globalIdsPartial,
-                     std::vector<int>& globalIdsLazySideInteraction, std::vector<double>& sumCorresponding);
-    void mergeRowSum2(const std::vector< std::vector<int> >& globalIdsPartial, std::vector< std::vector<double> >& rowsPartialSumD,
-                      const std::vector<int>& globalIdsLazySideInteraction, const std::vector<double>& sumCorresponding);
-    void mergeRowSum3(const std::vector< std::vector<int> >& globalIdsPartial, std::vector< std::vector<double> >& rowsPartialSumD);
-    void mergeCoeffs(const std::vector<int>& procsInInteraction, const std::vector< std::vector<int> >& rowsPartialSumI,
-                     const std::vector<std::vector<int> >& globalIdsPartial, std::vector<std::vector<double> >& denoStrorageInv);
-    void divideByGlobalRowSum(const std::vector<int>& distantProcs, const std::vector<std::vector<int> >& resPerProcI,
-                              const std::vector<std::vector<double> >& resPerProcD, std::vector<std::vector<double> >& deno);
-#endif
-  private:
-    bool isSurfaceComputationNeeded(const std::string& method) const;
-    void fillDistributedMatrix(const std::vector< std::map<int,double> >& res,
-                               const DataArrayInt *srcIds, int srcProc,
-                               const DataArrayInt *trgIds, int trgProc);
-    static void TransposeMatrix(const std::vector<std::map<int,double> >& matIn, int nbColsMatIn, std::vector<std::map<int,double> >& matOut);
+
+    static void TransposeMatrix(const std::vector<SparseDoubleVec>& matIn, int nbColsMatIn,
+                                std::vector<SparseDoubleVec>& matOut);
   private:
-    ParaMEDMEM::ParaFIELD *_source_field;
-    ParaMEDMEM::ParaFIELD *_target_field;
-    std::vector<int> _row_offsets;
-    std::map<std::pair<int,int>, int > _col_offsets;
+    ParaFIELD           *_source_field;
+    ParaFIELD           *_target_field;
     MEDCouplingPointSet *_source_support;
     MEDCouplingPointSet *_target_support;
-    OverlapMapping _mapping;
+    OverlapMapping      _mapping;
  
     const ProcessorGroup& _group;
-    std::vector< std::vector<double> > _target_volume;
-    std::vector<std::vector<std::pair<int,double> > > _coeffs;
-    std::vector<std::vector<double> > _deno_multiply;
-    std::vector<std::vector<double> > _deno_reverse_multiply;
   };
 }