X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEM%2FOverlapElementLocator.hxx;h=780f9333e66bdf9321b60fad184d1d481c786bc7;hb=1b5fb5650409b0ad3a61da3215496f2adf2dae02;hp=6ce2677f240c559981edc513d07ca7eacd166a55;hpb=766edba73b97ff6903eb9835fa94b4fe515acb39;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEM/OverlapElementLocator.hxx b/src/ParaMEDMEM/OverlapElementLocator.hxx index 6ce2677f2..780f9333e 100644 --- a/src/ParaMEDMEM/OverlapElementLocator.hxx +++ b/src/ParaMEDMEM/OverlapElementLocator.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D +// Copyright (C) 2007-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -25,65 +25,90 @@ #include "MEDCouplingNatureOfField.hxx" #include "MEDCouplingPointSet.hxx" #include "MEDCouplingMemArray.hxx" -#include "MEDCouplingAutoRefCountObjectPtr.hxx" +#include "MCAuto.hxx" #include #include #include #include -namespace ParaMEDMEM +//#define DEC_DEBUG + +namespace MEDCoupling { class ParaFIELD; class ProcessorGroup; class OverlapInterpolationMatrix; + typedef std::pair ProcCouple; // a couple of proc IDs, typically used to define a exchange betw 2 procs + class OverlapElementLocator : public INTERP_KERNEL::InterpolationOptions { public: - OverlapElementLocator(const ParaFIELD *sourceField, const ParaFIELD *targetField, const ProcessorGroup& group); + OverlapElementLocator(const ParaFIELD *sourceField, const ParaFIELD *targetField, const ProcessorGroup& group, + double epsAbs, int workSharingAlgo); virtual ~OverlapElementLocator(); const MPI_Comm *getCommunicator() const; void exchangeMeshes(OverlapInterpolationMatrix& matrix); std::vector< std::pair > getToDoList() const { return _to_do_list; } - std::vector< std::vector< int > > getProcsInInteraction() const { return _proc_pairs; } + std::vector< int > getProcsToSendFieldData() const { return _procs_to_send_field; } // same set as the set of procs we sent mesh data to std::string getSourceMethod() const; std::string getTargetMethod() const; const MEDCouplingPointSet *getSourceMesh(int procId) const; - const DataArrayInt *getSourceIds(int procId) const; + const DataArrayIdType *getSourceIds(int procId) const; const MEDCouplingPointSet *getTargetMesh(int procId) const; - const DataArrayInt *getTargetIds(int procId) const; + const DataArrayIdType *getTargetIds(int procId) const; + bool isInMyTodoList(int i, int j) const; + void debugPrintWorkSharing(std::ostream & ostr) const; private: - void computeBoundingBoxes(); + void computeBoundingBoxesAndInteractionList(); + void computeTodoList_original(); + void computeTodoList_new(bool revertIter); + void fillProcToSend(); bool intersectsBoundingBox(int i, int j) const; void sendLocalMeshTo(int procId, bool sourceOrTarget, OverlapInterpolationMatrix& matrix) const; - void receiveRemoteMesh(int procId, bool sourceOrTarget); - void sendMesh(int procId, const MEDCouplingPointSet *mesh, const DataArrayInt *idsToSend) const; - void receiveMesh(int procId, MEDCouplingPointSet* &mesh, DataArrayInt *&ids) const; + void receiveRemoteMeshFrom(int procId, bool sourceOrTarget); + void sendMesh(int procId, const MEDCouplingPointSet *mesh, const DataArrayIdType *idsToSend) const; + void receiveMesh(int procId, MEDCouplingPointSet* &mesh, DataArrayIdType *&ids) const; private: + typedef MCAuto< MEDCouplingPointSet > AutoMCPointSet; + typedef MCAuto< DataArrayIdType > AutoDAInt; + typedef std::pair Proc_SrcOrTgt; // a key indicating a proc ID and whether the data is for source mesh/field or target mesh/field + + static const int START_TAG_MESH_XCH; + const ParaFIELD *_local_source_field; const ParaFIELD *_local_target_field; + int _local_space_dim; MEDCouplingPointSet *_local_source_mesh; MEDCouplingPointSet *_local_target_mesh; - std::vector _distant_cell_meshes; - std::vector _distant_face_meshes; - //! of size _group.size(). Contains for each source proc i, the ids of proc j the targets interact with. This vector is common for all procs in _group. + + /*! of size _group.size(). Contains for each source proc i, the ids of proc j the targets interact with. + This vector is common for all procs in _group. This is the full list of jobs to do the interp. */ std::vector< std::vector< int > > _proc_pairs; - //! list of interpolations couple to be done - std::vector< std::pair > _to_do_list; - std::vector< std::pair > _procs_to_send; - std::map, MEDCouplingAutoRefCountObjectPtr< MEDCouplingPointSet > > _remote_meshes; - std::map, MEDCouplingAutoRefCountObjectPtr< DataArrayInt > > _remote_elems; + //! todo lists per proc + std::vector< std::vector< ProcCouple > > _all_todo_lists; + //! list of interpolation couples to be done by this proc only. This is a simple extraction of the member above _all_todo_lists + std::vector< ProcCouple > _to_do_list; + //! list of procs the local proc will have to send mesh data to: + std::vector< Proc_SrcOrTgt > _procs_to_send_mesh; +// /*! list of procs the local proc will have to send field data to for the final matrix-vector computation: +// * This can be different from _procs_to_send_mesh (restricted to Source) because interpolation matrix bits are computed on a potentially +// * different proc than the target one. */ + std::vector< int > _procs_to_send_field; + //! Set of distant meshes + std::map< Proc_SrcOrTgt, AutoMCPointSet > _remote_meshes; + //! Set of cell ID mappings for the above distant meshes (because only part of the meshes are exchanged) + std::map< Proc_SrcOrTgt, AutoDAInt > _remote_elems; double* _domain_bounding_boxes; - const ProcessorGroup& _group; + //! bounding box absolute adjustment + double _epsAbs; + std::vector _distant_proc_ids; + + const ProcessorGroup& _group; const MPI_Comm *_comm; - //Attributes only used by lazy side - //std::vector _values_added; - //std::vector< std::vector > _ids_per_working_proc; - //std::vector< std::vector > _ids_per_working_proc3; - //std::vector< std::vector > _values_per_working_proc; }; }