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

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/transformation/domain_algorithm_expand.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm_expand.cpp

@@ -259 +259 @@
   CArray<int,1> data_j_index_dst_full(newNbLocalDst);
 
-  domainDestination->lonvalue.resizeAndPreserve(newNbLocalDst);
-  domainDestination->latvalue.resizeAndPreserve(newNbLocalDst);
-  domainDestination->bounds_lon_1d.resizeAndPreserve(nVertex, newNbLocalDst);
-  domainDestination->bounds_lat_1d.resizeAndPreserve(nVertex, newNbLocalDst);
+  if (newNbLocalDst==0)
+  {
+    domainDestination->lonvalue.resize(newNbLocalDst);
+    domainDestination->latvalue.resize(newNbLocalDst);
+    domainDestination->bounds_lon_1d.resize(nVertex, newNbLocalDst);
+    domainDestination->bounds_lat_1d.resize(nVertex, newNbLocalDst);
+  }
+  else 
+  {
+    domainDestination->lonvalue.resizeAndPreserve(newNbLocalDst);
+    domainDestination->latvalue.resizeAndPreserve(newNbLocalDst);
+    domainDestination->bounds_lon_1d.resizeAndPreserve(nVertex, newNbLocalDst);
+    domainDestination->bounds_lat_1d.resizeAndPreserve(nVertex, newNbLocalDst);
+  }
   CArray<double,1>& lon_dst   = domainDestination->lonvalue;
   CArray<double,1>& lat_dst   = domainDestination->latvalue;
@@ -532 +542 @@
   int nVertex       = bounds_lon_dst.shape()[0];
 
-  mask_1d_dst.resizeAndPreserve(newNbLocalDst);
-  i_index_dst.resizeAndPreserve(newNbLocalDst);
-  j_index_dst.resizeAndPreserve(newNbLocalDst);
-  lon_dst.resizeAndPreserve(newNbLocalDst);
-  lat_dst.resizeAndPreserve(newNbLocalDst);
-  bounds_lon_dst.resizeAndPreserve(nVertex, newNbLocalDst);
-  bounds_lat_dst.resizeAndPreserve(nVertex, newNbLocalDst);
+  if (newNbLocalDst==0)
+  {
+    mask_1d_dst.resize(newNbLocalDst);
+    i_index_dst.resize(newNbLocalDst);
+    j_index_dst.resize(newNbLocalDst);
+    lon_dst.resize(newNbLocalDst);
+    lat_dst.resize(newNbLocalDst);
+    bounds_lon_dst.resize(nVertex, newNbLocalDst);
+    bounds_lat_dst.resize(nVertex, newNbLocalDst);
+  }
+  else
+  {
+    mask_1d_dst.resizeAndPreserve(newNbLocalDst);
+    i_index_dst.resizeAndPreserve(newNbLocalDst);
+    j_index_dst.resizeAndPreserve(newNbLocalDst);
+    lon_dst.resizeAndPreserve(newNbLocalDst);
+    lat_dst.resizeAndPreserve(newNbLocalDst);
+    bounds_lon_dst.resizeAndPreserve(nVertex, newNbLocalDst);
+    bounds_lat_dst.resizeAndPreserve(nVertex, newNbLocalDst);
+  }
   CArray<int,1> data_i_index_dst_full(newNbLocalDst);
   data_i_index_dst_full(Range(0,oldNbLocal-1)) = data_i_index_src_full;