Changeset 1410


Ignore:
Timestamp:
01/24/18 18:45:14 (2 years ago)
Author:
oabramkina
Message:

Improving protocol for reading : grid attributes such longitude, latitude, etc are read by clients locally.
It concerns only curvilinear and unstructured domains. Local attributes such as ni/nj, ibegin/jbegin are mandatory as before.

Location:
XIOS/dev/XIOS_DEV_CMIP6/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/XIOS_DEV_CMIP6/src/config/domain_attribute_private.conf

    r1158 r1410  
    1010DECLARE_ATTRIBUTE_PRIVATE(double,  bounds_lat_end) 
    1111 
    12 // Array contain whole value (non distributed) of longitude and latitude read from a file 
     12//  Array contain whole value (non distributed) of longitude and latitude read from a file 
    1313DECLARE_ARRAY_PRIVATE(double, 1, lonvalue_rectilinear_read_from_file) 
    1414DECLARE_ARRAY_PRIVATE(double, 1, latvalue_rectilinear_read_from_file) 
    1515 
    16 // Array contain whole value (non distributed) of longitude and latitude of curvilinear read from a file 
     16// Array containing longitude and latitude of LOCAL curvilinear domain to be read from a file 
    1717DECLARE_ARRAY_PRIVATE(double, 2, lonvalue_curvilinear_read_from_file) 
    1818DECLARE_ARRAY_PRIVATE(double, 2, latvalue_curvilinear_read_from_file) 
     
    2020DECLARE_ARRAY_PRIVATE(double, 3, bounds_latvalue_curvilinear_read_from_file) 
    2121 
    22 // Array contain whole value (non distributed) of longitude and latitude of unstructured read from a file 
     22// Array containing longitude and latitude of LOCAL unstructured domain to be read from a file 
    2323DECLARE_ARRAY_PRIVATE(double, 1, lonvalue_unstructured_read_from_file) 
    2424DECLARE_ARRAY_PRIVATE(double, 1, latvalue_unstructured_read_from_file) 
  • XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp

    r1310 r1410  
    264264    if ((CDomain::type_attr::rectilinear == domain->type)) 
    265265    { 
    266       // Ok, try to read some f.. attributes such as longitude and latitude 
     266      // Ok, try to read some attributes such as longitude and latitude 
    267267      bool hasLat = SuperClassWriter::hasVariable(itMapNj->first); 
    268268      if (hasLat) 
     
    283283    else if ((CDomain::type_attr::curvilinear == domain->type)) 
    284284    { 
    285       int ni = domain->ni; 
    286       int nj = domain->nj; 
     285      int ni, nj; 
    287286      std::vector<StdSize> nBeginLatLon(2), nSizeLatLon(2); 
    288       nBeginLatLon[0] = 0; nBeginLatLon[1] = 0; 
    289       nSizeLatLon[0]  = domain->nj_glo.getValue(); nSizeLatLon[1] = domain->ni_glo.getValue(); 
     287 
     288      if (domain->ni.isEmpty()) 
     289      { 
     290        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)", 
     291          << " Value of attribute ni should be defined for domain " << domain->getDomainOutputName() 
     292          << " in file " << this->filename << "." 
     293          << " The value can be provided by a user or generated automatically by XIOS." 
     294          << " Functionality generate_rectilinear_domain can also be used for curvilinear domains." 
     295          << std::endl); 
     296      } 
     297 
     298      if (domain->nj.isEmpty()) 
     299      { 
     300        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)", 
     301          << " Value of attribute nj should be defined for domain " << domain->getDomainOutputName() 
     302          << " in file " << this->filename << "." 
     303          << " The value can be provided by a user or generated automatically by XIOS." 
     304          << " Functionality generate_rectilinear_domain can also be used for curvilinear domains." 
     305          << std::endl); 
     306      } 
     307 
     308      if (domain->ibegin.isEmpty()) 
     309      { 
     310        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)", 
     311          << " Value of attribute ibegin should be defined for domain " << domain->getDomainOutputName() 
     312          << " in file " << this->filename << "." 
     313          << " The value can be provided by a user or generated automatically by XIOS." 
     314          << " Functionality generate_rectilinear_domain can also be used for curvilinear domains." 
     315          << std::endl); 
     316      } 
     317 
     318      if (domain->jbegin.isEmpty()) 
     319      { 
     320        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)", 
     321          << " Value of attribute jbegin should be defined for domain " << domain->getDomainOutputName() 
     322          << " in file " << this->filename << "." 
     323          << " The value can be provided by a user or generated automatically by XIOS." 
     324          << " Functionality generate_rectilinear_domain can also be used for curvilinear domains." 
     325          << std::endl); 
     326      } 
     327 
     328      ni = domain->ni; 
     329      nj = domain->nj; 
     330      nBeginLatLon[0] = domain->jbegin; nBeginLatLon[1] = domain->ibegin; 
     331      nSizeLatLon[0]  = nj; nSizeLatLon[1] = ni; 
     332//      ni = domain->ni_glo; 
     333//      nj = domain->nj_glo; 
     334//      nBeginLatLon[0] = 0; nBeginLatLon[1] = 0; 
     335//      nSizeLatLon[0]  = domain->nj_glo.getValue(); nSizeLatLon[1] = domain->ni_glo.getValue(); 
    290336 
    291337      StdString latName = this->getLatCoordName(fieldId); 
    292338      if (SuperClassWriter::hasVariable(latName)) 
    293339      { 
    294         domain->latvalue_curvilinear_read_from_file.resize(domain->ni_glo,domain->nj_glo); 
     340        domain->latvalue_curvilinear_read_from_file.resize(ni,nj); 
    295341        readFieldVariableValue(domain->latvalue_curvilinear_read_from_file, latName, nBeginLatLon, nSizeLatLon); 
    296342      } 
     
    298344      if (SuperClassWriter::hasVariable(lonName)) 
    299345      { 
    300         domain->lonvalue_curvilinear_read_from_file.resize(domain->ni_glo,domain->nj_glo); 
     346        domain->lonvalue_curvilinear_read_from_file.resize(ni,nj); 
    301347        readFieldVariableValue(domain->lonvalue_curvilinear_read_from_file, lonName, nBeginLatLon, nSizeLatLon); 
    302348      } 
     
    320366 
    321367      std::vector<StdSize> nBeginBndsLatLon(3), nSizeBndsLatLon(3); 
    322       nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->nj_glo.getValue(); 
    323       nBeginBndsLatLon[1] = 0; nSizeBndsLatLon[1] = domain->ni_glo.getValue(); 
     368      nBeginBndsLatLon[0] = domain->jbegin; nSizeBndsLatLon[0] = domain->nj.getValue(); 
     369      nBeginBndsLatLon[1] = domain->ibegin; nSizeBndsLatLon[1] = domain->ni.getValue(); 
    324370      nBeginBndsLatLon[2] = 0; nSizeBndsLatLon[2] = nbVertex; 
     371//      nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->nj_glo.getValue(); 
     372//      nBeginBndsLatLon[1] = 0; nSizeBndsLatLon[1] = domain->ni_glo.getValue(); 
     373//      nBeginBndsLatLon[2] = 0; nSizeBndsLatLon[2] = nbVertex; 
    325374 
    326375      if (SuperClassWriter::hasVariable(boundsLatName)) 
    327376      { 
    328         domain->bounds_latvalue_curvilinear_read_from_file.resize(nbVertex,domain->ni_glo,domain->nj_glo); 
     377        domain->bounds_latvalue_curvilinear_read_from_file.resize(nbVertex,ni,nj); 
    329378        readFieldVariableValue(domain->bounds_latvalue_curvilinear_read_from_file, boundsLatName, nBeginBndsLatLon, nSizeBndsLatLon); 
    330379 
     
    332381      if (SuperClassWriter::hasVariable(boundsLonName))  
    333382      { 
    334         domain->bounds_lonvalue_curvilinear_read_from_file.resize(nbVertex,domain->ni_glo,domain->nj_glo); 
     383        domain->bounds_lonvalue_curvilinear_read_from_file.resize(nbVertex,ni,nj); 
    335384        readFieldVariableValue(domain->bounds_lonvalue_curvilinear_read_from_file, boundsLonName, nBeginBndsLatLon, nSizeBndsLatLon); 
    336385      }       
     
    338387    else if ((CDomain::type_attr::unstructured == domain->type))// || (this->isUnstructured(fieldId))) 
    339388    { 
     389      if (domain->ni.isEmpty()) 
     390      { 
     391        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)", 
     392          << " Value of attribute ni should be defined for domain " << domain->getDomainOutputName() 
     393          << " in file " << this->filename << "." 
     394          << std::endl); 
     395      } 
     396 
     397      if (domain->ibegin.isEmpty()) 
     398      { 
     399        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)", 
     400          << " Value of attribute ibegin should be defined for domain " << domain->getDomainOutputName() 
     401          << " in file " << this->filename << "." 
     402          << std::endl); 
     403      } 
     404 
     405      int ni; 
    340406      std::vector<StdSize> nBeginLatLon(1,0), nSizeLatLon(1,0); 
    341       nSizeLatLon[0]  = domain->ni_glo.getValue(); 
    342       CArray<double,1> globalLonLat(domain->ni_glo.getValue()); 
     407 
     408      ni = domain->ni; 
     409      nBeginLatLon[0] = domain->ibegin; 
     410//      ni = domain->ni_glo; 
     411//      nBeginLatLon[0] = 0; 
     412      nSizeLatLon[0] = ni; 
    343413 
    344414      StdString latName = this->getLatCoordName(fieldId); 
    345415      if (SuperClassWriter::hasVariable(latName)) 
    346416      { 
    347         domain->latvalue_unstructured_read_from_file.resize(domain->ni_glo); 
     417        domain->latvalue_unstructured_read_from_file.resize(ni); 
    348418        readFieldVariableValue(domain->latvalue_unstructured_read_from_file, latName, nBeginLatLon, nSizeLatLon);   
    349419      } 
     
    352422      if (SuperClassWriter::hasVariable(lonName)) //(0 != lonName.compare("")) 
    353423      { 
    354         // readFieldVariableValue(globalLonLat, lonName, nBeginLatLon, nSizeLatLon); 
    355         domain->lonvalue_unstructured_read_from_file.resize(domain->ni_glo); 
     424        domain->lonvalue_unstructured_read_from_file.resize(ni); 
    356425        readFieldVariableValue(domain->lonvalue_unstructured_read_from_file, lonName, nBeginLatLon, nSizeLatLon); 
    357426      } 
     
    375444 
    376445      std::vector<StdSize> nBeginBndsLatLon(2), nSizeBndsLatLon(2); 
    377       nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->ni_glo.getValue(); 
    378       nBeginBndsLatLon[1] = 0; nSizeBndsLatLon[1] = nbVertex; 
    379  
    380       if (SuperClassWriter::hasVariable(boundsLatName))  
     446 
     447      nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->ni.getValue(); 
     448      nBeginBndsLatLon[1] = domain->ibegin.getValue(); nSizeBndsLatLon[1] = nbVertex; 
     449//      nBeginBndsLatLon[0] = 0; nSizeBndsLatLon[0] = domain->ni_glo.getValue(); 
     450//      nBeginBndsLatLon[1] = 0; nSizeBndsLatLon[1] = nbVertex; 
     451 
     452        if (SuperClassWriter::hasVariable(boundsLatName)) 
    381453      { 
    382454        domain->bounds_latvalue_unstructured_read_from_file.resize(nSizeBndsLatLon[1], nSizeBndsLatLon[0]); 
  • XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

    r1390 r1410  
    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) 
     
    531531   void CDomain::fillInCurvilinearLonLat() 
    532532   { 
     533 
    533534     if (!lonvalue_curvilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty()) 
    534535     { 
     
    536537       for (int jdx = 0; jdx < nj; ++jdx) 
    537538        for (int idx = 0; idx < ni; ++idx) 
    538          lonvalue_2d(idx,jdx) = lonvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin); 
     539            lonvalue_2d(idx,jdx) = lonvalue_curvilinear_read_from_file(idx, jdx); 
     540//            lonvalue_2d(idx,jdx) = lonvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin); 
    539541 
    540542       lonvalue_curvilinear_read_from_file.free(); 
     
    546548       for (int jdx = 0; jdx < nj; ++jdx) 
    547549        for (int idx = 0; idx < ni; ++idx) 
    548          latvalue_2d(idx,jdx) = latvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin); 
     550            latvalue_2d(idx,jdx) = latvalue_curvilinear_read_from_file(idx, jdx); 
     551//            latvalue_2d(idx,jdx) = latvalue_curvilinear_read_from_file(idx+ibegin, jdx+jbegin); 
    549552 
    550553       latvalue_curvilinear_read_from_file.free(); 
     
    557560        for (int idx = 0; idx < ni; ++idx) 
    558561          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); 
     562              bounds_lon_2d(ndx,idx,jdx) = bounds_lonvalue_curvilinear_read_from_file(ndx,idx, jdx); 
     563//              bounds_lon_2d(ndx,idx,jdx) = bounds_lonvalue_curvilinear_read_from_file(ndx,idx+ibegin, jdx+jbegin); 
    560564 
    561565       bounds_lonvalue_curvilinear_read_from_file.free(); 
     
    568572        for (int idx = 0; idx < ni; ++idx) 
    569573          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); 
     574              bounds_lat_2d(ndx,idx,jdx) = bounds_latvalue_curvilinear_read_from_file(ndx,idx, jdx); 
     575//              bounds_lat_2d(ndx,idx,jdx) = bounds_latvalue_curvilinear_read_from_file(ndx,idx+ibegin, jdx+jbegin); 
    571576 
    572577       bounds_latvalue_curvilinear_read_from_file.free(); 
     
    584589     { 
    585590       i_index.resize(ni); 
    586        for(int idx = 0; idx < ni; ++idx) i_index(idx)=ibegin+idx; 
     591//       for(int idx = 0; idx < ni; ++idx) i_index(idx)=ibegin+idx; 
    587592     } 
    588593 
     
    591596        lonvalue_1d.resize(ni); 
    592597        for (int idx = 0; idx < ni; ++idx) 
    593           lonvalue_1d(idx) = lonvalue_unstructured_read_from_file(i_index(idx)); 
     598//          lonvalue_1d(idx) = lonvalue_unstructured_read_from_file(i_index(idx)); 
     599          lonvalue_1d(idx) = lonvalue_unstructured_read_from_file(idx); 
    594600 
    595601        // We dont need these values anymore, so just delete them 
     
    601607        latvalue_1d.resize(ni); 
    602608        for (int idx = 0; idx < ni; ++idx) 
    603           latvalue_1d(idx) =  latvalue_unstructured_read_from_file(i_index(idx)); 
     609//          latvalue_1d(idx) =  latvalue_unstructured_read_from_file(i_index(idx)); 
     610          latvalue_1d(idx) =  latvalue_unstructured_read_from_file(idx); 
    604611 
    605612        // We dont need these values anymore, so just delete them 
     
    613620        for (int idx = 0; idx < ni; ++idx) 
    614621          for (int jdx = 0; jdx < nbVertex; ++jdx) 
    615             bounds_lon_1d(jdx,idx) = bounds_lonvalue_unstructured_read_from_file(jdx, i_index(idx)); 
     622//            bounds_lon_1d(jdx,idx) = bounds_lonvalue_unstructured_read_from_file(jdx, i_index(idx)); 
     623            bounds_lon_1d(jdx,idx) = bounds_lonvalue_unstructured_read_from_file(jdx, idx); 
    616624 
    617625        // We dont need these values anymore, so just delete them 
     
    625633        for (int idx = 0; idx < ni; ++idx) 
    626634          for (int jdx = 0; jdx < nbVertex; ++jdx) 
    627             bounds_lat_1d(jdx,idx) = bounds_latvalue_unstructured_read_from_file(jdx, i_index(idx)); 
     635//            bounds_lat_1d(jdx,idx) = bounds_latvalue_unstructured_read_from_file(jdx, i_index(idx)); 
     636            bounds_lat_1d(jdx,idx) = bounds_latvalue_unstructured_read_from_file(jdx, idx); 
    628637 
    629638        // We dont need these values anymore, so just delete them 
  • XIOS/dev/XIOS_DEV_CMIP6/src/transformation/domain_algorithm_generate_rectilinear.hpp

    r827 r1410  
    2020/*! 
    2121  \class CDomainAlgorithmGenerateRectilinear 
    22   Generate a rectilinear domain and fill in necessary its attributes automatically 
    23   A new rectilinear domain will also be distributed automatically among the processes. 
     22  Generate a rectilinear or CURVILINEAR domain and fill in necessary its attributes automatically 
     23  A new rectilinear (or CURVILINEAR) domain will also be distributed automatically among the processes. 
    2424  The number of processes is deduced from the distribution of the grid source. 
    2525*/ 
Note: See TracChangeset for help on using the changeset viewer.