Changeset 1936 for XIOS

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

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• distribution/distributed_view.cpp (modified) (1 diff)
• distribution/distributed_view.hpp (modified) (1 diff)
• distribution/local_view.hpp (modified) (1 diff)
• node/mesh.cpp (modified) (7 diffs)
• test/generic_testcase.f90 (modified) (3 diffs)
• transformation/domain_algorithm_expand.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/distributed_view.cpp

@@ -29 +29 @@
       for(int i=0 ; i < size ; i++)
         if (mask(i)) { index(pos) = i ; pos++ ; }
-      index.resizeAndPreserve(pos) ;
+      if (pos==0) index.resize(pos) ;
+      else index.resizeAndPreserve(pos) ;
       size_[rank] = pos ;
     }

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/distributed_view.hpp

@@ -43 +43 @@
             }
           }
-          globalIndView.resizeAndPreserve(pos) ;
+          if (pos==0) globalIndView.resize(pos) ;
+          else globalIndView.resizeAndPreserve(pos) ;
       }
     }   

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/local_view.hpp

@@ -34 +34 @@
         }
       }
-      globalIndexView.resizeAndPreserve(pos) ;
+      if(pos==0) globalIndexView.resize(pos) ;
+      else globalIndexView.resizeAndPreserve(pos) ;
     }    
 

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
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/test/generic_testcase.f90

@@ -34 +34 @@
     DOUBLE PRECISION    :: pressure_factor
     LOGICAL :: domain_mask
+    CHARACTER(len_str) :: domain_mask_type="cross"
     LOGICAL :: axis_mask
     LOGICAL :: mask3d
@@ -755 +756 @@
     IF (.NOT. xios_getvar(prefix//"domain", params%domain) )             params%domain="lmdz"
     IF (.NOT. xios_getvar(prefix//"domain_mask", params%domain_mask) )   params%domain_mask=.FALSE.
+    IF (.NOT. xios_getvar(prefix//"domain_mask_type", params%domain_mask_type) )   params%domain_mask_type="cross"
     IF (.NOT. xios_getvar(prefix//"axis", params%axis) )                 params%axis="pressure"
     IF (.NOT. xios_getvar(prefix//"axis_mask", params%axis_mask) )       params%axis_mask=.FALSE.
@@ -1939 +1941 @@
      mask(:)=.TRUE.
      IF (params%domain_mask) THEN
-       WHERE (lon(:)-2*lat(:)>-10 .AND. lon(:)-2*lat(:) <10) mask(:)=.FALSE. 
-       WHERE (2*lat(:)+lon(:)>-10 .AND. 2*lat(:)+lon(:)<10) mask(:)=.FALSE. 
+       IF (params%domain_mask_type=="cross") THEN
+         WHERE (lon(:)-2*lat(:)>-10 .AND. lon(:)-2*lat(:) <10) mask(:)=.FALSE. 
+         WHERE (2*lat(:)+lon(:)>-10 .AND. 2*lat(:)+lon(:)<10) mask(:)=.FALSE.
+       ELSE IF (params%domain_mask_type=="latitude_band") THEN
+         WHERE (lat(:)>-30 .AND. lat(:)<30) mask(:)=.FALSE.
+      ENDIF 
      ENDIF
 

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;