Changeset 2269 for XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/mapper.cpp

Timestamp:

12/07/21 12:00:23 (3 years ago)

Author:

ymipsl

Message:

• Solve memory leak from remapper.
• shared_ptr add add for manage nodes.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/mapper.cpp (modified) (18 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/mapper.cpp

@@ -11 +11 @@
 #include "gridRemap.hpp"
 
+#include <fstream>
+#include "client.hpp"
+
 #include "mapper.hpp"
+
+namespace MemTrack
+{ 
+  void TrackDumpBlocks(std::ofstream& memReport, size_t memtrack_blocks, size_t memtrack_size);
+}
 
 namespace sphereRemap {
@@ -57 +65 @@
     elt.src_id.globalId = sourceGlobalId[i];
     sourceElements.push_back(elt);
-    sourceMesh.push_back(Node(elt.x, cptRadius(elt), &sourceElements.back()));
+    sourceMesh.push_back(make_shared<Node>(elt.x, cptRadius(elt), &sourceElements.back()));
     cptEltGeom(sourceElements[i], Coord(pole[0], pole[1], pole[2]));
     if (area!=NULL) sourceElements[i].given_area=area[i] ;
@@ -92 +100 @@
     Elt elt(boundsLon + offs, boundsLat + offs, nVertex);
     targetElements.push_back(elt);
-    targetMesh.push_back(Node(elt.x, cptRadius(elt), &sourceElements.back()));
+    targetMesh.push_back(make_shared<Node>(elt.x, cptRadius(elt), &sourceElements.back()));
     cptEltGeom(targetElements[i], Coord(pole[0], pole[1], pole[2]));
     if (area!=NULL) targetElements[i].given_area=area[i] ;
@@ -121 +129 @@
 
   this->buildSSTree(sourceMesh, targetMesh);
+  
 
   if (mpiRank == 0 && verbose) cout << "Computing intersections ..." << endl;
@@ -460 +469 @@
   delete[] recvElement;
   delete[] sendValue;
+  delete[] sendArea ;
+  delete[] sendGivenArea ;
   delete[] recvValue;
+  delete[] recvArea ;
+  delete[] recvGivenArea ;
   delete[] sendGrad;
   delete[] recvGrad;
@@ -490 +503 @@
   MPI_Comm_rank(communicator, &mpiRank);
 
-  vector<Node> *routingList = new vector<Node>[mpiSize];
+  vector<NodePtr> *routingList = new vector<NodePtr>[mpiSize];
   vector<vector<int> > routes(sstree.localTree.leafs.size());
 
@@ -517 +530 @@
     for (size_t j = 0; j < routingList[rank].size(); j++)
     {
-      Elt *elt = (Elt *) (routingList[rank][j].data);
+      Elt *elt = (Elt *) (routingList[rank][j]->data);
       sendMessageSize[rank] += packedPolygonSize(*elt);
     }
@@ -540 +553 @@
     for (size_t j = 0; j < routingList[rank].size(); j++)
     {
-      Elt *elt = (Elt *) (routingList[rank][j].data);
+      Elt *elt = (Elt *) (routingList[rank][j]->data);
       packPolygon(*elt, sendBuffer[rank], pos[rank]);
     }
@@ -590 +603 @@
         Elt elt;
         unpackPolygon(elt, recvBuffer[rank], pos[rank]);
-        Node node(elt.x, cptRadius(elt), &elt);
-        findNeighbour(sstree.localTree.root, &node, neighbourList);
+        NodePtr node=make_shared<Node>(elt.x, cptRadius(elt), &elt);
+        findNeighbour(sstree.localTree.root, node, neighbourList);
       }
       nbSendNode[rank] = neighbourList.size();
@@ -678 +691 @@
   /* re-compute on received elements to avoid having to send this information */
   neighbourNodes.resize(nbNeighbourNodes);
+  for(int i=0;i<neighbourNodes.size();i++) neighbourNodes[i]=make_shared<Node>() ;
   setCirclesAndLinks(neighbourElements, neighbourNodes);
   cptAllEltsGeom(neighbourElements, nbNeighbourNodes, srcGrid.pole);
@@ -692 +706 @@
   for (int j = 0; j < sstree.localTree.leafs.size(); j++)
   {
-    Node& node = sstree.localTree.leafs[j];
+    NodePtr node = sstree.localTree.leafs[j];
 
     /* find all leafs whoes circles that intersect node's circle and save into node->intersectors */
-    node.search(sstree.localTree.root);
-
-    Elt *elt = (Elt *)(node.data);
+    node->search(sstree.localTree.root);
+
+    Elt *elt = (Elt *)(node->data);
 
     for (int i = 0; i < elt->n; i++) elt->neighbour[i] = NOT_FOUND;
@@ -705 +719 @@
                    and check if they are neighbours in the sense that the two elements share an edge.
                    If they do, save this information for elt */
-    for (list<NodePtr>::iterator it = (node.intersectors).begin(); it != (node.intersectors).end(); ++it)
+    for (list<NodePtr>::iterator it = (node->intersectors).begin(); it != (node->intersectors).end(); ++it)
     {
       Elt *elt2 = (Elt *)((*it)->data);
@@ -730 +744 @@
   MPI_Barrier(communicator);
 
-  vector<Node> *routingList = new vector<Node>[mpiSize];
-
-  vector<Node> routeNodes;  routeNodes.reserve(nbElements);
+  vector<NodePtr> *routingList = new vector<NodePtr>[mpiSize];
+
+  vector<NodePtr> routeNodes;  routeNodes.reserve(nbElements);
   for (int j = 0; j < nbElements; j++)
   {
     elements[j].id.ind = j;
     elements[j].id.rank = mpiRank;
-    routeNodes.push_back(Node(elements[j].x, cptRadius(elements[j]), &elements[j]));
+    routeNodes.push_back(make_shared<Node>(elements[j].x, cptRadius(elements[j]), &elements[j]));
   }
 
@@ -766 +780 @@
     for (size_t j = 0; j < routingList[rank].size(); j++)
     {
-      Elt *elt = (Elt *) (routingList[rank][j].data);
+      Elt *elt = (Elt *) (routingList[rank][j]->data);
       sentMessageSize[rank] += packedPolygonSize(*elt);
     }
@@ -797 +811 @@
     for (size_t j = 0; j < routingList[rank].size(); j++)
     {
-      Elt* elt = (Elt *) (routingList[rank][j].data);
+      Elt* elt = (Elt *) (routingList[rank][j]->data);
       packPolygon(*elt, sendBuffer[rank], pos[rank]);
     }
@@ -841 +855 @@
         unpackPolygon(recvElt[j], recvBuffer[rank], pos[rank]);
         cptEltGeom(recvElt[j], tgtGrid.pole);
-        Node recvNode(recvElt[j].x, cptRadius(recvElt[j]), &recvElt[j]);
-        recvNode.search(sstree.localTree.root);
+        NodePtr recvNode = make_shared<Node>(recvElt[j].x, cptRadius(recvElt[j]), &recvElt[j]);
+        recvNode->search(sstree.localTree.root);
         /* for a node holding an element of the target, loop throught candidates for intersecting source */
-        for (list<NodePtr>::iterator it = (recvNode.intersectors).begin(); it != (recvNode.intersectors).end(); ++it)
+        for (list<NodePtr>::iterator it = (recvNode->intersectors).begin(); it != (recvNode->intersectors).end(); ++it)
         {
           Elt *elt2 = (Elt *) ((*it)->data);
@@ -869 +883 @@
         }
       }
+      
+      for (int j = 0; j < nbRecvNode[rank]; j++) recvElt[j].delete_intersections();
+            
       delete [] recvElt;
 
@@ -943 +960 @@
   delete [] srcRank;
   delete [] dstAddress;
+  delete [] sourceWeightId ;
+  delete [] targetWeightId ;
   if (neighbourElements) delete [] neighbourElements;
-}
-
-}
+  CTimer::release() ;
+ }
+
+}