X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEM%2FOverlapInterpolationMatrix.hxx;h=d652ad0244dcbc92cc48be7b542717b1ec0e3f22;hb=0b187729ac99d3e9e9bb9d2be8cb8600a783be6c;hp=2447079eeea8b016e8bf80d78f1af74ddda735d3;hpb=6f841c1f16f8b9d0b7ba50cf000ade240b2484b2;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx b/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx index 2447079ee..d652ad024 100644 --- a/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx +++ b/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx @@ -45,20 +45,21 @@ 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< int > & procsToSendField); - void computeDeno(); + void computeSurfacesAndDeno(); - void multiply(); + void multiply(double default_val); void transposeMultiply(); @@ -67,7 +68,6 @@ namespace ParaMEDMEM static void TransposeMatrix(const std::vector& matIn, int nbColsMatIn, std::vector& matOut); -// bool isSurfaceComputationNeeded(const std::string& method) const; private: ParaFIELD *_source_field; ParaFIELD *_target_field;