Changeset 1936 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

09/17/20 18:30:19 (4 years ago)

Author:

ymipsl

Message:

XIOS coupling branch :
Blitz array resizeAndPreserve crash when size=0 => use resize instead

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/mesh.cpp (modified) (7 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/mesh.cpp

@@ -539 +539 @@
           }
         }
-        nodeHashList.resizeAndPreserve(nbHash);
+        if (nbHash==0) nodeHashList.resize(nbHash);
+        else nodeHashList.resizeAndPreserve(nbHash);
 
         // (2.2) Generating global node indexes
@@ -986 +987 @@
           }
         }
-        edgeHashList.resizeAndPreserve(nEdgeHash);
+        if (nEdgeHash==0) edgeHashList.resize(nEdgeHash);
+        else edgeHashList.resizeAndPreserve(nEdgeHash);
 
         // (2.3) Generating global edge indexes
@@ -1327 +1329 @@
           }
         }
-        nodeIdxList.resizeAndPreserve(nIdx);
+        if (nIdx==0) nodeIdxList.resize(nIdx);
+        else nodeIdxList.resizeAndPreserve(nIdx);
         CClientClientDHTSizet dhtNodeIdx(nodeIdx2Idx, comm);
         dhtNodeIdx.computeIndexInfoMapping(nodeIdxList);
@@ -1377 +1380 @@
           }
         }
-        edgeHashList.resizeAndPreserve(nEdgeHash);
+        if (nEdgeHash==0) edgeHashList.resize(nEdgeHash);
+        else edgeHashList.resizeAndPreserve(nEdgeHash);
 
         // (3.4) Generating global edge indexes
@@ -1754 +1758 @@
       }
     }
-    nghbFaces.resizeAndPreserve(2, nbNghb);
+    if (nbNghb==0) nghbFaces.resize(2, nbNghb);
+    else nghbFaces.resizeAndPreserve(2, nbNghb);
   } // getGloNghbFacesNodeType
 
@@ -1806 +1811 @@
       }
     }
-    nodeHashList.resizeAndPreserve(iIdx);
+    if (iIdx==0) nodeHashList.resize(iIdx);
+    else nodeHashList.resizeAndPreserve(iIdx);
 
     // (1.2) Generating node indexes
@@ -1934 +1940 @@
       }
     }
-    nghbFaces.resizeAndPreserve(2, nbNghb);
+    if (nbNghb==0) nghbFaces.resize(2, nbNghb);
+    else nghbFaces.resizeAndPreserve(2, nbNghb);
   } // getGloNghbFacesEdgeType