Ignore:
Timestamp:
02/02/18 16:26:29 (4 years ago)
Author:
oabramkina
Message:

Reading of curvilinear and unstructured domains locally by clients is back.

Reading of cfsites has been tested.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

    r1413 r1419  
    256256 
    257257   /*! 
    258      Redistribute RECTILINEAR domain with a number of local domains. 
     258     Redistribute RECTILINEAR or CURVILINEAR domain with a number of local domains. 
    259259   All attributes ni,nj,ibegin,jbegin (if defined) will be rewritten 
    260260   The optional attributes lonvalue, latvalue will be added. Because this function only serves (for now) 
     
    536536       for (int jdx = 0; jdx < nj; ++jdx) 
    537537        for (int idx = 0; idx < ni; ++idx) 
    538          lonvalue_2d(idx,jdx) = lonvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin); 
     538         lonvalue_2d(idx,jdx) = lonvalue_curvilinear_read_from_file(idx, jdx); 
    539539 
    540540       lonvalue_curvilinear_read_from_file.free(); 
     
    546546       for (int jdx = 0; jdx < nj; ++jdx) 
    547547        for (int idx = 0; idx < ni; ++idx) 
    548          latvalue_2d(idx,jdx) = latvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin); 
     548           latvalue_2d(idx,jdx) = latvalue_curvilinear_read_from_file(idx, jdx); 
    549549 
    550550       latvalue_curvilinear_read_from_file.free(); 
     
    557557        for (int idx = 0; idx < ni; ++idx) 
    558558          for (int ndx = 0; ndx < nvertex; ++ndx) 
    559          bounds_lon_2d(ndx,idx,jdx) = bounds_lonvalue_curvilinear_read_from_file(ndx,idx+ibegin, jdx+jbegin); 
     559            bounds_lon_2d(ndx,idx,jdx) = bounds_lonvalue_curvilinear_read_from_file(ndx,idx, jdx); 
    560560 
    561561       bounds_lonvalue_curvilinear_read_from_file.free(); 
     
    568568        for (int idx = 0; idx < ni; ++idx) 
    569569          for (int ndx = 0; ndx < nvertex; ++ndx) 
    570             bounds_lat_2d(ndx,idx,jdx) = bounds_latvalue_curvilinear_read_from_file(ndx,idx+ibegin, jdx+jbegin); 
     570            bounds_lat_2d(ndx,idx,jdx) = bounds_latvalue_curvilinear_read_from_file(ndx,idx, jdx); 
    571571 
    572572       bounds_latvalue_curvilinear_read_from_file.free(); 
     
    591591        lonvalue_1d.resize(ni); 
    592592        for (int idx = 0; idx < ni; ++idx) 
    593           lonvalue_1d(idx) = lonvalue_unstructured_read_from_file(i_index(idx)); 
     593          lonvalue_1d(idx) = lonvalue_unstructured_read_from_file(idx); 
    594594 
    595595        // We dont need these values anymore, so just delete them 
     
    601601        latvalue_1d.resize(ni); 
    602602        for (int idx = 0; idx < ni; ++idx) 
    603           latvalue_1d(idx) =  latvalue_unstructured_read_from_file(i_index(idx)); 
     603          latvalue_1d(idx) =  latvalue_unstructured_read_from_file(idx); 
    604604 
    605605        // We dont need these values anymore, so just delete them 
     
    613613        for (int idx = 0; idx < ni; ++idx) 
    614614          for (int jdx = 0; jdx < nbVertex; ++jdx) 
    615             bounds_lon_1d(jdx,idx) = bounds_lonvalue_unstructured_read_from_file(jdx, i_index(idx)); 
     615            bounds_lon_1d(jdx,idx) = bounds_lonvalue_unstructured_read_from_file(jdx, idx); 
    616616 
    617617        // We dont need these values anymore, so just delete them 
     
    625625        for (int idx = 0; idx < ni; ++idx) 
    626626          for (int jdx = 0; jdx < nbVertex; ++jdx) 
    627             bounds_lat_1d(jdx,idx) = bounds_latvalue_unstructured_read_from_file(jdx, i_index(idx)); 
     627            bounds_lat_1d(jdx,idx) = bounds_latvalue_unstructured_read_from_file(jdx, idx); 
    628628 
    629629        // We dont need these values anymore, so just delete them 
Note: See TracChangeset for help on using the changeset viewer.