Changeset 1970 for XIOS/trunk

Timestamp:

11/02/20 15:53:11 (4 years ago)

Author:

yushan

Message:

trunk : debug domain expand. Gather lon lat value before updating rectilinear bounds.

File:

• XIOS/trunk/src/transformation/domain_algorithm_expand.cpp (modified) (3 diffs)

XIOS/trunk/src/transformation/domain_algorithm_expand.cpp

@@ -186 +186 @@
   int data_i_begin_src = domainSource->data_ibegin;
   int data_j_begin_src = domainSource->data_jbegin;
-  CArray<double,1>& lon_src = domainSource->lonvalue;
-  CArray<double,1>& lat_src = domainSource->latvalue;
+  CArray<double,1>& lon_src = domainSource->lonvalue_1d;
+  CArray<double,1>& lat_src = domainSource->latvalue_1d;
+  CArray<double,1> lon_g;
+  CArray<double,1> lat_g;
 
   // We need to generate boundary for longitude and latitude
@@ -193 +195 @@
   {
     CArray<double,1> lon = lon_src(Range(0,niSrc-1));
-    CArray<double,1> lat = lat_src(Range(0,lat_src.numElements()-niSrc,niSrc));
+    //CArray<double,1> lat = lat_src(Range(0,lat_src.numElements()-niSrc,niSrc));
+    CArray<double,1> lat = lat_src(Range(0,lat_src.numElements()-1));
     CArray<double,2>& bounds_lon_src = domainSource->bounds_lon_1d;
     CArray<double,2>& bounds_lat_src = domainSource->bounds_lat_1d;
-    domainSource->fillInRectilinearBoundLonLat(lon_src, lat_src, bounds_lon_src, bounds_lat_src);
+    domainSource->AllgatherRectilinearLonLat(lon_src, lat_src, lon_g,lat_g);
+    domainSource->fillInRectilinearBoundLonLat(lon_g, lat_g, bounds_lon_src, bounds_lat_src);
   }
 
@@ -326 +330 @@
     //Pack data
     int dataIdx = 0;
-    data[dataIdx] = lon_src(idx);++dataIdx;
-    data[dataIdx] = lat_src(idx);++dataIdx;
+    //data[dataIdx] = lon_src(idx);++dataIdx;
+    //data[dataIdx] = lat_src(idx);++dataIdx;
     for (int i = 0; i < nVertex; ++i)
     {