Changeset 1413 for XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

Timestamp:

01/25/18 18:35:58 (6 years ago)

Author:

oabramkina

Message:

Reverting changes made in r1310 for local domain read of curvilinear and unstructured domains.
A possible bug in cases when the number of grid points is smaller than the number of clients. To be corrected.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp (modified) (11 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

@@ -256 +256 @@
 
    /*!
-     Redistribute RECTILINEAR or CURVILINEAR domain with a number of local domains.
+     Redistribute RECTILINEAR domain with a number of local domains.
    All attributes ni,nj,ibegin,jbegin (if defined) will be rewritten
    The optional attributes lonvalue, latvalue will be added. Because this function only serves (for now)
@@ -531 +531 @@
    void CDomain::fillInCurvilinearLonLat()
    {
-
      if (!lonvalue_curvilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty())
      {
@@ -537 +536 @@
        for (int jdx = 0; jdx < nj; ++jdx)
         for (int idx = 0; idx < ni; ++idx)
-            lonvalue_2d(idx,jdx) = lonvalue_curvilinear_read_from_file(idx, jdx);
-//            lonvalue_2d(idx,jdx) = lonvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin);
+         lonvalue_2d(idx,jdx) = lonvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin);
 
        lonvalue_curvilinear_read_from_file.free();
@@ -548 +546 @@
        for (int jdx = 0; jdx < nj; ++jdx)
         for (int idx = 0; idx < ni; ++idx)
-            latvalue_2d(idx,jdx) = latvalue_curvilinear_read_from_file(idx, jdx);
-//            latvalue_2d(idx,jdx) = latvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin);
+         latvalue_2d(idx,jdx) = latvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin);
 
        latvalue_curvilinear_read_from_file.free();
@@ -560 +557 @@
         for (int idx = 0; idx < ni; ++idx)
           for (int ndx = 0; ndx < nvertex; ++ndx)
-              bounds_lon_2d(ndx,idx,jdx) = bounds_lonvalue_curvilinear_read_from_file(ndx,idx, jdx);
-//              bounds_lon_2d(ndx,idx,jdx) = bounds_lonvalue_curvilinear_read_from_file(ndx,idx+ibegin, jdx+jbegin);
+         bounds_lon_2d(ndx,idx,jdx) = bounds_lonvalue_curvilinear_read_from_file(ndx,idx+ibegin, jdx+jbegin);
 
        bounds_lonvalue_curvilinear_read_from_file.free();
@@ -572 +568 @@
         for (int idx = 0; idx < ni; ++idx)
           for (int ndx = 0; ndx < nvertex; ++ndx)
-              bounds_lat_2d(ndx,idx,jdx) = bounds_latvalue_curvilinear_read_from_file(ndx,idx, jdx);
-//              bounds_lat_2d(ndx,idx,jdx) = bounds_latvalue_curvilinear_read_from_file(ndx,idx+ibegin, jdx+jbegin);
+            bounds_lat_2d(ndx,idx,jdx) = bounds_latvalue_curvilinear_read_from_file(ndx,idx+ibegin, jdx+jbegin);
 
        bounds_latvalue_curvilinear_read_from_file.free();
@@ -589 +584 @@
      {
        i_index.resize(ni);
-//       for(int idx = 0; idx < ni; ++idx) i_index(idx)=ibegin+idx;
+       for(int idx = 0; idx < ni; ++idx) i_index(idx)=ibegin+idx;
      }
 
@@ -596 +591 @@
         lonvalue_1d.resize(ni);
         for (int idx = 0; idx < ni; ++idx)
-//          lonvalue_1d(idx) = lonvalue_unstructured_read_from_file(i_index(idx));
-          lonvalue_1d(idx) = lonvalue_unstructured_read_from_file(idx);
+          lonvalue_1d(idx) = lonvalue_unstructured_read_from_file(i_index(idx));
 
         // We dont need these values anymore, so just delete them
@@ -607 +601 @@
         latvalue_1d.resize(ni);
         for (int idx = 0; idx < ni; ++idx)
-//          latvalue_1d(idx) =  latvalue_unstructured_read_from_file(i_index(idx));
-          latvalue_1d(idx) =  latvalue_unstructured_read_from_file(idx);
+          latvalue_1d(idx) =  latvalue_unstructured_read_from_file(i_index(idx));
 
         // We dont need these values anymore, so just delete them
@@ -620 +613 @@
         for (int idx = 0; idx < ni; ++idx)
           for (int jdx = 0; jdx < nbVertex; ++jdx)
-//            bounds_lon_1d(jdx,idx) = bounds_lonvalue_unstructured_read_from_file(jdx, i_index(idx));
-            bounds_lon_1d(jdx,idx) = bounds_lonvalue_unstructured_read_from_file(jdx, idx);
+            bounds_lon_1d(jdx,idx) = bounds_lonvalue_unstructured_read_from_file(jdx, i_index(idx));
 
         // We dont need these values anymore, so just delete them
@@ -633 +625 @@
         for (int idx = 0; idx < ni; ++idx)
           for (int jdx = 0; jdx < nbVertex; ++jdx)
-//            bounds_lat_1d(jdx,idx) = bounds_latvalue_unstructured_read_from_file(jdx, i_index(idx));
-            bounds_lat_1d(jdx,idx) = bounds_latvalue_unstructured_read_from_file(jdx, idx);
+            bounds_lat_1d(jdx,idx) = bounds_latvalue_unstructured_read_from_file(jdx, i_index(idx));
 
         // We dont need these values anymore, so just delete them